rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
7,090 Commits 108 Branches 89 Tags 547 MiB
f9eec5b60a
Commit Graph

2141 Commits

Author SHA1 Message Date
Mark Otto
5a411af967 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 19:57:23 -07:00
Mark Otto
f946ff5d25 fix #10257 2013-10-13 19:57:14 -07:00
Mark Otto
7112d06a2b Merge pull request #10955 from ZDroid/patch-1 
Insert comma to fix validation warning
 2013-10-13 19:41:12 -07:00
Mark Otto
bf73f1f9d3 Merge branch 'master' into restore_grid_mixins 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-13 18:59:40 -07:00
Mark Otto
6351c30782 comment and spacing 2013-10-13 18:58:09 -07:00
Mark Otto
6085973e25 drop .tabbable since it's unused and undocumented /cc #10102 2013-10-13 18:56:31 -07:00
Mark Otto
265fda7903 Merge branch 'master' into restore_grid_mixins 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-13 18:32:34 -07:00
Mark Otto
590975b407 remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 2013-10-13 15:55:13 -07:00
Mark Otto
570aa8a309 Merge pull request #11059 from ZDroid/patch-5 
Add more functionality to .small to match <small>
 2013-10-12 16:58:49 -07:00
Mark Otto
d82650102c Merge pull request #10933 from ZDroid/patch-2 
Change border to border-radius
 2013-10-12 15:35:07 -07:00
Zlatan Vasović
8098f4e5ba Add more functionality to .small 2013-10-12 23:28:50 +02:00
Mark Otto
c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto
352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto
1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Steven Black
0740d01b4c Good catch by @juthilo - omitted the modified in a prior commit. 2013-10-05 20:48:28 -04:00
Steven Black
4b27c08783 The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. 2013-10-05 18:37:53 -04:00
Zlatan Vasović
b1cc07fa15 Insert comma to fix validation warning 
BS doesn't support IE6/IE7, so comma can be inserted.
 2013-10-05 20:14:19 +02:00
Steven Black
38941881e9 Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. 2013-10-04 21:43:31 -04:00
Zlatan Vasović
6f9d980139 Change border to border-radius 
Border isn't set, but border-radius is.
 2013-10-03 23:15:49 +02:00
Tobias Lindig
70453c2327 unify button sizing, use mixin ".button-size" also for the base sized button 2013-10-03 10:43:35 -07:00
Shaun Dychko
355525b2b7 remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin. 2013-09-30 13:21:54 -07:00
Chris Rebert
2d0f5565ab re-sort affected .glyphicon-* classes by new codepoints 2013-09-23 22:43:48 -07:00
Chris Rebert
b160e61451 Update affected .glyphicon-* CSS classes to use new codepoints 
.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar:  U+1F4C5 -> U+E109
.glyphicon-pushpin:   U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera:    U+1F4F7 -> U+E046
.glyphicon-lock:      U+1F512 -> U+E033
.glyphicon-bell:      U+1F514 -> U+E123
.glyphicon-bookmark:  U+1F516 -> U+E044
.glyphicon-fire:      U+1F525 -> U+E104
.glyphicon-wrench:    U+1F527 -> U+E136
 2013-09-23 22:43:48 -07:00
Chris Rebert
c4e7e3c933 deprecate .hide; fixes #10446 2013-09-23 12:46:57 -07:00
Mark Otto
8a181a1388 Merge pull request #10695 from FredericoC/fix-nav-active-caret 
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
 2013-09-22 16:53:01 -07:00
Mark Otto
5b12736fb7 Merge pull request #10741 from ZDroid/patch-1 
Avoid LESS nesting if isn't needed
 2013-09-22 07:25:33 -07:00
Mark Otto
ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto
000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Zlatan Vasović
dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Zlatan Vasović
2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto
e148923f27 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
XhmikosR
60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR
0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho
29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho
b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Mark Otto
f2750dd6bc Merge pull request #10626 from buob/variablize-nav-pill-border-radius 
Variablize nav pill border radius
 2013-09-16 22:00:39 -07:00
Mark Otto
bf47968d9c Merge pull request #10655 from Soben713/master 
Remove unnecessary semicolons
 2013-09-16 21:49:01 -07:00
Mark Otto
515e11da32 Merge pull request #10663 from lipis/patch-1 
Changed the border-color of .navbar-form to @navbar-default-border
 2013-09-16 20:36:04 -07:00
Lipis
a6e2a93feb Changed the border-color of .navbar-form to @navbar-default-border 2013-09-16 19:36:39 +02:00
Steve S
ae3a9169e0 Simplified CSS responsive-invisibility mixin 2013-09-16 09:16:53 -05:00
Soheil Behnezhad
cc69911335 Derp, there were more 2013-09-16 16:37:03 +04:30
Soheil Behnezhad
0c39045222 Remove some more unnecessary semicolons 2013-09-16 16:25:53 +04:30
Chris Ziogas
ab3d0a27b3 Dropdown in panel header does not inherit its colors 
Fix for issue #10627
 2013-09-16 12:38:26 +03:00
Soheil Behnezhad
bff23ee1fe Remove unnecessary semicolons 2013-09-16 13:47:48 +04:30
Jake Buob
2381ab088b Add nav-pills-border-radius variable 2013-09-13 15:57:10 -04:00
Jake Buob
4d4976fdcc Make nav pills border-radius border-radius-base 2013-09-13 15:56:30 -04:00
Zlatan Vasović
5caf780081 @grid-float-breakpoint need to be @screen-sm-min 
😄
 2013-09-12 09:52:33 +02:00
Mark Otto
88ae76536d Merge pull request #10573 from gribelu/tooltip-fix 
Hardcoded Tooltip arrow positioning
 2013-09-11 23:19:56 -07:00
Mark Otto
dbcb05880f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 23:13:28 -07:00
Mark Otto
28e5572bf4 Fixes #10492: Account for responsive tables in panels 2013-09-11 23:11:18 -07:00
Mark Otto
9c0d04d3e4 Merge pull request #10569 from ZDroid/patch-2 
Change @screen-* to @screen-*-min
 2013-09-11 23:07:47 -07:00
Mark Otto
291a23aa4f Massive customizer audit and overhaul 
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910. I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.

/cc @cvrebert @juthilo @saas786
 2013-09-11 21:14:10 -07:00
Mark Otto
d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 16:35:27 -07:00
Chris Rebert
725e2b9ccf re-fix typo in comment 2013-09-11 16:24:03 -07:00
Mark Otto
b0ea3a08cd Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports 
Conflicts:
	getting-started.html
	less/responsive-utilities.less
 2013-09-11 16:15:12 -07:00
Mark Otto
6519303549 fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 16:06:43 -07:00
Mark Otto
6e064894db remove unnecessary right and left properties on .modal-dialog 2013-09-11 14:56:02 -07:00
Mark Otto
2dc7ab4bbb fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 14:46:31 -07:00
Mark Otto
37933a9e08 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 12:31:21 -07:00
Mark Otto
5d1707a25c Remove old and unused .prettyprint styles in code.less (per #10566) 2013-09-11 11:09:50 -07:00
gribelu
d8202dd626 Fixed hardcoded tooltip arrow positioning 
Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width.
 2013-09-11 16:47:13 +03:00
Zlatan Vasović
50fcaba24f The last 2013-09-11 10:38:42 +02:00
Zlatan Vasović
d9613268b0 Again? 2013-09-11 10:35:12 +02:00
Zlatan Vasović
a0653ef018 Rumbo Jumbo 2013-09-11 10:33:30 +02:00
Zlatan Vasović
e2e1c80d1a Another fixup 2013-09-11 10:32:08 +02:00
Zlatan Vasović
b8a33eb1e0 Eagle eye 2013-09-11 10:29:15 +02:00
Zlatan Vasović
c10238c95f Use @screen-sm-min in forms 2013-09-11 09:54:38 +02:00
Mark Otto
b7e1103c32 Merge pull request #9989 from eins78/more-monospace-elements 
code.less: also set default monospace font for `<kbd>` and `<samp>`
 2013-09-10 21:38:24 -07:00
Mark Otto
e645d51b62 Merge pull request #10565 from twbs/gruntfile-css-banner 
generate CSS banners via Gruntfile; fixes #10101
 2013-09-10 21:27:07 -07:00
Mark Otto
84567af1a8 Merge pull request #10560 from ZDroid/patch-1 
Remove display: block from address
 2013-09-10 21:25:31 -07:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
52516eceba add missing comma in carousel.less; fixes #10562 2013-09-10 16:20:36 -07:00
Zlatan Vasović
886e7037f6 Remove display: block from address 
<address> is already displayed as block in all browsers (UAs).
 2013-09-10 23:27:04 +02:00
Mark Otto
fff5e540f5 fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally 2013-09-08 20:03:52 -07:00
Mark Otto
afb6cf1d01 Match order of vars to order of components; darken some alert borders 2013-09-08 16:58:56 -07:00
Mark Otto
16279056ae Merge branch 'master' of github.com:twbs/bootstrap 2013-09-08 08:04:19 -07:00
Mark Otto
3f158175ce fixes #10521: Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables 2013-09-08 08:04:11 -07:00
Zlatan Vasović
f9fe6cd05f Added missing semicolon 2013-09-08 15:37:02 +02:00
Mark Otto
8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto
e5038a339c Merge pull request #9968 from thelukemcdonald/master 
Apply gradient stripe @color parameter
 2013-09-06 09:31:36 -07:00
Mark Otto
5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-06 09:23:49 -07:00
Mark Otto
72a39eb747 Merge pull request #10025 from barryvdh/patch-2 
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
 2013-09-06 09:18:00 -07:00
Mark Otto
b51579241f account for last child bottom border; use 0 instead of none 2013-09-05 15:10:56 -07:00
Kevin O'Connor
ac244040d1 Don't double border a bordered table within a panel 2013-09-05 15:54:18 -04:00
Mark Otto
56c8826c77 Fixes #10452: Add note about deprecation of .nav-divider 
Should have been dropped in v3, but ah well, we missed it. So, it gets
the deprecation.
 2013-09-04 18:52:45 -07:00
Mark Otto
1c4bdb053b Fixes #10399: Add hover styles to text emphasis classes 2013-09-04 13:56:32 -07:00
Mark Otto
d8dc805f9b Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 09:09:22 -07:00
Mark Otto
34f1487146 Fixes #10436: use screen-sm var instead of hardcoded pixel value 2013-09-04 09:08:52 -07:00
Liam
12558bb504 Fixed error in documentation in mixins.less 2013-09-04 18:59:44 +10:00
Mark Otto
143403f3fd Fixes #10407: Add line-height to progress bar for proper text alignment within 2013-09-03 20:11:27 -07:00
Mark Otto
0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto
dd44123881 remove unused .panel-collapse ruleset 2013-09-03 01:04:17 -07:00
Mark Otto
a245c0d1cd derp, add on to #10153 with proper variable /cc @ggam 2013-09-01 20:52:23 -07:00
Mark Otto
de82c80784 update vars to use new component-active-color 2013-09-01 23:40:04 +02:00
Mark Otto
1fd9237840 fixes #9909: Add component active color variable to complement component active bg variable 2013-09-01 23:38:11 +02:00
Mark Otto
26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Mark Otto
b45c3ea647 fixes #10164: Document .center-block mixin and update CSS to include it as a class as well 2013-09-01 11:21:14 +02:00
Mark Otto
50bf4d47b1 reverse vars for backwards compatibility /cc @cvrebert 2013-09-01 11:06:33 +02:00
Mark Otto
25cc04c5ab Merge branch 'deprecate_screen_containers' 2013-09-01 11:05:14 +02:00