rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
6,422 Commits 108 Branches 89 Tags 547 MiB
802e5caf51
Commit Graph

1956 Commits

Author SHA1 Message Date
Mark Otto
fc0e7686fb Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-23 23:40:12 -07:00
Mark Otto
d82030f482 Merge pull request #10057 from sambowler/patch-1 
Fix responsive table scrolling on Windows Phone 8.
 2013-08-23 23:19:05 -07:00
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
b86cd3bc3d Merge branch 'master' into deprecate-screen-device-vars 
Conflicts:
	less/variables.less
 2013-08-23 22:56:23 -07:00
Mark Otto
d5a2785545 more specific deprecation comment 2013-08-23 22:51:39 -07:00
Mark Otto
8a96616726 Merge pull request #9963 from twbs/min-breakpoint-naming 
rename @screen-XX to @screen-XX-min for clarity+unambiguity
 2013-08-23 22:50:41 -07:00
Mark Otto
a66ccbc562 split mixin and grunt dist to be sure 2013-08-23 22:19:58 -07:00
Mark Otto
6de67c0ab6 Deprecate .hide-text mixin for .text-hide as mixin and class 2013-08-23 22:11:41 -07:00
Mark Otto
2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto
310642d5ac Merge branch 'master' into header-font-size-vars 2013-08-23 14:00:28 -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
Sam Bowler
343fd1bb1e Fix responsive table scrolling on Windows Phone 8. 2013-08-23 07:53:09 +01:00
Chris Rebert
22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
James Lawrence
2cb1626907 Fixes #9974 
Added th selector in .table-row-variant mixin
 2013-08-21 17:56:36 +01:00
Denis Gonchar
4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Chris Rebert
a3a02f9e6e rename @screen-XX to @screen-XX-min for clarity+unambiguity 2013-08-20 23:25:13 -07:00
Chris Rebert
9a4fbde461 add variables for heading font sizes; fixes #9921 2013-08-20 17:49:23 -07:00
Geremia Taglialatela
db7cce42f2 Removing whitespaces 2013-08-20 14:56:10 +02:00
Mark Otto
3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
Mark Otto
3d5ccc6c6f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 10:43:45 -07:00
Mark Otto
723b9b89d7 Merge pull request #9864 from boomsb/3.0.0-wip 
Update tables.less
 2013-08-19 10:43:26 -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
boomsb
bfe2dc4109 Update tables.less 
Fixed Table cell sizing with multiple classes by using *= instead of ^=
 2013-08-19 11:30:38 -05:00
Mark Otto
d195d5989f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 08:58:59 -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
7e82ceb533 fix #9832 somewhat: more vars for jumbotron 2013-08-19 08:46:49 -07:00
saiwang
fabbb9e4ba .table style is duplicate in List groups in panels and Tables in panels 2013-08-19 22:08:06 +08: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
3260288df8 Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip 2013-08-19 00:15:47 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Elvis Ratzlaff
988c03d462 Variable name fix 2013-08-19 00:46:09 -04:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Elvis Ratzlaff
5b3e6eb563 make visible/hidden classes mixable 2013-08-19 00:23:53 -04: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
108d10a920 Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times 2013-08-18 19:50:53 -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
9dcae610e9 Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
 2013-08-18 19:02:42 -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