root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7,469 Commits 132 Branches 94 Tags 672 MiB
Commit Graph

2256 Commits

Author SHA1 Message Date
Chris Rebert 798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Mark Otto 88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Chris Rebert b6a083e77f Merge pull request #11327 from ZDroid/nestnail 
Use nesting for thumbnail styles
 2013-11-05 16:20:53 -08:00
Zlatan Vasović f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Gleb Mazovetskiy b75d5f5fc4 & > == > 2013-11-02 02:19:11 +01:00
Zlatan Vasović 3dc0ed35d1 Use nesting for thumbnail styles 2013-11-01 22:09:01 +01:00
Kevin Locke 441f9d6717 Support .h1 in place of h1 inside .jumbotron 
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
 2013-10-31 10:48:55 -06:00
Zlatan Vasović 688ca328c9 Combine multiple .thumbnail > img styles 2013-10-30 10:00:28 +01:00
Zlatan Vasović 8a881c78a1 Change tense to imperative 
Matches this comment with the commit messages and other comments.
 2013-10-29 20:06:45 +01:00
Mark Otto c6e76d97ba Fixes #10341: don't change border color on contextual table classes 2013-10-28 21:19:48 -07:00
Mark Otto 67cab7fa05 Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering 2013-10-28 20:51:39 -07:00
Zlatan Vasović f9eec5b60a Add -moz-osx-font-smoothing 2013-10-28 09:59:24 +01:00
Mark Otto 30127a4296 Merge pull request #11253 from ZDroid/ditch 
Ditch amp
 2013-10-27 20:50:23 -07:00
Zlatan Vasović 92f007157a Ditch amp 2013-10-27 13:43:51 +01:00
Geremia Taglialatela 58cb85be37 #fff of course 2013-10-26 21:52:38 +02:00
Geremia Taglialatela b09417fd75 Fixes #11245 2013-10-26 21:32:29 +02:00
Mark Otto 0365796375 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-26 14:22:33 +01:00
Mark Otto 1ef6caf44f Merge pull request #11200 from yokomizor/variable_way_to_set_caret_width_base 
Variable way to set caret width
 2013-10-26 06:15:33 -07:00
Mark Otto 4cfe307abe Fixes #11206: remove left padding on first inline list item 2013-10-26 14:13:34 +01:00
Zlatan Vasović aff291e1ca Add .animation() mixin 2013-10-26 14:11:59 +02:00
Chris Rebert a58c83a317 add missing space before open curly brace 2013-10-24 19:56:44 -07:00
Chris Rebert aafe3f90bd fix misspelling in comment 2013-10-24 19:50:08 -07:00
Chris Rebert f31aae469e fix misspelling in comment 2013-10-24 19:48:42 -07:00
Chris Rebert 3cd744fd5e remove ref to nonexistent branch 2013-10-24 19:42:48 -07:00
Chris Rebert c865a68e21 fix WebKit caps in comments 2013-10-24 19:20:08 -07:00
Zlatan Vasović 9a2d169762 Add quick fix to labels and badges in buttons 2013-10-23 22:14:34 +02:00
Chris Rebert bb3d17553c Merge pull request #11208 from ZDroid/codestyle_fix 
Put a space before `{` due to code style
 2013-10-22 10:53:25 -07:00
Zlatan Vasović b034362363 Put a space before { due to code style 2013-10-22 18:34:43 +02:00
Rogério Yokomizo 5f2bd59abb variable way to set @caret-width-base 2013-10-22 02:50:08 -02:00
Zlatan Vasović 214a78978d Change upper case to lower case 2013-10-21 16:34:18 +02:00
Mark Otto eed53d7811 Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x 2013-10-21 01:53:41 -07:00
Mark Otto eef9d5ae7b Merge pull request #10893 from Shaun-Dychko/patch--webkit-linear-gradient 
remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin.
 2013-10-20 23:27:48 -07:00
Mark Otto 9a0849d818 more spacing 2013-10-20 22:56:29 -07:00
Mark Otto 2eec3f919e Merge branch 'master' into pr/10656 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 22:55:45 -07:00
Mark Otto 6585c5898a spacing 2013-10-20 22:46:21 -07:00
Mark Otto 6ecb5d6cf3 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-20 22:43:03 -07:00
Mark Otto d8fab5aa6e Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners 2013-10-20 22:41:57 -07:00
Mark Otto 76baacf2c9 Remove default z-index on navbar and only set on static and fixed variants 2013-10-20 21:12:09 -07:00
Mark Otto e486bb4f39 Fixes #10433: Navbar z-index refactor 
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
 2013-10-20 20:30:16 -07:00
Mark Otto 5aa4c5cb0c fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect 2013-10-20 20:04:10 -07:00
Mark Otto 369f5ba760 Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 19:55:56 -07:00
Mark Otto dd34102cb6 Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline 2013-10-20 19:54:22 -07:00
Mark Otto 23a85d6a7a fixes #11126: remove box-shadow from open dropdown toggle with .btn-link 2013-10-20 17:59:15 -07:00
Mark Otto bc76be5dcf Merge branch 'master' into carousel_indicators_ie 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 17:45:07 -07:00
Mark Otto f45c05a97a fixes #11151: remove unused h5bp class from print CSS 2013-10-20 17:40:19 -07:00
Mark Otto 6a93a6b88a Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it 2013-10-20 16:46:38 -07:00
Zlatan Vasović 5f79354dbe FIx invalid element selector 
`kbd` (keyboard) is right, not `kdb`. :P
 2013-10-17 21:25:08 +02:00
Max Edmands 693915d127 Active state overrides contextual list-item styles 2013-10-16 22:56:13 -07:00
Aaron Borden 0c2055ef38 Adding contextual styles to list-items 2013-10-16 19:02:04 -07:00
jeonghwan 976f6dfdad Fixes issue #11122 -- navbar-fixed-bottom border 
Enable border-top in .navbar-fixed-bottom
 2013-10-16 23:20:34 +09:00
Zlatan Vasović 0423635614 Ditch `&`, as `+ ...` is enought 2013-10-15 17:35:11 +02:00
Chris Rebert a28d9539c7 fix #10952 2013-10-14 20:45:43 -07:00
Rogério Yokomizo e20b02ad0b extended hover state of linked versions of .thumbnail 2013-10-14 20:10:49 -03:00
Mark Otto fa64846acf Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-14 13:45:57 -07:00
Mark Otto 7100711577 unnest the list-group-item link variation for #11085 and #11088 2013-10-14 13:45:32 -07:00
Mark Otto 3fb1381a30 Merge pull request #11084 from ZDroid/variable_way 
Unhardcode .table-responsive bottom margin
 2013-10-14 11:33:27 -07:00
Chris Rebert 5c64ef393c fix .table-responsive media query; refs #11067 2013-10-14 10:58:12 -07:00
Zlatan Vasović 4ce1b08c32 Unhardcode .table-responsive bottom margin 2013-10-14 18:22:31 +02:00
Zlatan Vasović b3c04c95d3 Nuke trailing zeros 2013-10-14 15:06:58 +02:00
Mark Otto e7379f75bd no trailing decimal place 2013-10-13 20:04:28 -07:00
Mark Otto fbc67a395f Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 20:04:00 -07:00
Mark Otto 36b4639b0d Merge pull request #10949 from StevenBlack/jumbotron.fontsize 
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
 2013-10-13 20:03:02 -07:00
Mark Otto be4e951b7d scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 2013-10-13 20:02:24 -07:00
Mark Otto 44b32a3036 move .hidden to utilities; fixes #10997 2013-10-13 19:59:42 -07:00
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
Kevin Lisota cde1b9a178 add responsive CSS to hyperlinked images when thumbnail caption markup is used 
When thumbnail caption markup is used in combination with a hyperlinked image, the image is not responsive. (non-hyperlinked images are fine, like the example in the docs) Adding a selector to apply responsiveness to hyperlinked images when thumbnail captions are used.
 2013-09-16 08:21:09 -07: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