rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
1,330 Commits 108 Branches 89 Tags 552 MiB
160a0bf560
Commit Graph

1330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pete Hopkins
a1fc352cc2 Changes non-transparent navbar search box color to match transparent one better 2012-01-27 16:35:40 -05:00
Mark Otto
a0b40b361a i18n download page 2012-01-27 13:35:25 -08:00
Pete Hopkins
faa719d59c Fixes left/right border overlap for IE7 2012-01-27 16:35:21 -05: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
8328987b15 IE7 fixes for split buttons and dropdowns 2012-01-27 16:10:40 -05:00
Pete Hopkins
347a15b69a Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes 2012-01-27 16:10:40 -05:00
Pete Hopkins
43f1a42f7f Adds necessary ie7-inline-block macros 2012-01-27 16:10:34 -05:00
Pete Hopkins
7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05:00
Pete Hopkins
70d95b1bd7 Moves IE7-specific button padding to only apply to form controls 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
Pete Hopkins
526d388393 Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element 2012-01-27 12:16:17 -05:00
Pete Hopkins
841e386daf Fixes up internal and external spacing for IE7 buttons 2012-01-27 12:08:56 -05:00
Pete Hopkins
6075b5dee6 Collapses borders for IE7, which doesn't respect border-spacing 2012-01-27 12:08:56 -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
11d7ef1515 Merge pull request #1272 from napoleond/2.0-wip 
Support tab and enter in typeahead
 2012-01-26 23:04:42 -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
a25f0cce95 simplify readme 2012-01-26 22:11:32 -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
7a3d04d5be scope icons to .icon 2012-01-26 19:10:09 -08:00
Mark Otto
a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Mark Otto
824eaff1d8 Merge pull request #1280 from mistermarco/2.0-wip 
Fix typo in docs/scaffolding.html and mustache template in 2.0 wip
 2012-01-26 19:04:22 -08:00
Marco Wise
6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Mark Otto
5a48b22b83 Merge pull request #1269 from phopkins/ie_typeahead 
[2.0-wip] Fix typehead plugin for IE7/8
 2012-01-26 17:04:35 -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
e7bc2063be Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2012-01-26 16:31:10 -08:00
Mark Otto
7d292f5acc Merge pull request #1274 from linrock/patch-2 
[2.0 wip] Bring back the hero unit css. Fixes #1185.
 2012-01-26 16:27:50 -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
Linmiao Xu
ef4e3bc0f7 Move hero-unit css out of pattern.less and include it. Fixes #1185. 2012-01-26 15:51:11 -08:00
Mark Otto
d8e1001836 fix legend margin collapse 2012-01-26 15:39:37 -08:00
Mark Otto
2d67c34084 Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment 
Conflicts:
	bootstrap.css
	bootstrap.min.css
 2012-01-26 15:25:19 -08:00