From 94062ea1d3fa79926cd495e58d894c8c62f52302 Mon Sep 17 00:00:00 2001 From: Dave Gamache Date: Wed, 25 Jan 2012 21:27:50 -0800 Subject: [PATCH] fixing 768 alpha omega bug, changing the button css to clean it up a bit and resetting version on tabs --- javascripts/tabs.js | 2 +- stylesheets/base.css | 2 +- stylesheets/skeleton.css | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/javascripts/tabs.js b/javascripts/tabs.js index d8cff7d..40398bf 100644 --- 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 index 0a8a275..e5b37bd 100644 --- 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 index aafa55a..ddc5e93 100644 --- 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,