From 50f484eed6e9161cb7e50531b0fa3f16ada549e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 02:00:07 -0700 Subject: big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme --- docs/assets/css/docs.css | 3 +++ docs/index.html | 56 +++++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 27 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b7d241994..8334d3f12 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -13,6 +13,9 @@ body { section { padding-top: 60px; } +section > .row { + margin-bottom: 10px; +} #masthead, #footer { background-color: #049cd9; background-repeat: no-repeat; diff --git a/docs/index.html b/docs/index.html index 503be111b..ebaa5a6f3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1069,22 +1069,23 @@

Basic alerts

+

div.alert

One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

-
+
×

Oh snap! Change this and that and try again.

-
+
×

Holy gaucamole! Best check yo self, you’re not looking too good.

-
+
×

Well done! You successfully read this alert message.

-
+
×

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

@@ -1094,28 +1095,37 @@

Block messages

+

div.alert.alert-block

For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

-
+
×

Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Holy gaucamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

-

Take this action Or do this

+
+ Take this action Or do this +
@@ -1234,7 +1244,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita

What’s included

Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

-

Color variables

+

Variables

Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

 // Links
@@ -1258,8 +1268,9 @@ Lorem ipsum dolar sit amet illo error ipsum verita
 @pink:              #c3325f;
 @purple:            #7a43b6;
 
-// Baseline
-@baseline:          20px;
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;

Commenting

@@ -1311,8 +1322,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -1324,14 +1333,12 @@ Lorem ipsum dolar sit amet illo error ipsum verita background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { ... } - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 0.5, @endColor: #c3325f) { + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { ... } } @@ -1344,6 +1351,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita @gridColumns: 16; @gridColumnWidth: 40px; @gridGutterWidth: 20px; +@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); // Grid System .container { @@ -1352,16 +1360,10 @@ Lorem ipsum dolar sit amet illo error ipsum verita .clearfix(); } .columns(@columnSpan: 1) { - display: inline; - float: left; width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - margin-left: @gridGutterWidth; - &:first-child { - margin-left: 0; - } } .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) !important; + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; }
-- cgit v1.2.3