Skip to content

Commit

Permalink
update few things for ie
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Aug 22, 2011
1 parent b62b15c commit f408f5c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
14 changes: 4 additions & 10 deletions bootstrap-1.0.0.css
Original file line number Diff line number Diff line change
Expand Up @@ -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: Sun Aug 21 21:42:52 PDT 2011
* Date: Sun Aug 21 22:13:24 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).
Expand Down Expand Up @@ -1154,15 +1154,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
* Repeatable UI elements outside the base styles provided from the scaffolding
* ---------------------------------------------------------------------------- */
.topbar {
background-color: #222222;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
background-image: -moz-linear-gradient(#333333, #222222);
background-image: -ms-linear-gradient(#333333, #222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
background-image: -webkit-linear-gradient(#333333, #222222);
background-image: -o-linear-gradient(#333333, #222222);
background-image: linear-gradient(#333333, #222222);
height: 40px;
position: fixed;
top: 0;
Expand Down Expand Up @@ -1707,6 +1698,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-color: #ffffff;
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, 0.3);
*border: 1px solid #999;
/* IE6-7 */

-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
Expand Down
4 changes: 2 additions & 2 deletions bootstrap-1.0.0.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ <h2>Blockquotes</h2>
</p>
</div>
<div class="span12 columns">
<h4>How to quote</h4>
<p>Be sure to wrap your <code>&lt;blockquote&gt;</code> around <code>&lt;p&gt;</code> and <code>&lt;small&gt;</code> tags. When citing a source, use the <code>&lt;small&gt;</code> element. The CSS will automatically preface a name with an em dash (&amp;mdash;).</p>
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua…</p>
Expand Down Expand Up @@ -882,7 +883,7 @@ <h4>Links</h4>
</div>
<h4>Buttons</h4>
<div class="well">
<button class="btn large primary" disabled>Primary action</button>&nbsp;<button class="btn large" disabled>Action</button>
<button class="btn large primary disabled" disabled>Primary action</button>&nbsp;<button class="btn large" disabled>Action</button>
</div>
</div>
</div> <!-- /row -->
Expand Down
2 changes: 1 addition & 1 deletion lib/patterns.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

// Topbar for Branding and Nav
.topbar {
#gradient > .vertical(#333, #222);
height: 40px;
position: fixed;
top: 0;
Expand Down Expand Up @@ -526,6 +525,7 @@
background-color: @white;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3);
*border: 1px solid #999; /* IE6-7 */
.border-radius(6px);
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding-box);
Expand Down

0 comments on commit f408f5c

Please sign in to comment.