From 0c656e29fc77472381d9673d58b53da391c31773 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Sep 2011 22:50:59 -0700 Subject: updated styles for the media grids --- bootstrap-1.3.0.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap-1.3.0.css') diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index de9b0045f..fef02501d 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Sep 10 22:46:48 PDT 2011 + * Date: Sat Sep 10 22:50:02 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2252,7 +2252,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .media-grid li { display: inline; } -.media-grid .thumbnail { +.media-grid a { float: left; padding: 4px; margin: 0 0 20px 20px; @@ -2264,12 +2264,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } -.media-grid .thumbnail:hover { +.media-grid a img { + display: block; +} +.media-grid a:hover { border-color: #0069d6; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } -.media-grid img { - display: block; -} -- cgit v1.2.3 From 3ad034ea9671ffbc44278085ca3bb30979808278 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 17:36:15 -0700 Subject: fix legends in ie7 --- bootstrap-1.3.0.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap-1.3.0.css') diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index fef02501d..a792c99ea 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Sep 10 22:50:02 PDT 2011 + * Date: Sun Sep 11 17:36:01 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -692,13 +692,13 @@ fieldset legend { padding-left: 150px; font-size: 19.5px; line-height: 1; - *margin: 0 0 5px 145px; + color: #404040; + *padding: 0 0 5px 145px; /* IE6-7 */ *line-height: 1.5; /* IE6-7 */ - color: #404040; } form .clearfix { margin-bottom: 18px; -- cgit v1.2.3 From f3f60b21a6104be999cb04f6414878fc4dea98cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 18:09:01 -0700 Subject: oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix --- bootstrap-1.3.0.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap-1.3.0.css') diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index a792c99ea..0c20b8d64 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Sep 11 17:36:01 PDT 2011 + * Date: Sun Sep 11 18:08:25 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -771,6 +771,9 @@ input[type=button], input[type=reset], input[type=submit] { select, input[type=file] { height: 27px; line-height: 27px; + *margin-top: 4px; + /* For IE7, add top margin to align select with labels */ + } textarea { height: auto; -- cgit v1.2.3 From 53812bc2d82adb1a4a96afb33391a1d59990c4fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 18:44:25 -0700 Subject: remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles --- bootstrap-1.3.0.css | 148 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 42 deletions(-) (limited to 'bootstrap-1.3.0.css') diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 0c20b8d64..fc1746408 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Sep 11 18:08:25 PDT 2011 + * Date: Sun Sep 11 18:43:05 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -374,129 +374,129 @@ a:hover { .row:after { clear: both; } -.row [class*="span"] { +[class*="span"] { display: inline; float: left; margin-left: 20px; } -.row .span1 { +.span1 { width: 40px; } -.row .span2 { +.span2 { width: 100px; } -.row .span3 { +.span3 { width: 160px; } -.row .span4 { +.span4 { width: 220px; } -.row .span5 { +.span5 { width: 280px; } -.row .span6 { +.span6 { width: 340px; } -.row .span7 { +.span7 { width: 400px; } -.row .span8 { +.span8 { width: 460px; } -.row .span9 { +.span9 { width: 520px; } -.row .span10 { +.span10 { width: 580px; } -.row .span11 { +.span11 { width: 640px; } -.row .span12 { +.span12 { width: 700px; } -.row .span13 { +.span13 { width: 760px; } -.row .span14 { +.span14 { width: 820px; } -.row .span15 { +.span15 { width: 880px; } -.row .span16 { +.span16 { width: 940px; } -.row .span17 { +.span17 { width: 1000px; } -.row .span18 { +.span18 { width: 1060px; } -.row .span19 { +.span19 { width: 1120px; } -.row .span20 { +.span20 { width: 1180px; } -.row .span21 { +.span21 { width: 1240px; } -.row .span22 { +.span22 { width: 1300px; } -.row .span23 { +.span23 { width: 1360px; } -.row .span24 { +.span24 { width: 1420px; } -.row .offset1 { +.offset1 { margin-left: 80px; } -.row .offset2 { +.offset2 { margin-left: 140px; } -.row .offset3 { +.offset3 { margin-left: 200px; } -.row .offset4 { +.offset4 { margin-left: 260px; } -.row .offset5 { +.offset5 { margin-left: 320px; } -.row .offset6 { +.offset6 { margin-left: 380px; } -.row .offset7 { +.offset7 { margin-left: 440px; } -.row .offset8 { +.offset8 { margin-left: 500px; } -.row .offset9 { +.offset9 { margin-left: 560px; } -.row .offset10 { +.offset10 { margin-left: 620px; } -.row .offset11 { +.offset11 { margin-left: 680px; } -.row .offset12 { +.offset12 { margin-left: 740px; } -.row .span-one-third { +.span-one-third { width: 300px; } -.row .span-two-thirds { +.span-two-thirds { width: 620px; } -.row .offset-one-third { +.offset-one-third { margin-left: 340px; } -.row .offset-two-thirds { +.offset-two-thirds { margin-left: 660px; } /* Typography.less @@ -883,6 +883,70 @@ select.xxlarge { textarea.xxlarge { overflow-y: auto; } +input.span1, textarea.span1, select.span1 { + width: 30px; + margin-left: 0; +} +input.span2, textarea.span2, select.span2 { + width: 90px; + margin-left: 0; +} +input.span3, textarea.span3, select.span3 { + width: 150px; + margin-left: 0; +} +input.span4, textarea.span4, select.span4 { + width: 210px; + margin-left: 0; +} +input.span5, textarea.span5, select.span5 { + width: 270px; + margin-left: 0; +} +input.span6, textarea.span6, select.span6 { + width: 330px; + margin-left: 0; +} +input.span7, textarea.span7, select.span7 { + width: 390px; + margin-left: 0; +} +input.span8, textarea.span8, select.span8 { + width: 450px; + margin-left: 0; +} +input.span9, textarea.span9, select.span9 { + width: 510px; + margin-left: 0; +} +input.span10, textarea.span10, select.span10 { + width: 570px; + margin-left: 0; +} +input.span11, textarea.span11, select.span11 { + width: 630px; + margin-left: 0; +} +input.span12, textarea.span12, select.span12 { + width: 690px; + margin-left: 0; +} +input.span13, textarea.span13, select.span13 { + width: 750px; + margin-left: 0; +} +input.span14, textarea.span14, select.span14 { + width: 810px; + margin-left: 0; +} +input.span15, textarea.span15, select.span15 { + width: 870px; + margin-left: 0; +} +input.span16, textarea.span16, select.span16 { + width: 930px; + margin-left: 0; +} input[disabled], select[disabled], textarea[disabled], -- cgit v1.2.3 From 2674210ff06a9ceaaa98263a2cbe2246fcd21111 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 20:00:45 -0700 Subject: move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7 --- bootstrap-1.3.0.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap-1.3.0.css') diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index fc1746408..966ce6d2e 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Sep 11 18:43:05 PDT 2011 + * Date: Sun Sep 11 19:59:57 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1304,10 +1304,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #ffffff; text-decoration: none; } -.topbar .brand, .topbar h3 { +.topbar h3 { position: relative; } -.topbar .brand a, .topbar h3 a { +.topbar h3 a, .topbar .brand { float: left; display: block; padding: 8px 20px 12px; -- cgit v1.2.3