clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-28 22:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,314 Commits 116 Branches 89 Tags 631 MiB
b078050702
Commit Graph

757 Commits

Author SHA1 Message Date
Mark Otto
70c6a6cd85 fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices 2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864 reset border-radius only for ie9? 2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -08:00
Jacob Thornton
e1a1fdd35d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Mark Otto
f1dc214977 increase padding on modal-header after decreasing h3 line-height 2012-01-28 11:24:34 -08:00
Mark Otto
2452768259 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 11:22:07 -08:00
Mark Otto
28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Jacob Thornton
d465952138 clean up js api for dropdowns 2012-01-28 11:03:39 -08:00
Jacob Thornton
ab8f4a394c remove js for table sorts 2012-01-28 01:48:45 -08:00
Mark Otto
d65ce1b64c updated upgrading page 2012-01-28 01:34:07 -08:00
Jacob Thornton
81c128fd0b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:46:21 -08:00
Jacob Thornton
09df780b75 clean up application js a bit 2012-01-28 00:46:04 -08:00
Mark Otto
f1851ab133 change text on js docs page to improve rendering on iphone, update responsive for carousel considerations 2012-01-28 00:43:25 -08:00
Mark Otto
edee985b96 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53 modal refinements in docs and general responsiveness 2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0 remove quick start section to simplify landing page + start rewriting application js to work ie7 2012-01-28 00:36:37 -08:00
Mark Otto
18d95a163b remove fixed width from labels table 2012-01-28 00:34:54 -08:00
Mark Otto
cc01d3c367 extend block level smalls to h2s in docs 2012-01-28 00:31:55 -08:00
Mark Otto
342a99f1d0 block level page-header h1 small for readability on 480px and under 2012-01-28 00:29:38 -08:00
Mark Otto
963e5e0eda scope subnav link styles to first child, and no dropdowns 2012-01-28 00:27:49 -08:00
Mark Otto
873be0e4f2 drop span2-4 on form examples to 1-3 2012-01-28 00:25:54 -08:00
Mark Otto
d448e6921e rewrite the code section of the type docs 2012-01-28 00:23:30 -08:00
Mark Otto
ce69b70719 give append/prepend inputs higher z-index on focus 2012-01-27 23:53:56 -08:00
Mark Otto
08fea7587c call attention to notices in js docs more 2012-01-27 23:27:33 -08:00
Mark Otto
7a756168b5 fix regression in textarea shadows 2012-01-27 22:56:48 -08:00
Mark Otto
1d44f37fc9 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-27 22:52:56 -08:00
Mark Otto
cb8606f2c8 adding wells and close icon to the docs under misc in components, with a new subnav style 2012-01-27 22:52:45 -08:00
Jacob Thornton
7cbb586825 move the matcher and sorter into the options - encourage people to override them... 2012-01-27 22:27:06 -08:00
Jacob Thornton
e726b231ba add toggle to docs for popover/tooltip 2012-01-27 21:59:06 -08:00
Jacob Thornton
1e07c066a5 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 21:37:59 -08:00
Jacob Thornton
0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -08:00
Mark Otto
ad78caa726 fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment 2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72 add clearfix to control-group for longer labels and any other unforeseen circumstances 2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4 rgba text color on active buttons for a bit more contrast from their non-active siblings 2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d update progress bars to have a solid edge until 100% filled 2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7 use quotes on attr selectors more consistently 2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918 icon spacing in small buttons and nav lists 2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4 fixing up buttons and examples of implementing icons 2012-01-27 19:49:56 -08:00
Mark Otto
a624ac1edf Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons 2012-01-27 19:12:09 -08:00
Mark Otto
7fc6e12b79 comment icons that are 1px off 2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e combined .disabled and [disabled] and confirmed in ie7/8 2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9 clean up use of mixins to highlight them appropriately in your fav editor 2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963 overhaul navbar behavior in responsive css 2012-01-27 16:26:55 -08:00
Burak Tuyan
a2a10ae421 Adding new examples to the icons' docs. 
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
 2012-01-28 02:13:53 +02:00
Mark Otto
800d0b24e0 remove page-header from docs and add to type.less 2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd update examples and restore icons 2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553 add missing paren 2012-01-27 14:44:05 -08:00
Jacob Thornton
8a2124faff only build mustache files 2012-01-27 14:43:41 -08:00
Mark Otto
003da1e089 fix inputs in navbar 2012-01-27 14:21:17 -08:00
Mark Otto
6353e5070a remove unused images from docs assets 2012-01-27 14:03:36 -08:00
Mark Otto
3807a88ee9 update the docs for icons 2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip 2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6 Rebuild css and html 2012-01-27 16:39:38 -05:00
Mark Otto
b1f38bbea8 update icon examples to show icons in differently sized buttons 2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0 rebuil update layout 2012-01-27 13:36:31 -08:00
Mark Otto
d7b8a9c930 align text in buttons so folks can easily make them different widths 2012-01-27 13:36:08 -08:00
Mark Otto
a0b40b361a i18n download page 2012-01-27 13:35:25 -08:00
Mark Otto
ccd963e622 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
 2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11 huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff 2012-01-27 13:20:02 -08:00
Pete Hopkins
7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05:00
Jacob Thornton
3b3dbd7229 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 20:48:37 +02:00
Mark Otto
97546adc90 Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base 2012-01-27 09:40:04 -08:00
Mark Otto
e44a7dd4ff buttons for toggle links in js docs, code example for offsetting in grid 2012-01-27 09:36:49 -08:00
Pete Hopkins
f51e703ba6 Rebuild bootstrap.css 2012-01-27 12:16:36 -05:00
Mark Otto
9d0328ff00 adding outline callout as a fallback for IE--needs testing though, thought I already added this 2012-01-27 08:21:39 -08:00
Burak Tuyan
acaa3b5977 Changing the color of the default icons from black (#000) to grayDark (#333) 2012-01-27 18:02:57 +02:00
Burak Tuyan
942d1b4595 Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like: 
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
 2012-01-27 16:33:18 +02:00
Jacob Thornton
aa594501bd change typeahead to data-source instead of data-data and add to docs 2012-01-26 23:16:02 -08:00
Jacob Thornton
c63175dc1d change endpoint to point to actual server... 2012-01-26 22:52:44 -08:00
Jacob Thornton
815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -08:00
Jacob Thornton
ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 20:23:28 -08:00
Jacob Thornton
1e9c2fb9d4 getting closer.... 2012-01-26 20:23:15 -08:00
Mark Otto
576ae2f561 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 19:10:32 -08:00
Mark Otto
a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Marco Wise
6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Mark Otto
c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -08:00
Jacob Thornton
12484a7471 more builder crap 2012-01-26 16:41:28 -08:00
Mark Otto
af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00
Jacob Thornton
c31ac846d7 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645 some js for javascript for builder (stil incomplete) 2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0 fix links to apple touch icons 2012-01-26 15:54:04 -08:00
Mark Otto
f398926e46 move down background iamge 2012-01-26 15:22:52 -08:00
Mark Otto
945870d778 small text change on downloads page 2012-01-26 14:54:24 -08:00
Mark Otto
8a6be6601d make accordion links block level 2012-01-26 14:40:19 -08:00
Mark Otto
43c8f41895 add values to inputs for grid variables on download page 2012-01-26 14:40:09 -08:00
Mark Otto
b7f22e27ec more docs homepage adjustments 2012-01-26 11:47:40 -08:00