Commit Graph

251 Commits

Author SHA1 Message Date
Mark Otto
0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Conflicts:
	dist/css/bootstrap.min.css
2013-08-23 23:16:37 -07:00
Mark Otto
fab039f29b run grunt 2013-08-23 14:26:16 -07:00
Mark Otto
12a70cec88 Run grunt dist on theme for some reason 2013-08-23 14:23:13 -07:00
Mark Otto
2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto
a0d0864bd7 fixes #9877: improve active state on nav list items in theme 2013-08-23 10:44:13 -07:00
Mark Otto
5bbbdb399b fixes #9879: add hover state to theme buttons 2013-08-23 10:36:37 -07:00
Cameron Little
9bdc841acc Added -webkit-overflow-scrolling: touch to responsive tables 2013-08-23 08:55:02 -07:00
James Lawrence
2cb1626907 Fixes #9974
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Mark Otto
3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
Mark Otto
c15b259f43 run grunt dist for #9864 2013-08-19 10:43:58 -07:00
Mark Otto
16976cc494 Fixes secondary issue in #9798 2013-08-19 09:36:56 -07:00
Mark Otto
7bc845abfa Add default navbar z-index to fix #9844
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
2013-08-19 09:31:16 -07:00
Mark Otto
01f7bc4d86 run grunt dist on #9847 2013-08-19 08:59:12 -07:00
Mark Otto
f497b5e1f5 move dropdown change from navbar to dropdowns to fix customizer compiling 2013-08-19 08:54:40 -07:00
Mark Otto
a9297c7ad2 save and recompile for that last commit 2013-08-19 08:51:25 -07:00
Mark Otto
285393fb77 Re-enable glyphicons in carousel controls and then remove redundant CSS from example 2013-08-19 00:58:29 -07:00
Mark Otto
d8128fca94 Change up label padding to equalize top and bottom 2013-08-19 00:36:39 -07:00
Mark Otto
14c4484ec4 Nuke margin for last child navbar text 2013-08-19 00:34:31 -07:00
Mark Otto
efa8b40ce8 Run grunt dist on responsive changes 2013-08-19 00:34:16 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Mark Otto
a9378a9267 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
2013-08-18 20:15:45 -07:00
Mark Otto
a1db2d7a5e Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
2013-08-18 20:11:04 -07:00
Mark Otto
e6ff75bcea Update var in theme 2013-08-18 19:57:25 -07:00
Mark Otto
bab51d27ac Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too) 2013-08-18 19:40:57 -07:00
Mark Otto
d5cd040f57 improve dependencies for image thumbnails and thumbnail component 2013-08-18 19:24:10 -07:00
Mark Otto
cf09e6a6b5 better alignment of glyphicons vertically 2013-08-18 19:05:48 -07:00
Mark Otto
5bd2d7ed7e fixes #9815: proper alignment of navbar nav if first child 2013-08-18 18:49:07 -07:00
Mark Otto
c240460f0b Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:47:29 -07:00
Mark Otto
7b4e2a9a4a Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:43:27 -07:00
Mark Otto
fe767a18d3 fixes #9798: update spacing on checkboxes and radios for horizontal 2013-08-18 15:41:24 -07:00
Chris Rebert
0501d83f8b regenerate CSS 2013-08-18 15:20:16 -07:00
Mark Otto
9b61b7a722 fixes #9803: label and input alignment in horizontal forms 2013-08-18 15:10:28 -07:00
Julian Thilo
546b2cc614 Fix some forgotten things for navbar-default
New variable names were missing here and there.
2013-08-18 23:30:40 +02:00
Julian Thilo
abca00870f Add a .navbar-default class for default colors
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
2013-08-18 23:05:56 +02:00
Mark Otto
9b66e6b0f4 fixes #9790: nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav 2013-08-18 11:17:28 -07:00
Mark Otto
26067d3d7d fixes #9768: unbold buttons 2013-08-18 11:11:31 -07:00
Mark Otto
ef4590dfb4 fixes #9786: enable tables in panels 2013-08-18 11:08:20 -07:00
Mark Otto
f8b65b41ab Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mark Otto
73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
liuyl
ce410dc36e fixed caret 2013-08-18 20:13:48 +08:00
Mark Otto
e13ca6d384 Upgrade to latest glyphicons 2013-08-18 01:46:26 -07:00
Mark Otto
f2e35bf702 docs layout and alignment refinement 2013-08-18 01:23:45 -07:00
Mark Otto
1e0453f825 Restore glyphicons 2013-08-18 00:36:51 -07:00
Mark Otto
f891f91bac Reorder bootstrap.less to match docs oder 2013-08-17 21:18:00 -07:00
Mark Otto
5539db5237 Navbar update
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
2013-08-17 21:00:13 -07:00
Mark Otto
d713f8341c Update jumbotron
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display

Fixes #9759.
2013-08-17 20:33:52 -07:00
Mark Otto
c56a749323 Finish first pass at and docment Bootstrap v2-ish theme
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
2013-08-17 18:59:50 -07:00
Mark Otto
ba20e512ce Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
	dist/css/bootstrap.min.css
2013-08-17 17:31:58 -07:00
Mark Otto
e587219958 Fix navbar brand alignment by removing header padding when above 768px 2013-08-17 17:26:52 -07:00