Skip to content

Commit e8d9eb2

Browse files
mdomdo
committed
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing
1 parent 2903331 commit e8d9eb2

File tree

7 files changed

+52
-21
lines changed

7 files changed

+52
-21
lines changed

‎bootstrap.css

Lines changed: 9 additions & 5 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: Fri Sep 16 10:13:51 PDT 2011
9+
* Date: Fri Sep 16 10:51:22 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).
@@ -1589,8 +1589,8 @@ a.menu:after, .dropdown-toggle:after {
15891589
top: 1px;
15901590
}
15911591
.tabs > li > a {
1592-
margin-right: 2px;
15931592
padding: 0 15px;
1593+
margin-right: 2px;
15941594
line-height: 36px;
15951595
border: 1px solid transparent;
15961596
-webkit-border-radius: 4px 4px 0 0;
@@ -1603,7 +1603,6 @@ a.menu:after, .dropdown-toggle:after {
16031603
border-color: #eee #eee #ddd;
16041604
}
16051605
.tabs > li.active > a {
1606-
padding: 0 14px;
16071606
color: #808080;
16081607
background-color: #ffffff;
16091608
border: 1px solid #ddd;
@@ -1939,6 +1938,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
19391938
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
19401939
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
19411940
}
1941+
.alert-message .close {
1942+
*margin-top: 3px;
1943+
/* IE7 spacing */
1944+
1945+
}
19421946
.alert-message h5 {
19431947
line-height: 18px;
19441948
}
@@ -2252,8 +2256,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
22522256
height: 0;
22532257
}
22542258
.popover .inner {
2255-
background: #333;
2256-
background: rgba(0, 0, 0, 0.8);
2259+
background-color: #000000;
2260+
background-color: rgba(0, 0, 0, 0.8);
22572261
padding: 3px;
22582262
overflow: hidden;
22592263
width: 280px;

‎bootstrap.min.css

Lines changed: 5 additions & 4 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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ section > .row {
185185
}
186186
.show-grid [class*="span"] {
187187
background: #eee;
188-
background: rgba(0,0,0,.1);
189188
text-align: center;
190189
-webkit-border-radius: 3px;
191190
-moz-border-radius: 3px;
@@ -195,12 +194,14 @@ section > .row {
195194
}
196195
.show-grid:hover [class*="span"] {
197196
background: #ddd;
198-
background: rgba(0,0,0,.2);
199197
}
200198
.show-grid .show-grid {
201199
margin-top: 0;
202200
margin-bottom: 0;
203201
}
202+
.show-grid .show-grid [class*="span"] {
203+
background-color: #ccc;
204+
}
204205

205206

206207
/* Render mini layout previews

‎examples/container-app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<div class="topbar">
7979
<div class="fill">
8080
<div class="container">
81-
<h3><a href="#">Project name</a></h3>
81+
<a class="brand" href="#">Project name</a>
8282
<ul class="nav">
8383
<li class="active"><a href="#">Home</a></li>
8484
<li><a href="#about">About</a></li>

‎examples/fluid.html

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="topbar">
3232
<div class="topbar-inner">
3333
<div class="container-fluid">
34-
<h3><a href="#">Project name</a></h3>
34+
<a class="brand" href="#">Project name</a>
3535
<ul class="nav">
3636
<li class="active"><a href="#">Home</a></li>
3737
<li><a href="#about">About</a></li>
@@ -70,14 +70,33 @@ <h5>Sidebar</h5>
7070
</div>
7171
<div class="content">
7272
<!-- Main hero unit for a primary marketing message or call to action -->
73-
<div class="row">
74-
<div class="span4">a</div>
75-
<div class="span12">b</div>
73+
<div class="hero-unit">
74+
<h1>Hello, world!</h1>
75+
<p>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.</p>
76+
<p><a class="btn primary large">Learn more &raquo;</a></p>
7677
</div>
78+
79+
<!-- Example row of columns -->
7780
<div class="row">
78-
<div class="span4">a</div>
79-
<div class="span12">b</div>
81+
<div class="span6">
82+
<h2>Heading</h2>
83+
<p>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.</p>
84+
<p><a class="btn" href="#">View details &raquo;</a></p>
85+
</div>
86+
<div class="span5">
87+
<h2>Heading</h2>
88+
<p>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. </p>
89+
<p><a class="btn" href="#">View details &raquo;</a></p>
90+
</div>
91+
<div class="span5">
92+
<h2>Heading</h2>
93+
<p>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.</p>
94+
<p><a class="btn" href="#">View details &raquo;</a></p>
95+
</div>
8096
</div>
97+
98+
<hr>
99+
81100
<!-- Example row of columns -->
82101
<div class="row">
83102
<div class="span6">
@@ -96,6 +115,7 @@ <h2>Heading</h2>
96115
<p><a class="btn" href="#">View details &raquo;</a></p>
97116
</div>
98117
</div>
118+
99119
<footer>
100120
<p>&copy; Company 2011</p>
101121
</footer>

‎examples/hero.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="topbar">
3232
<div class="fill">
3333
<div class="container">
34-
<h3><a href="#">Project name</a></h3>
34+
<a class="brand" href="#">Project name</a>
3535
<ul class="nav">
3636
<li class="active"><a href="#">Home</a></li>
3737
<li><a href="#about">About</a></li>

‎lib/patterns.less

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,11 @@ input[type=submit].btn {
641641
.border-radius(4px);
642642
.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
643643

644+
// Adjust close icon
645+
.close {
646+
*margin-top: 3px; /* IE7 spacing */
647+
}
648+
644649
// Remove extra margin from content
645650
h5 {
646651
line-height: @baseline;
@@ -915,8 +920,8 @@ input[type=submit].btn {
915920
height: 0;
916921
}
917922
.inner {
918-
background: #333;
919-
background: rgba(0,0,0,.8);
923+
background-color: @black;
924+
background-color: rgba(0,0,0,.8);
920925
padding: 3px;
921926
overflow: hidden;
922927
width: 280px;

0 commit comments

Comments
 (0)