Permalink
Browse files

Fix for conflict between .right and .column/.span-X

  • Loading branch information...
Montoya committed Sep 29, 2010
1 parent eebd6d7 commit 5459eddd7b2953a6b0b6d10e97d056019762874a
Showing with 8 additions and 4 deletions.
  1. +4 −2 blueprint/screen.css
  2. +4 −2 blueprint/src/typography.css
View
@@ -36,8 +36,10 @@ h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
h6 {font-size:1em;font-weight:bold;}
h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
p {margin:0 0 1.5em;}
-.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
-.right {float:right;margin:1.5em 0 1.5em 1.5em;}
+.left {float:left !important;}
+p .left {margin:1.5em 1.5em 1.5em 0;padding:0;}
+.right {float:right !important;}
+p .right {margin:1.5em 0 1.5em 1.5em;padding:0;}
a:focus, a:hover {color:#09f;}
a {color:#06c;text-decoration:underline;}
blockquote {margin:1.5em;color:#666;font-style:italic;}
@@ -42,8 +42,10 @@ p { margin: 0 0 1.5em; }
These can be used to pull an image at the start of a paragraph, so
that the text flows around it (usage: <p><img class="left">Text</p>)
*/
-.left { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
-.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
+.left { float: left !important; }
+p .left { margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+.right { float: right !important; }
+p .right { margin: 1.5em 0 1.5em 1.5em; padding: 0; }
a:focus,
a:hover { color: #09f; }

0 comments on commit 5459edd

Please sign in to comment.