fixing 768 alpha omega bug, changing the button css to clean it up a …

…bit and resetting version on tabs
kelixlabs · Jan 26, 2012 · 94062ea · 94062ea
1 parent 057c8d6
commit 94062ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/javascripts/tabs.js b/javascripts/tabs.js
@@ -1,5 +1,5 @@
 /*
-* Skeleton V1.2
+* Skeleton V1.1
 * Copyright 2011, Dave Gamache
 * www.getskeleton.com
 * Free to use under the MIT license.

diff --git a/stylesheets/base.css b/stylesheets/base.css
@@ -156,7 +156,7 @@
 	  cursor: pointer;
 	  margin-bottom: 20px;
 	  line-height: 14px;
-	  padding: 10px;
+	  padding: 8px 10px;
 	  font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; }
 
 	.button:hover,

diff --git a/stylesheets/skeleton.css b/stylesheets/skeleton.css
@@ -22,7 +22,7 @@
 ================================================== */
 
     .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
-    .container .column, 
+    .container .column,
     .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
     .row                                        { margin-bottom: 20px; }
 
@@ -82,6 +82,7 @@
         .container .columns                         { margin-left: 10px; margin-right: 10px;  }
         .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
         .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
+        .alpha.omega                                { margin-left: 0; margin-right: 0; }
 
         .container .one.column,
         .container .one.columns                     { width: 28px; }
@@ -130,7 +131,7 @@
 
     @media only screen and (max-width: 767px) {
         .container { width: 300px; }
-        .container .columns, 
+        .container .columns,
         .container .column { margin: 0; }
 
         .container .one.column,
@@ -180,7 +181,7 @@
 
     @media only screen and (min-width: 480px) and (max-width: 767px) {
         .container { width: 420px; }
-        .container .columns, 
+        .container .columns,
         .container .column { margin: 0; }
 
         .container .one.column,