Merge branch 'master' of github.com:dhgamache/Skeleton

skopp · Jan 26, 2012 · 057c8d6 · 057c8d6
2 parents 78ae309 + cd25dd9
commit 057c8d6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/stylesheets/skeleton.css b/stylesheets/skeleton.css
@@ -22,7 +22,8 @@
 ================================================== */
 
     .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
-    .column, .columns                           { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
+    .container .column, 
+    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
     .row                                        { margin-bottom: 20px; }
 
     /* Nested Column Classes */
@@ -129,7 +130,8 @@
 
     @media only screen and (max-width: 767px) {
         .container { width: 300px; }
-        .columns, .column { margin: 0; }
+        .container .columns, 
+        .container .column { margin: 0; }
 
         .container .one.column,
         .container .one.columns,
@@ -178,7 +180,8 @@
 
     @media only screen and (min-width: 480px) and (max-width: 767px) {
         .container { width: 420px; }
-        .columns, .column { margin: 0; }
+        .container .columns, 
+        .container .column { margin: 0; }
 
         .container .one.column,
         .container .one.columns,
@@ -235,4 +238,4 @@
       visibility: hidden;
       width: 0;
       height: 0;
-    }
+    }