From e8d9eb264c3ba8c263d37259f65eece7247b00b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Sep 2011 10:51:44 -0700 Subject: [PATCH] update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing --- bootstrap.css | 14 +++++++++----- bootstrap.min.css | 9 +++++---- docs/assets/css/docs.css | 5 +++-- examples/container-app.html | 2 +- examples/fluid.html | 36 ++++++++++++++++++++++++++++-------- examples/hero.html | 2 +- lib/patterns.less | 9 +++++++-- 7 files changed, 54 insertions(+), 23 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 8f1058535e..94dbb099be 100644 --- a/bootstrap.css +++ b/bootstrap.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 16 10:13:51 PDT 2011 + * Date: Fri Sep 16 10:51:22 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). @@ -1589,8 +1589,8 @@ a.menu:after, .dropdown-toggle:after { top: 1px; } .tabs > li > a { - margin-right: 2px; padding: 0 15px; + margin-right: 2px; line-height: 36px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; @@ -1603,7 +1603,6 @@ a.menu:after, .dropdown-toggle:after { border-color: #eee #eee #ddd; } .tabs > li.active > a { - padding: 0 14px; color: #808080; background-color: #ffffff; border: 1px solid #ddd; @@ -1939,6 +1938,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } +.alert-message .close { + *margin-top: 3px; + /* IE7 spacing */ + +} .alert-message h5 { line-height: 18px; } @@ -2252,8 +2256,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background: #333; - background: rgba(0, 0, 0, 0.8); + background-color: #000000; + background-color: rgba(0, 0, 0, 0.8); padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 4b06450f99..e9ddd96fc3 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -240,8 +240,8 @@ 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;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.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:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} -.tabs>li.active>a{padding:0 14px;color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} +.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} .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.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} @@ -273,7 +273,8 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} :root .alert-message,:root .btn{border-radius:0 \0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message h5{line-height:18px;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} +.alert-message h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} .alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} @@ -314,7 +315,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background:#333;background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f2ccd00604..fb727a900a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -185,7 +185,6 @@ section > .row { } .show-grid [class*="span"] { background: #eee; - background: rgba(0,0,0,.1); text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -195,12 +194,14 @@ section > .row { } .show-grid:hover [class*="span"] { background: #ddd; - background: rgba(0,0,0,.2); } .show-grid .show-grid { margin-top: 0; margin-bottom: 0; } +.show-grid .show-grid [class*="span"] { + background-color: #ccc; +} /* Render mini layout previews diff --git a/examples/container-app.html b/examples/container-app.html index 6432ecf0d8..75328e645f 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -78,7 +78,7 @@
-

Project name

+ Project name
  • Home
  • About
    • diff --git a/examples/fluid.html b/examples/fluid.html index bef16804b5..eacb5c3d2d 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -31,7 +31,7 @@
    -

    Project name

    + Project name
    -
    -
    a
    -
    b
    -
    -
    -
    a
    -
    b
    +
    +

    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 »

    +
    @@ -96,6 +94,28 @@

    View details »

    + +
    + + +
    +
    +

    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

    diff --git a/examples/hero.html b/examples/hero.html index fab3d688b1..6ded6e1e95 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -31,7 +31,7 @@
    -

    Project name

    + Project name
    • Home
    • About
      • diff --git a/lib/patterns.less b/lib/patterns.less index cb92126aaa..ce387614e9 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -641,6 +641,11 @@ input[type=submit].btn { .border-radius(4px); .box-shadow(inset 0 1px 0 rgba(255,255,255,.25)); + // Adjust close icon + .close { + *margin-top: 3px; /* IE7 spacing */ + } + // Remove extra margin from content h5 { line-height: @baseline; @@ -915,8 +920,8 @@ input[type=submit].btn { height: 0; } .inner { - background: #333; - background: rgba(0,0,0,.8); + background-color: @black; + background-color: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px;