0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

1804 Commits

Author SHA1 Message Date
Mark Otto
bd93ed2cb6 Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	dist/css/bootstrap.min.css
2013-08-13 13:48:33 -07:00
Mark Otto
3c772b1ceb lighter default navbar, add borders to navbars, tweak padding and alignments 2013-08-13 13:39:21 -07:00
Mark Otto
270af4dda3 fixes #9431: specify font-size in dropdown menus to avoid inheritance issues 2013-08-13 13:16:56 -07:00
Mark Otto
33a88c9a94 Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel
Conflicts:
	dist/css/bootstrap.min.css
2013-08-13 10:36:38 -07:00
Mark Otto
3e373a844c Merge pull request #9410 from ggam/pagination-size
Added pagination-size mixin
2013-08-13 10:35:24 -07:00
Mark Otto
ce77f10ce5 Merge pull request #9421 from ggam/input-size
Added input-size mixin
2013-08-13 10:35:04 -07:00
Mark Otto
69a3e9b4d0 enable button groups in vertical button groups 2013-08-13 10:24:18 -07:00
ggam
6ec0fd7d43 Added input-size mixin 2013-08-13 19:06:02 +02:00
Mark Otto
f15f259876 derp 2013-08-13 09:59:38 -07:00
Guillermo González de Agüero
e74ac0723b Fixed errors 2013-08-13 14:25:05 +02:00
ggam
ea04fa538e Added pagination-size mixin 2013-08-13 13:27:45 +02:00
Mark Otto
b0ab806dcc fix negative indenting in button group for nested button groups 2013-08-12 23:44:50 -07:00
Mark Otto
237640c706 Drop the accordion for the panel
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Mark Otto
48e7468e3a invert dropdown styles in navbar for inverse variation 2013-08-12 21:43:59 -07:00
Mark Otto
80eb09cc1b Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	components.html
	dist/css/bootstrap.min.css
2013-08-12 21:34:55 -07:00
Mark Otto
49576704ea finish fixing #9295: add button group buttons to new input group sizing 2013-08-12 21:27:15 -07:00
Mark Otto
40723c8716 fixes #9400: add box-sizing to pseudo elements as well 2013-08-12 21:26:43 -07:00
Mark Otto
8bb7def26c Navbar refactor
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
2013-08-12 21:23:28 -07:00
Mark Otto
eac61de138 fix navbar form alignment of inputs by restoring inline-block 2013-08-12 16:09:21 -07:00
Mark Otto
c558c035d7 fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes 2013-08-12 16:02:27 -07:00
Mark Otto
fb8ae7e514 drop the class on the button group toggles CSS (alt fix to #9297) 2013-08-12 15:46:11 -07:00
Mark Otto
394f698056 undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) 2013-08-12 15:02:09 -07:00
Mark Otto
eb1565681f fixes #9392: no need for width auto on inline/navbar form controls given inline-block on parent form group 2013-08-12 14:52:49 -07:00
Mark Otto
a78c8d9c04 Newfangled input and button group sizing (fixes #9295)
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.

* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.

Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
2013-08-12 14:03:57 -07:00
Mark Otto
abedd38c5b update grid xs mixin and update docs to match new mixins 2013-08-12 11:52:51 -07:00
Mark Otto
9564c356d3 inherit font-size in code when inside pre 2013-08-12 11:34:28 -07:00
Mark Otto
a74d6cfe73 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 11:09:07 -07:00
Mark Otto
f662dff6e9 fixes #9382: inline forms now require use of .form-group for proper alignment of all form controls 2013-08-12 11:07:23 -07:00
Mark Otto
ddd13dc100 Merge pull request #9373 from ggam/button-sizes
Added button-size mixin
2013-08-12 10:40:56 -07:00
Mark Otto
3d11e6dedf Merge pull request #9371 from ggam/buttons-consistency
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 10:06:34 -07:00
Mark Otto
a9a27d3794 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 10:01:22 -07:00
Mark Otto
55cfa8d38f Drop background-clip and background-size mixins since they have no prefixes anyway 2013-08-12 10:01:13 -07:00
ggam
d80d9251ef Removed remaining Glyphicons mentions in carousel.less 2013-08-12 14:20:17 +02:00
ggam
6993db1840 Added button-size mixin 2013-08-12 14:07:19 +02:00
ggam
83293516b6 Renamed btn-pseudo-states mixin to btn-variant for consistency 2013-08-12 13:55:09 +02:00
Mark Otto
175a112548 fix #9239 by restoring old ie8 responsive img foo 2013-08-12 01:56:38 -07:00
Mark Otto
5e73cc90d9 fixes #9266 manually on account of list group file reorganization 2013-08-12 01:39:43 -07:00
Mark Otto
acdbe73851 fixes #8835: make it so active list group items aren't dependent on an <a> tag 2013-08-12 01:38:06 -07:00
Mark Otto
6dbf588237 fixes #9310: alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button 2013-08-12 01:20:22 -07:00
Mark Otto
efe62a7ef4 rename and refactor a smidge to add medium grid mixins 2013-08-12 00:36:22 -07:00
Mark Otto
f50aea30c4 Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12 2013-08-12 00:31:28 -07:00
Mark Otto
a2b9988eb9 Media query (grid and responsive utilities) overhaul
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:

* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up

Alongside that, we've updated our media queries to better handle
advanced grid layouts:

* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)

We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).

Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:

* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range

-----

Fixes the following:

* #9135: fourth grid tier
* #9302: undoes previous range change for small grid system, so no need
to update any docs here
* #8755: consistent grid and responsive utilities schemas)
* #9195, #9216, and #9227: no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto
95affa32e6 simplify padding in list groups and margins on badges within 2013-08-11 21:17:49 -07:00
Mark Otto
c52a3508c6 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto
0819cfc450 addressing #9189 manually, part 7: thumbnails vars 2013-08-11 19:32:16 -07:00
Mark Otto
bf4900072d Drop the font-weight on panel labels since heading elements already get it 2013-08-11 19:20:23 -07:00
Mark Otto
85ec6e741d Follow up commit: fix collapse clearing and navbar brand/nav spacing 2013-08-11 19:19:44 -07:00
Mark Otto
ba8026e00f Refactor navbars to simplify things
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Mark Otto
c2cfd3153b addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable 2013-08-11 18:32:52 -07:00
Mark Otto
e9650f51bf addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500 2013-08-11 18:10:42 -07:00