From 4bcb89946bf556ff524a67c82e079f43b045e747 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:18:11 -0700 Subject: merge in #2684, offset on the .makeColumn mixin --- docs/assets/bootstrap.zip | Bin 71315 -> 71315 bytes docs/less.html | 10 ++++++++++ docs/templates/pages/less.mustache | 10 ++++++++++ 3 files changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6e1a6f41c..8c0bb2cd8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index 4fe26af56..3fecd1ade 100644 --- a/docs/less.html +++ b/docs/less.html @@ -812,6 +812,16 @@ @fluidGridColumnWidth, @fluidGridGutterWidth Generate a precent grid system with n columns and x % wide gutter + + #grid > .input() + @gridColumnWidth, @gridGutterWidth + Generate the pixel grid system for input elements, accounting for padding and borders + + + .makeColumn + @columns: 1, @offset: 0 + Turn any div into a grid column without the .span* classes +

CSS3 properties

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 5345cbf97..7698dd290 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -735,6 +735,16 @@ @fluidGridColumnWidth, @fluidGridGutterWidth {{_i}}Generate a precent grid system with n columns and x % wide gutter{{/i}} + + #grid > .input() + @gridColumnWidth, @gridGutterWidth + {{_i}}Generate the pixel grid system for input elements, accounting for padding and borders{{/i}} + + + .makeColumn + @columns: 1, @offset: 0 + {{_i}}Turn any div into a grid column without the .span* classes{{/i}} +

{{_i}}CSS3 properties{{/i}}

-- cgit v1.2.3 From def7ae7798916f105ba489b617cfa2b4af16afa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:30:43 -0700 Subject: bump version on docs homepage to 2.0.3 --- docs/assets/bootstrap.zip | Bin 71315 -> 71315 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8c0bb2cd8..14b37054f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 1f526fcdb..19e6a676a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -83,7 +83,7 @@

Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.

View project on GitHub - Download Bootstrap (v2.0.2) + Download Bootstrap (v2.0.3)

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index bef11b810..41a89e07a 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -6,7 +6,7 @@

{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}

{{_i}}View project on GitHub{{/i}} - {{_i}}Download Bootstrap (v2.0.2){{/i}} + {{_i}}Download Bootstrap (v2.0.3){{/i}}

-- cgit v1.2.3 From fc7ae48c95af554cb36e4b52482c262ac34aa47f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:47:27 -0700 Subject: fix #1823: styles of tabs within other tabs resolved --- docs/assets/bootstrap.zip | Bin 71315 -> 71319 bytes docs/assets/css/bootstrap.css | 46 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 14b37054f..2be92692f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c593d5669..b5ff8ee41 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2856,9 +2856,9 @@ input[type="submit"].btn.btn-mini { .tab-content { overflow: auto; } -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { +.tabs-below > .nav-tabs, +.tabs-right > .nav-tabs, +.tabs-left > .nav-tabs { border-bottom: 0; } .tab-content > .tab-pane, @@ -2869,71 +2869,71 @@ input[type="submit"].btn.btn-mini { .pill-content > .active { display: block; } -.tabs-below .nav-tabs { +.tabs-below > .nav-tabs { border-top: 1px solid #ddd; } -.tabs-below .nav-tabs > li { +.tabs-below > .nav-tabs > li { margin-top: -1px; margin-bottom: 0; } -.tabs-below .nav-tabs > li > a { +.tabs-below > .nav-tabs > li > a { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover { border-bottom-color: transparent; border-top-color: #ddd; } -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { +.tabs-below > .nav-tabs > .active > a, +.tabs-below > .nav-tabs > .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { +.tabs-left > .nav-tabs > li, +.tabs-right > .nav-tabs > li { float: none; } -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { +.tabs-left > .nav-tabs > li > a, +.tabs-right > .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; } -.tabs-left .nav-tabs { +.tabs-left > .nav-tabs { float: left; margin-right: 19px; border-right: 1px solid #ddd; } -.tabs-left .nav-tabs > li > a { +.tabs-left > .nav-tabs > li > a { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a, +.tabs-left > .nav-tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } -.tabs-right .nav-tabs { +.tabs-right > .nav-tabs { float: right; margin-left: 19px; border-left: 1px solid #ddd; } -.tabs-right .nav-tabs > li > a { +.tabs-right > .nav-tabs > li > a { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a, +.tabs-right > .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } -- cgit v1.2.3 From 490eb1bd16177f951b7c66c364d2eee6a6288a5d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 20:56:50 -0700 Subject: fix #3068: compile after changing comment --- docs/assets/bootstrap.zip | Bin 71319 -> 71251 bytes docs/assets/css/bootstrap.css | 2 -- 2 files changed, 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2be92692f..0fd350f5b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b5ff8ee41..131e6671e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1205,8 +1205,6 @@ legend + .control-group { } .form-horizontal .controls { margin-left: 160px; - /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ - *display: inline-block; *margin-left: 0; *padding-left: 20px; -- cgit v1.2.3