From 4dbd2334bd8156b7621e11c19a411db1308821d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 23:01:38 -0700 Subject: [PATCH] updated hero example, added fluid example, resolved issue with tabs and fluid nav --- bootstrap-1.2.0.css | 14 +++++- bootstrap-1.2.0.min.css | 7 ++- examples/fluid.html | 103 ++++++++++++++++++++++++++++++++++++++++ examples/hero.html | 5 ++ lib/patterns.less | 8 +++- lib/scaffolding.less | 9 ++++ 6 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 examples/fluid.html diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 7c286fc542..a4f671ebf3 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.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: Fri Sep 2 22:09:40 PDT 2011 + * Date: Fri Sep 2 22:56:14 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). @@ -445,6 +445,12 @@ a:hover { color: #0050a3; text-decoration: underline; } +.pull-right { + float: right; +} +.pull-left { + float: left; +} /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ @@ -1159,6 +1165,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { font-weight: 200; line-height: 1; } +.topbar p { + margin: 0; + line-height: 40px; +} .topbar form { float: left; margin: 5px 0 0 0; @@ -1460,6 +1470,7 @@ a.menu:after, .dropdown-toggle:after { display: block; } .tabs { + float: left; width: 100%; border-bottom: 1px solid #ddd; } @@ -1524,7 +1535,6 @@ a.menu:after, .dropdown-toggle:after { } .hero-unit { background-color: #f5f5f5; - margin-top: 60px; margin-bottom: 30px; padding: 60px; -webkit-border-radius: 6px; diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index 832a39dcd1..a238cc6d3e 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -74,6 +74,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .hide{display:none;} .show{display:block;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} +.pull-right{float:right;} +.pull-left{float:left;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} @@ -181,6 +183,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .topbar a:hover,.topbar ul .active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} .topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.topbar p{margin:0;line-height:40px;} .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} .topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} .topbar input::-webkit-input-placeholder{color:#e6e6e6;} @@ -206,14 +209,14 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} +.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} .tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;} .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} diff --git a/examples/fluid.html b/examples/fluid.html new file mode 100644 index 0000000000..63ffc75ef9 --- /dev/null +++ b/examples/fluid.html @@ -0,0 +1,103 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + +
+
+
+

Project name

+ +

Logged in as username

+
+
+
+ +
+
+
+
Sidebar
+ +
Sidebar
+ +
Sidebar
+ +
+
+
+ +
+

Hello, world!

+

Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

+

Learn more »

+
+ +
+
+

Heading

+

Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

+

View details »

+
+
+

Heading

+

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

+

View details »

+
+
+

Heading

+

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

+

View details »

+
+
+
+

© Company 2011

+
+
+
+ + + \ No newline at end of file diff --git a/examples/hero.html b/examples/hero.html index ef773c5d01..2255454c6d 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -13,6 +13,11 @@ + diff --git a/lib/patterns.less b/lib/patterns.less index 57e682da84..eccda9359a 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -46,6 +46,12 @@ } } + // Plain text in topbar + p { + margin: 0; + line-height: 40px; + } + // Search Form form { float: left; @@ -312,6 +318,7 @@ a.menu:after, // Basic Tabs .tabs { + float: left; width: 100%; border-bottom: 1px solid #ddd; > li { @@ -385,7 +392,6 @@ a.menu:after, .hero-unit { background-color: #f5f5f5; - margin-top: 60px; margin-bottom: 30px; padding: 60px; .border-radius(6px); diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 5f4734b996..845c4d3553 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -101,6 +101,7 @@ body { display: block; } + // BASE STYLES // ----------- @@ -115,3 +116,11 @@ a { text-decoration: underline; } } + +// Quick floats +.pull-right { + float: right; +} +.pull-left { + float: left; +}