Skip to content

Commit 50f484e

Browse files
mdomdo
committed
big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme
1 parent 8368cfd commit 50f484e

File tree

6 files changed

+230
-222
lines changed

6 files changed

+230
-222
lines changed

‎bootstrap-1.1.0.css

Lines changed: 103 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Wed Aug 24 19:43:43 PDT 2011
9+
* Date: Thu Aug 25 01:55:33 PDT 2011
1010
*/
1111
/* Reset.less
1212
* 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).
@@ -127,7 +127,7 @@ aside {
127127
* ------------------------------------------------------------------------------------------- */
128128
.row {
129129
zoom: 1;
130-
margin: 0 -20px;
130+
margin-left: -20px;
131131
}
132132
.row:before, .row:after {
133133
display: table;
@@ -152,9 +152,9 @@ aside {
152152
.row .span14,
153153
.row .span15,
154154
.row .span16 {
155+
display: inline;
155156
float: left;
156157
margin-left: 20px;
157-
*display: inline;
158158
}
159159
.row .span1 {
160160
width: 40px;
@@ -1324,86 +1324,103 @@ footer {
13241324
.page-header h1 {
13251325
margin-bottom: 8px;
13261326
}
1327-
.alert-message {
1328-
background-color: rgba(0, 0, 0, 0.15);
1327+
.alert {
1328+
background-color: #eedc94;
13291329
background-repeat: repeat-x;
1330-
background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));
1331-
background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
1332-
background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
1333-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));
1334-
background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
1335-
background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
1336-
background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
1337-
filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
1338-
background-color: #e6e6e6;
1330+
background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
1331+
background-image: -moz-linear-gradient(#fceec1, #eedc94);
1332+
background-image: -ms-linear-gradient(#fceec1, #eedc94);
1333+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
1334+
background-image: -webkit-linear-gradient(#fceec1, #eedc94);
1335+
background-image: -o-linear-gradient(#fceec1, #eedc94);
1336+
background-image: linear-gradient(#fceec1, #eedc94);
1337+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1338+
border-color: #e7ce68 #e7ce68 #e4c652;
1339+
border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);
13391340
margin-bottom: 18px;
1340-
padding: 8px 15px;
1341-
color: #fff;
1342-
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
1343-
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
1341+
padding: 7px 14px;
1342+
color: #404040;
1343+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
1344+
border-width: 1px;
1345+
border-style: solid;
13441346
-webkit-border-radius: 4px;
13451347
-moz-border-radius: 4px;
13461348
border-radius: 4px;
1349+
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
1350+
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
1351+
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
13471352
}
1348-
.alert-message p {
1349-
color: #fff;
1353+
.alert h5 {
1354+
line-height: 18px;
1355+
}
1356+
.alert p {
13501357
margin-bottom: 0;
13511358
}
1352-
.alert-message p + p {
1359+
.alert div {
13531360
margin-top: 5px;
1361+
margin-bottom: 2px;
1362+
line-height: 28px;
1363+
}
1364+
.alert .btn {
1365+
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
1366+
-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
1367+
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
1368+
}
1369+
.alert-error,
1370+
.alert-success,
1371+
.alert-info,
1372+
.alert-error h5,
1373+
.alert-success h5,
1374+
.alert-info h5 {
1375+
color: #fff;
1376+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
13541377
}
1355-
.alert-message.error {
1356-
background-color: #d83a2e;
1378+
.alert-error {
1379+
background-color: #d6463e;
13571380
background-repeat: repeat-x;
1358-
background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));
1359-
background-image: -moz-linear-gradient(#e4776f, #d83a2e);
1360-
background-image: -ms-linear-gradient(#e4776f, #d83a2e);
1361-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));
1362-
background-image: -webkit-linear-gradient(#e4776f, #d83a2e);
1363-
background-image: -o-linear-gradient(#e4776f, #d83a2e);
1364-
background-image: linear-gradient(#e4776f, #d83a2e);
1365-
border-bottom-color: #b32b21;
1366-
}
1367-
.alert-message.warning {
1368-
background-color: #ffd040;
1369-
background-repeat: repeat-x;
1370-
background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));
1371-
background-image: -moz-linear-gradient(#ffe38d, #ffd040);
1372-
background-image: -ms-linear-gradient(#ffe38d, #ffd040);
1373-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));
1374-
background-image: -webkit-linear-gradient(#ffe38d, #ffd040);
1375-
background-image: -o-linear-gradient(#ffe38d, #ffd040);
1376-
background-image: linear-gradient(#ffe38d, #ffd040);
1377-
border-bottom-color: #ffc40d;
1381+
background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));
1382+
background-image: -moz-linear-gradient(#f56a66, #d6463e);
1383+
background-image: -ms-linear-gradient(#f56a66, #d6463e);
1384+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));
1385+
background-image: -webkit-linear-gradient(#f56a66, #d6463e);
1386+
background-image: -o-linear-gradient(#f56a66, #d6463e);
1387+
background-image: linear-gradient(#f56a66, #d6463e);
1388+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1389+
border-color: #ba2f27 #ba2f27 #a52a23;
1390+
border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);
13781391
}
1379-
.alert-message.success {
1380-
background-color: #62bc62;
1392+
.alert-success {
1393+
background-color: #57a957;
13811394
background-repeat: repeat-x;
1382-
background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));
1383-
background-image: -moz-linear-gradient(#97d397, #62bc62);
1384-
background-image: -ms-linear-gradient(#97d397, #62bc62);
1385-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));
1386-
background-image: -webkit-linear-gradient(#97d397, #62bc62);
1387-
background-image: -o-linear-gradient(#97d397, #62bc62);
1388-
background-image: linear-gradient(#97d397, #62bc62);
1389-
border-bottom-color: #46a546;
1395+
background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
1396+
background-image: -moz-linear-gradient(#62c462, #57a957);
1397+
background-image: -ms-linear-gradient(#62c462, #57a957);
1398+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
1399+
background-image: -webkit-linear-gradient(#62c462, #57a957);
1400+
background-image: -o-linear-gradient(#62c462, #57a957);
1401+
background-image: linear-gradient(#62c462, #57a957);
1402+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1403+
border-color: #458845 #458845 #3d773d;
1404+
border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);
13901405
}
1391-
.alert-message.info {
1392-
background-color: #04aef4;
1406+
.alert-info {
1407+
background-color: #36b3d9;
13931408
background-repeat: repeat-x;
1394-
background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));
1395-
background-image: -moz-linear-gradient(#62cffc, #04aef4);
1396-
background-image: -ms-linear-gradient(#62cffc, #04aef4);
1397-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));
1398-
background-image: -webkit-linear-gradient(#62cffc, #04aef4);
1399-
background-image: -o-linear-gradient(#62cffc, #04aef4);
1400-
background-image: linear-gradient(#62cffc, #04aef4);
1401-
border-bottom-color: #049cdb;
1409+
background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));
1410+
background-image: -moz-linear-gradient(#6bd0ee, #36b3d9);
1411+
background-image: -ms-linear-gradient(#6bd0ee, #36b3d9);
1412+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));
1413+
background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9);
1414+
background-image: -o-linear-gradient(#6bd0ee, #36b3d9);
1415+
background-image: linear-gradient(#6bd0ee, #36b3d9);
1416+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1417+
border-color: #2396b9 #2396b9 #1f85a4;
1418+
border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);
14021419
}
1403-
.alert-message .close {
1420+
.close {
14041421
float: right;
14051422
margin-top: -2px;
1406-
color: #000;
1423+
color: #000000;
14071424
font-size: 20px;
14081425
font-weight: bold;
14091426
text-shadow: 0 1px 0 #ffffff;
@@ -1412,56 +1429,40 @@ footer {
14121429
-moz-opacity: 0.2;
14131430
opacity: 0.2;
14141431
}
1415-
.alert-message .close:hover {
1432+
.close:hover {
1433+
color: #000000;
14161434
text-decoration: none;
14171435
filter: alpha(opacity=40);
14181436
-khtml-opacity: 0.4;
14191437
-moz-opacity: 0.4;
14201438
opacity: 0.4;
14211439
}
1422-
.block-message {
1423-
margin-bottom: 18px;
1440+
.alert-block {
1441+
background-image: none;
1442+
background-color: #fdf5d9;
14241443
padding: 14px;
1425-
color: #404040;
1426-
color: rgba(0, 0, 0, 0.8);
1427-
*color: #404040;
1428-
/* IE 6-7 */
1429-
1430-
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
1431-
-webkit-border-radius: 6px;
1432-
-moz-border-radius: 6px;
1433-
border-radius: 6px;
1444+
border-color: #fceec1;
1445+
-webkit-box-shadow: none;
1446+
-moz-box-shadow: none;
1447+
box-shadow: none;
14341448
}
1435-
.block-message p {
1436-
color: #404040;
1437-
color: rgba(0, 0, 0, 0.8);
1438-
*color: #404040;
1439-
/* IE 6-7 */
1440-
1449+
.alert-block p {
14411450
margin-right: 30px;
1442-
margin-bottom: 0;
14431451
}
1444-
.block-message ul {
1445-
margin-bottom: 0;
1446-
}
1447-
.block-message strong {
1448-
display: block;
1449-
}
1450-
.block-message.error {
1451-
background: #f8dcda;
1452-
border: 1px solid #f4c8c5;
1452+
.alert-block .alert-actions {
1453+
margin-top: 5px;
14531454
}
1454-
.block-message.warning {
1455-
background: #fff0c0;
1456-
border: 1px solid #ffe38d;
1455+
.alert-block.error {
1456+
background-color: #fddfde;
1457+
border-color: #fbc7c6;
14571458
}
1458-
.block-message.success {
1459-
background: #dff1df;
1460-
border: 1px solid #bbe2bb;
1459+
.alert-block.success {
1460+
background-color: #d1eed1;
1461+
border-color: #bfe7bf;
14611462
}
1462-
.block-message.info {
1463-
background: #c7eefe;
1464-
border: 1px solid #ade6fe;
1463+
.alert-block.info {
1464+
background-color: #ddf4fb;
1465+
border-color: #c6edf9;
14651466
}
14661467
.tabs, .pills {
14671468
margin: 0 0 20px;

0 commit comments

Comments
 (0)