Skip to content

Commit ce615d0

Browse files
mdomdo
committed
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts
1 parent 04b8e66 commit ce615d0

File tree

6 files changed

+103
-120
lines changed

6 files changed

+103
-120
lines changed

‎bootstrap-1.1.0.css

Lines changed: 27 additions & 32 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: Thu Aug 25 13:52:00 PDT 2011
9+
* Date: Thu Aug 25 22:35:30 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).
@@ -122,27 +122,27 @@ aside {
122122
clear: both;
123123
}
124124
.btn.danger,
125-
.alert.danger,
125+
.alert-message.danger,
126126
.btn.danger:hover,
127-
.alert.danger:hover,
127+
.alert-message.danger:hover,
128128
.btn.error,
129-
.alert.error,
129+
.alert-message.error,
130130
.btn.error:hover,
131-
.alert.error:hover,
131+
.alert-message.error:hover,
132132
.btn.success,
133-
.alert.success,
133+
.alert-message.success,
134134
.btn.success:hover,
135-
.alert.success:hover,
135+
.alert-message.success:hover,
136136
.btn.info,
137-
.alert.info,
137+
.alert-message.info,
138138
.btn.info:hover,
139-
.alert.info:hover {
139+
.alert-message.info:hover {
140140
color: #ffffff;
141141
}
142142
.btn.danger,
143-
.alert.danger,
143+
.alert-message.danger,
144144
.btn.error,
145-
.alert.error {
145+
.alert-message.error {
146146
background-color: #d6463e;
147147
background-repeat: repeat-x;
148148
background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));
@@ -156,7 +156,7 @@ aside {
156156
border-color: #d6463e #d6463e #a52a23;
157157
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
158158
}
159-
.btn.success, .alert.success {
159+
.btn.success, .alert-message.success {
160160
background-color: #57a957;
161161
background-repeat: repeat-x;
162162
background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
@@ -170,7 +170,7 @@ aside {
170170
border-color: #57a957 #57a957 #3d773d;
171171
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
172172
}
173-
.btn.info, .alert.info {
173+
.btn.info, .alert-message.info {
174174
background-color: #36b3d9;
175175
background-repeat: repeat-x;
176176
background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));
@@ -1368,7 +1368,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
13681368
padding: 0;
13691369
border: 0;
13701370
}
1371-
.alert {
1371+
.alert-message {
13721372
background-color: #eedc94;
13731373
background-repeat: repeat-x;
13741374
background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
@@ -1394,23 +1394,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
13941394
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
13951395
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
13961396
}
1397-
.alert h5 {
1397+
.alert-message h5 {
13981398
line-height: 18px;
13991399
}
1400-
.alert p {
1400+
.alert-message p {
14011401
margin-bottom: 0;
14021402
}
1403-
.alert div {
1403+
.alert-message div {
14041404
margin-top: 5px;
14051405
margin-bottom: 2px;
14061406
line-height: 28px;
14071407
}
1408-
.alert .btn {
1408+
.alert-message .btn {
14091409
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
14101410
-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
14111411
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
14121412
}
1413-
.alert .close {
1413+
.alert-message .close {
14141414
float: right;
14151415
margin-top: -2px;
14161416
color: #000000;
@@ -1422,15 +1422,15 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
14221422
-moz-opacity: 0.2;
14231423
opacity: 0.2;
14241424
}
1425-
.alert .close:hover {
1425+
.alert-message .close:hover {
14261426
color: #000000;
14271427
text-decoration: none;
14281428
filter: alpha(opacity=40);
14291429
-khtml-opacity: 0.4;
14301430
-moz-opacity: 0.4;
14311431
opacity: 0.4;
14321432
}
1433-
.alert.alert-block, .alert.alert-block:hover {
1433+
.alert-message.block-message {
14341434
background-image: none;
14351435
background-color: #fdf5d9;
14361436
padding: 14px;
@@ -1439,30 +1439,25 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
14391439
-moz-box-shadow: none;
14401440
box-shadow: none;
14411441
}
1442-
.alert.alert-block p, .alert.alert-block:hover p {
1442+
.alert-message.block-message p {
14431443
margin-right: 30px;
14441444
}
1445-
.alert.alert-block .alert-actions, .alert.alert-block:hover .alert-actions {
1445+
.alert-message.block-message .alert-actions {
14461446
margin-top: 5px;
14471447
}
1448-
.alert.alert-block.error,
1449-
.alert.alert-block:hover.error,
1450-
.alert.alert-block.success,
1451-
.alert.alert-block:hover.success,
1452-
.alert.alert-block.info,
1453-
.alert.alert-block:hover.info {
1448+
.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
14541449
color: #404040;
14551450
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
14561451
}
1457-
.alert.alert-block.error, .alert.alert-block:hover.error {
1452+
.alert-message.block-message.error {
14581453
background-color: #fddfde;
14591454
border-color: #fbc7c6;
14601455
}
1461-
.alert.alert-block.success, .alert.alert-block:hover.success {
1456+
.alert-message.block-message.success {
14621457
background-color: #d1eed1;
14631458
border-color: #bfe7bf;
14641459
}
1465-
.alert.alert-block.info, .alert.alert-block:hover.info {
1460+
.alert-message.block-message.info {
14661461
background-color: #ddf4fb;
14671462
border-color: #c6edf9;
14681463
}

‎bootstrap-1.1.0.min.css

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/css/docs.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ div.mini-layout div {
171171
div.mini-layout div.mini-layout-body {
172172
background-color: #dceaf4;
173173
margin: 0 auto;
174-
width: 450px;
174+
width: 340px;
175175
height: 340px;
176176
}
177177
div.mini-layout.fluid div.mini-layout-sidebar,
@@ -185,7 +185,7 @@ div.mini-layout.fluid div.mini-layout-sidebar {
185185
height: 340px;
186186
}
187187
div.mini-layout.fluid div.mini-layout-body {
188-
width: 400px;
188+
width: 300px;
189189
margin-left: 10px;
190190
}
191191
/* Topbar special styles

0 commit comments

Comments
 (0)