diff --git a/.csslintrc b/.csslintrc
new file mode 100644
index 0000000..8aee385
--- /dev/null
+++ b/.csslintrc
@@ -0,0 +1,5 @@
+{
+ "unique-headings": false,
+ "box-model": false,
+ "font-sizes": false
+}
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index acd0cd0..b5ddd01 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,7 +13,8 @@ module.exports = function(grunt) {
csslint: {
scssoutput: {
options: {
- import: false
+ import: false,
+ csslintrc: '.csslintrc'
},
src: ['css/skeleton.css']
}
diff --git a/README.md b/README.md
index c9ba233..18c4469 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@ Either clone this repository and drop in manually, or install from bower:
bower install --save Skeleton-SCSS
```
+## Build status
+The project is set up to build and run csslint on Travis:
+Master: [![Build Status](https://travis-ci.org/nickpack/Skeleton-SCSS.png)](https://travis-ci.org/nickpack/Skeleton-SCSS)
+Development: [![Build Status](https://travis-ci.org/nickpack/Skeleton-SCSS.png?branch=develop)](https://travis-ci.org/nickpack/Skeleton-SCSS)
+
## Building
I've added grunt configuration to the repository for those of you that use it.
@@ -30,6 +35,7 @@ Then following that, from the root dir of this project, run `npm install` which
You should be good to go.
## Changelog
+* May 17, 2013 - (v1.0.2) Travis CI build configuration, and minor refactor to remove as many of the warnings from CSSLint as was feasible to do - MAY CAUSE REGRESSIONS.
* May 17, 2013 - (v1.0.1) Added grunt build tools
* Apr 23, 2013 - (v1.0.0) Skeleton SCSS v1.0 - Additional variable conversions, changes based on feedback to the original project and bower submission.
* Jan 31, 2013 - Completed SCSS conversion of Skeleton 1.2.
diff --git a/component.json b/component.json
index 4e5e9dc..64f999c 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "Skeleton-SCSS",
- "version": "1.0.1",
+ "version": "1.0.2",
"main": "css/skeleton.css",
"ignore": [
"**/.*",
diff --git a/css/skeleton.css b/css/skeleton.css
index eff5121..9e005a9 100644
--- a/css/skeleton.css
+++ b/css/skeleton.css
@@ -1,5 +1,5 @@
/*
-* Skeleton SCSS V1.0
+* Skeleton SCSS V1.0.2
* Skeleton is Copyright 2011, Dave Gamache
*
* SCSS Conversion and Mixins by Nick Pack
@@ -44,13 +44,13 @@ table {
/* #Misc
================================================== */
.remove-bottom {
- margin-bottom: 0 !important; }
+ margin-bottom: 0; }
.half-bottom {
- margin-bottom: 10px !important; }
+ margin-bottom: 10px; }
.add-bottom {
- margin-bottom: 20px !important; }
+ margin-bottom: 20px; }
/* #Basic Styles
================================================== */
@@ -58,7 +58,8 @@ body {
background: #fff;
font: 14px/21px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #444;
- -webkit-text-size-adjust: 100%; }
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%; }
/* #Forms
================================================== */
@@ -66,57 +67,56 @@ body {
position: relative;
margin: 0 auto;
padding: 0; }
+ .container .alpha {
+ margin-left: 0; }
+ .container .omega {
+ margin-right: 0; }
.column, .columns {
float: left;
- display: inline;
margin-left: 10px;
margin-right: 10px; }
- .column.alpha, .columns.alpha {
- margin-left: 0; }
- .column.omega, .columns.omega {
- margin-right: 0; }
.row {
margin-bottom: 20px; }
.container {
width: 960px; }
- .container .columns.one, .container .column.one {
+ .container .one {
width: 40px; }
- .container .columns.two, .container .column.two {
+ .container .two {
width: 100px; }
- .container .columns.three, .container .column.three {
+ .container .three {
width: 160px; }
- .container .columns.four, .container .column.four {
+ .container .four {
width: 220px; }
- .container .columns.five, .container .column.five {
+ .container .five {
width: 280px; }
- .container .columns.six, .container .column.six {
+ .container .six {
width: 340px; }
- .container .columns.seven, .container .column.seven {
+ .container .seven {
width: 400px; }
- .container .columns.eight, .container .column.eight {
+ .container .eight {
width: 460px; }
- .container .columns.nine, .container .column.nine {
+ .container .nine {
width: 520px; }
- .container .columns.ten, .container .column.ten {
+ .container .ten {
width: 580px; }
- .container .columns.eleven, .container .column.eleven {
+ .container .eleven {
width: 640px; }
- .container .columns.twelve, .container .column.twelve {
+ .container .twelve {
width: 700px; }
- .container .columns.thirteen, .container .column.thirteen {
+ .container .thirteen {
width: 760px; }
- .container .columns.fourteen, .container .column.fourteen {
+ .container .fourteen {
width: 820px; }
- .container .columns.fifteen, .container .column.fifteen {
+ .container .fifteen {
width: 880px; }
- .container .columns.sixteen, .container .column.sixteen {
+ .container .sixteen {
width: 940px; }
- .container .columns.one-third, .container .column.one-third {
+ .container .one-third {
width: 300px; }
- .container .columns.two-thirds, .container .column.two-thirds {
+ .container .two-thirds {
width: 620px; }
.container .offset-by-one {
padding-left: 60px; }
@@ -152,41 +152,41 @@ body {
@media only screen and (max-width: 959px) {
.container {
width: 768px; }
- .container .columns.one, .container .column.one {
+ .container .one {
width: 28px; }
- .container .columns.two, .container .column.two {
+ .container .two {
width: 76px; }
- .container .columns.three, .container .column.three {
+ .container .three {
width: 124px; }
- .container .columns.four, .container .column.four {
+ .container .four {
width: 172px; }
- .container .columns.five, .container .column.five {
+ .container .five {
width: 220px; }
- .container .columns.six, .container .column.six {
+ .container .six {
width: 268px; }
- .container .columns.seven, .container .column.seven {
+ .container .seven {
width: 316px; }
- .container .columns.eight, .container .column.eight {
+ .container .eight {
width: 364px; }
- .container .columns.nine, .container .column.nine {
+ .container .nine {
width: 412px; }
- .container .columns.ten, .container .column.ten {
+ .container .ten {
width: 460px; }
- .container .columns.eleven, .container .column.eleven {
+ .container .eleven {
width: 508px; }
- .container .columns.twelve, .container .column.twelve {
+ .container .twelve {
width: 556px; }
- .container .columns.thirteen, .container .column.thirteen {
+ .container .thirteen {
width: 604px; }
- .container .columns.fourteen, .container .column.fourteen {
+ .container .fourteen {
width: 652px; }
- .container .columns.fifteen, .container .column.fifteen {
+ .container .fifteen {
width: 700px; }
- .container .columns.sixteen, .container .column.sixteen {
+ .container .sixteen {
width: 748px; }
- .container .columns.one-third, .container .column.one-third {
+ .container .one-third {
width: 236px; }
- .container .columns.two-thirds, .container .column.two-thirds {
+ .container .two-thirds {
width: 492px; }
.container .offset-by-one {
padding-left: 48px; }
@@ -221,22 +221,21 @@ body {
.container {
width: 768px; }
+ .container .alpha {
+ margin-right: 10px; }
+ .container .omega {
+ margin-left: 10px; }
- .column.alpha, .columns.alpha {
- margin-right: 10px; }
- .column.omega, .columns.omega {
- margin-left: 10px; }
-
- .alpha.omega {
+ .alpha, .omega {
margin-right: 0;
margin-left: 0; } }
@media only screen and (max-width: 767px) {
.container {
width: 90%; }
+ .container .one, .container .two, .container .three, .container .four, .container .five, .container .six, .container .seven, .container .eight, .container .nine, .container .ten, .container .eleven, .container .twelve, .container .thirteen, .container .fourteen, .container .fifteen, .container .sixteen, .container .one-third, .container .two-thirds {
+ width: 100%; }
.container .column, .container .columns {
margin: 0; }
- .container .column.one, .container .column.two, .container .column.three, .container .column.four, .container .column.five, .container .column.six, .container .column.seven, .container .column.eight, .container .column.nine, .container .column.ten, .container .column.eleven, .container .column.twelve, .container .column.thirteen, .container .column.fourteen, .container .column.fifteen, .container .column.sixteen, .container .column.one-third, .container .column.two-thirds, .container .columns.one, .container .columns.two, .container .columns.three, .container .columns.four, .container .columns.five, .container .columns.six, .container .columns.seven, .container .columns.eight, .container .columns.nine, .container .columns.ten, .container .columns.eleven, .container .columns.twelve, .container .columns.thirteen, .container .columns.fourteen, .container .columns.fifteen, .container .columns.sixteen, .container .columns.one-third, .container .columns.two-thirds {
- width: 100%; }
.container .offset-by-one,
.container .offset-by-two,
.container .offset-by-three,
@@ -305,39 +304,52 @@ or wrap each row of columns in a
*/
font-weight: normal;
font-style: normal; }
*/
-h1, h2, h3, h4, h5, h6 {
- color: #181818;
- font-family: "Georgia", "Times New Roman", serif;
- font-weight: normal; }
-
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
font-weight: inherit; }
h1 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 46px;
line-height: 50px;
margin: 0 0 14px 0; }
h2 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 35px;
line-height: 40px;
margin: 0 0 10px 0; }
h3 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 28px;
line-height: 34px;
margin: 0 0 8px 0; }
h4 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 21px;
line-height: 30px;
margin: 0 0 4px 0; }
h5 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 17px;
line-height: 24px; }
h6 {
+ color: #181818;
+ font-family: "Georgia", "Times New Roman", serif;
+ font-weight: normal;
font-size: 14px;
line-height: 21px; }
@@ -350,7 +362,7 @@ p {
p img {
margin: 0; }
-p.lead {
+.lead {
font-size: 21px;
line-height: 27px;
color: #777777; }
@@ -400,12 +412,12 @@ hr {
================================================== */
a, a:visited {
color: #333333;
- text-decoration: underline;
- outline: 0; }
+ text-decoration: underline; }
a:hover, a:focus {
color: black;
- text-decoration: none; }
+ text-decoration: none;
+ outline: 0; }
p a, p a:visited {
line-height: inherit; }
@@ -442,7 +454,7 @@ li {
line-height: 18px;
margin: 0 0 12px 0; }
-ul.large li {
+.large li {
line-height: 21px; }
li p {
@@ -455,6 +467,7 @@ button,
input[type="submit"],
input[type="reset"],
input[type="button"] {
+ background-color: #cccccc;
background-color: rgba(153, 153, 153, 0.2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.2)), to(rgba(0, 0, 0, 0.2)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2));
@@ -465,9 +478,9 @@ input[type="button"] {
border: 1px solid #aaaaaa;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
- border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
+ border-radius: 3px;
color: #444444;
display: inline-block;
font-size: 11px;
@@ -485,6 +498,7 @@ button:hover,
input[type="submit"]:hover,
input[type="reset"]:hover,
input[type="button"]:hover {
+ background-color: #cccccc;
background-color: rgba(153, 153, 153, 0.3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.3)), to(rgba(0, 0, 0, 0.3)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(0, 0, 0, 0.3));
@@ -502,6 +516,7 @@ button:active,
input[type="submit"]:active,
input[type="reset"]:active,
input[type="button"]:active {
+ background-color: #cccccc;
background-color: rgba(153, 153, 153, 0.2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.2)), to(rgba(0, 0, 0, 0.2)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2));
@@ -511,14 +526,14 @@ input[type="button"]:active {
background-repeat: repeat-x;
border: 1px solid #666666; }
-.button.full-width,
+.button .full-width,
button.full-width,
input[type="submit"].full-width,
input[type="reset"].full-width,
input[type="button"].full-width {
width: 100%;
- padding-left: 0 !important;
- padding-right: 0 !important;
+ padding-left: 0;
+ padding-right: 0;
text-align: center; }
/* Fix for odd Mozilla border & padding issues */
@@ -551,10 +566,9 @@ textarea,
select {
border: 1px solid #cccccc;
padding: 6px 4px;
- outline: none;
- border-radius: 2px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
+ border-radius: 2px;
font: 13px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #777777;
width: 210px;
@@ -576,6 +590,7 @@ input[type="tel"]:focus,
textarea:focus {
border: 1px solid #aaaaaa;
color: #444444;
+ outline: none;
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.2); }
@@ -603,7 +618,7 @@ legend span {
/* #Images
================================================== */
-img.scale-with-grid {
+.scale-with-grid {
max-width: 100%;
height: auto; }
diff --git a/css/skeleton.min.css b/css/skeleton.min.css
index 024d6e9..0799204 100644
--- a/css/skeleton.min.css
+++ b/css/skeleton.min.css
@@ -1,2 +1,2 @@
-/* Skeleton-SCSS 1.0.0 17-05-2013 */
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.remove-bottom{margin-bottom:0!important}.half-bottom{margin-bottom:10px!important}.add-bottom{margin-bottom:20px!important}body{background:#fff;font:14px/21px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#444;-webkit-text-size-adjust:100%}.container{position:relative;margin:0 auto;padding:0}.column,.columns{float:left;display:inline;margin-left:10px;margin-right:10px}.column.alpha,.columns.alpha{margin-left:0}.column.omega,.columns.omega{margin-right:0}.row{margin-bottom:20px}.container{width:960px}.container .columns.one,.container .column.one{width:40px}.container .columns.two,.container .column.two{width:100px}.container .columns.three,.container .column.three{width:160px}.container .columns.four,.container .column.four{width:220px}.container .columns.five,.container .column.five{width:280px}.container .columns.six,.container .column.six{width:340px}.container .columns.seven,.container .column.seven{width:400px}.container .columns.eight,.container .column.eight{width:460px}.container .columns.nine,.container .column.nine{width:520px}.container .columns.ten,.container .column.ten{width:580px}.container .columns.eleven,.container .column.eleven{width:640px}.container .columns.twelve,.container .column.twelve{width:700px}.container .columns.thirteen,.container .column.thirteen{width:760px}.container .columns.fourteen,.container .column.fourteen{width:820px}.container .columns.fifteen,.container .column.fifteen{width:880px}.container .columns.sixteen,.container .column.sixteen{width:940px}.container .columns.one-third,.container .column.one-third{width:300px}.container .columns.two-thirds,.container .column.two-thirds{width:620px}.container .offset-by-one{padding-left:60px}.container .offset-by-two{padding-left:120px}.container .offset-by-three{padding-left:180px}.container .offset-by-four{padding-left:240px}.container .offset-by-five{padding-left:300px}.container .offset-by-six{padding-left:360px}.container .offset-by-seven{padding-left:420px}.container .offset-by-eight{padding-left:480px}.container .offset-by-nine{padding-left:540px}.container .offset-by-ten{padding-left:600px}.container .offset-by-eleven{padding-left:660px}.container .offset-by-twelve{padding-left:720px}.container .offset-by-thirteen{padding-left:780px}.container .offset-by-fourteen{padding-left:840px}.container .offset-by-fifteen{padding-left:900px}@media only screen and (max-width:959px){.container{width:768px}.container .columns.one,.container .column.one{width:28px}.container .columns.two,.container .column.two{width:76px}.container .columns.three,.container .column.three{width:124px}.container .columns.four,.container .column.four{width:172px}.container .columns.five,.container .column.five{width:220px}.container .columns.six,.container .column.six{width:268px}.container .columns.seven,.container .column.seven{width:316px}.container .columns.eight,.container .column.eight{width:364px}.container .columns.nine,.container .column.nine{width:412px}.container .columns.ten,.container .column.ten{width:460px}.container .columns.eleven,.container .column.eleven{width:508px}.container .columns.twelve,.container .column.twelve{width:556px}.container .columns.thirteen,.container .column.thirteen{width:604px}.container .columns.fourteen,.container .column.fourteen{width:652px}.container .columns.fifteen,.container .column.fifteen{width:700px}.container .columns.sixteen,.container .column.sixteen{width:748px}.container .columns.one-third,.container .column.one-third{width:236px}.container .columns.two-thirds,.container .column.two-thirds{width:492px}.container .offset-by-one{padding-left:48px}.container .offset-by-two{padding-left:96px}.container .offset-by-three{padding-left:144px}.container .offset-by-four{padding-left:192px}.container .offset-by-five{padding-left:240px}.container .offset-by-six{padding-left:288px}.container .offset-by-seven{padding-left:336px}.container .offset-by-eight{padding-left:384px}.container .offset-by-nine{padding-left:432px}.container .offset-by-ten{padding-left:480px}.container .offset-by-eleven{padding-left:528px}.container .offset-by-twelve{padding-left:576px}.container .offset-by-thirteen{padding-left:624px}.container .offset-by-fourteen{padding-left:672px}.container .offset-by-fifteen{padding-left:720px}.container{width:768px}.column.alpha,.columns.alpha{margin-right:10px}.column.omega,.columns.omega{margin-left:10px}.alpha.omega{margin-right:0;margin-left:0}}@media only screen and (max-width:767px){.container{width:90%}.container .column,.container .columns{margin:0}.container .column.one,.container .column.two,.container .column.three,.container .column.four,.container .column.five,.container .column.six,.container .column.seven,.container .column.eight,.container .column.nine,.container .column.ten,.container .column.eleven,.container .column.twelve,.container .column.thirteen,.container .column.fourteen,.container .column.fifteen,.container .column.sixteen,.container .column.one-third,.container .column.two-thirds,.container .columns.one,.container .columns.two,.container .columns.three,.container .columns.four,.container .columns.five,.container .columns.six,.container .columns.seven,.container .columns.eight,.container .columns.nine,.container .columns.ten,.container .columns.eleven,.container .columns.twelve,.container .columns.thirteen,.container .columns.fourteen,.container .columns.fifteen,.container .columns.sixteen,.container .columns.one-third,.container .columns.two-thirds{width:100%}.container .offset-by-one,.container .offset-by-two,.container .offset-by-three,.container .offset-by-four,.container .offset-by-five,.container .offset-by-six,.container .offset-by-seven,.container .offset-by-eight,.container .offset-by-nine,.container .offset-by-ten,.container .offset-by-eleven,.container .offset-by-twelve,.container .offset-by-thirteen,.container .offset-by-fourteen,.container .offset-by-fifteen{padding-left:0}}.container:after{content:"\0020";display:block;height:0;clear:both;visibility:hidden}.clearfix:before,.clearfix:after,.row:before,.row:after{content:'\0020';display:block;overflow:hidden;visibility:hidden;width:0;height:0}.row:after,.clearfix:after{clear:both}.row,.clearfix{zoom:1}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}h1,h2,h3,h4,h5,h6{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{font-weight:inherit}h1{font-size:46px;line-height:50px;margin:0 0 14px}h2{font-size:35px;line-height:40px;margin:0 0 10px}h3{font-size:28px;line-height:34px;margin:0 0 8px}h4{font-size:21px;line-height:30px;margin:0 0 4px}h5{font-size:17px;line-height:24px}h6{font-size:14px;line-height:21px}.subheader{color:#777}p{margin:0 0 20px}p img{margin:0}p.lead{font-size:21px;line-height:27px;color:#777}em{font-style:italic}strong{font-weight:700;color:#333}small{font-size:80%}blockquote,blockquote p{font-size:17px;line-height:24px;color:#777;font-style:italic}blockquote{margin:0 0 20px;padding:9px 20px 0 19px;border-left:1px solid #ddd}blockquote cite{display:block;font-size:12px;color:#555}blockquote cite:before{content:"\2014 \0020"}blockquote cite a,blockquote cite a:visited,blockquote cite a:visited{color:#555}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}a,a:visited{color:#333;text-decoration:underline;outline:0}a:hover,a:focus{color:#000;text-decoration:none}p a,p a:visited{line-height:inherit}ul,ol{margin:0 0 20px}ul{list-style:none outside}ol{list-style:decimal}ol,ul.square,ul.circle,ul.disc{margin:0 0 0 30px}ul.square{list-style:square outside}ul.circle{list-style:circle outside}ul.disc{list-style:disc outside}ul ul,ul ol,ol ol,ol ul{margin:4px 0 5px 30px;font-size:90%}li{line-height:18px;margin:0 0 12px}ul.large li{line-height:21px}li p{line-height:21px}.button,button,input[type=submit],input[type=reset],input[type=button]{background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #aaa;border-top:1px solid #ccc;border-left:1px solid #ccc;border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;color:#444;display:inline-block;font-size:11px;font-weight:700;text-decoration:none;text-shadow:0 1px rgba(255,255,255,.75);cursor:pointer;margin:0 0 20px;line-height:normal;padding:8px 10px;font-family:HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif}.button:hover,button:hover,input[type=submit]:hover,input[type=reset]:hover,input[type=button]:hover{background-color:rgba(153,153,153,.3);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.3)),to(rgba(0,0,0,.3)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-moz-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-o-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:linear-gradient(to bottom,rgba(255,255,255,.3),rgba(0,0,0,.3));background-repeat:repeat-x;color:#222;border:1px solid #888;border-top:1px solid #aaa;border-left:1px solid #aaa}.button:active,button:active,input[type=submit]:active,input[type=reset]:active,input[type=button]:active{background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #666}.button.full-width,button.full-width,input[type=submit].full-width,input[type=reset].full-width,input[type=button].full-width{width:100%;padding-left:0!important;padding-right:0!important;text-align:center}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}form{margin:0 0 20px}fieldset{margin:0 0 20px}input[type=search],input[type=url]{-webkit-appearance:textfield;-moz-appearance:textfield}input[type=text],input[type=password],input[type=email],input[type=search],input[type=url],input[type=number],input[type=tel],textarea,select{border:1px solid #ccc;padding:6px 4px;outline:0;border-radius:2px;-webkit-border-radius:2px;-moz-border-radius:2px;font:13px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#777;width:210px;max-width:100%;display:block;margin:0 0 20px;background:#fff}select{padding:0}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=search]:focus,input[type=url]:focus,input[type=number]:focus,input[type=tel]:focus,textarea:focus{border:1px solid #aaa;color:#444;-moz-box-shadow:0 0 3px rgba(0,0,0,.2);-webkit-box-shadow:0 0 3px rgba(0,0,0,.2);box-shadow:0 0 3px rgba(0,0,0,.2)}textarea{min-height:60px}label,legend{display:block;font-weight:700;font-size:13px}select{width:220px}input[type=checkbox]{display:inline}label span,legend span{font-weight:400;font-size:13px;color:#444}img.scale-with-grid{max-width:100%;height:auto}
\ No newline at end of file
+/* Skeleton-SCSS 1.0.2 17-05-2013 */
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.remove-bottom{margin-bottom:0}.half-bottom{margin-bottom:10px}.add-bottom{margin-bottom:20px}body{background:#fff;font:14px/21px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#444;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}.container{position:relative;margin:0 auto;padding:0}.container .alpha{margin-left:0}.container .omega{margin-right:0}.column,.columns{float:left;margin-left:10px;margin-right:10px}.row{margin-bottom:20px}.container{width:960px}.container .one{width:40px}.container .two{width:100px}.container .three{width:160px}.container .four{width:220px}.container .five{width:280px}.container .six{width:340px}.container .seven{width:400px}.container .eight{width:460px}.container .nine{width:520px}.container .ten{width:580px}.container .eleven{width:640px}.container .twelve{width:700px}.container .thirteen{width:760px}.container .fourteen{width:820px}.container .fifteen{width:880px}.container .sixteen{width:940px}.container .one-third{width:300px}.container .two-thirds{width:620px}.container .offset-by-one{padding-left:60px}.container .offset-by-two{padding-left:120px}.container .offset-by-three{padding-left:180px}.container .offset-by-four{padding-left:240px}.container .offset-by-five{padding-left:300px}.container .offset-by-six{padding-left:360px}.container .offset-by-seven{padding-left:420px}.container .offset-by-eight{padding-left:480px}.container .offset-by-nine{padding-left:540px}.container .offset-by-ten{padding-left:600px}.container .offset-by-eleven{padding-left:660px}.container .offset-by-twelve{padding-left:720px}.container .offset-by-thirteen{padding-left:780px}.container .offset-by-fourteen{padding-left:840px}.container .offset-by-fifteen{padding-left:900px}@media only screen and (max-width:959px){.container{width:768px}.container .one{width:28px}.container .two{width:76px}.container .three{width:124px}.container .four{width:172px}.container .five{width:220px}.container .six{width:268px}.container .seven{width:316px}.container .eight{width:364px}.container .nine{width:412px}.container .ten{width:460px}.container .eleven{width:508px}.container .twelve{width:556px}.container .thirteen{width:604px}.container .fourteen{width:652px}.container .fifteen{width:700px}.container .sixteen{width:748px}.container .one-third{width:236px}.container .two-thirds{width:492px}.container .offset-by-one{padding-left:48px}.container .offset-by-two{padding-left:96px}.container .offset-by-three{padding-left:144px}.container .offset-by-four{padding-left:192px}.container .offset-by-five{padding-left:240px}.container .offset-by-six{padding-left:288px}.container .offset-by-seven{padding-left:336px}.container .offset-by-eight{padding-left:384px}.container .offset-by-nine{padding-left:432px}.container .offset-by-ten{padding-left:480px}.container .offset-by-eleven{padding-left:528px}.container .offset-by-twelve{padding-left:576px}.container .offset-by-thirteen{padding-left:624px}.container .offset-by-fourteen{padding-left:672px}.container .offset-by-fifteen{padding-left:720px}.container{width:768px}.container .alpha{margin-right:10px}.container .omega{margin-left:10px}.alpha,.omega{margin-right:0;margin-left:0}}@media only screen and (max-width:767px){.container{width:90%}.container .one,.container .two,.container .three,.container .four,.container .five,.container .six,.container .seven,.container .eight,.container .nine,.container .ten,.container .eleven,.container .twelve,.container .thirteen,.container .fourteen,.container .fifteen,.container .sixteen,.container .one-third,.container .two-thirds{width:100%}.container .column,.container .columns{margin:0}.container .offset-by-one,.container .offset-by-two,.container .offset-by-three,.container .offset-by-four,.container .offset-by-five,.container .offset-by-six,.container .offset-by-seven,.container .offset-by-eight,.container .offset-by-nine,.container .offset-by-ten,.container .offset-by-eleven,.container .offset-by-twelve,.container .offset-by-thirteen,.container .offset-by-fourteen,.container .offset-by-fifteen{padding-left:0}}.container:after{content:"\0020";display:block;height:0;clear:both;visibility:hidden}.clearfix:before,.clearfix:after,.row:before,.row:after{content:'\0020';display:block;overflow:hidden;visibility:hidden;width:0;height:0}.row:after,.clearfix:after{clear:both}.row,.clearfix{zoom:1}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{font-weight:inherit}h1{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:46px;line-height:50px;margin:0 0 14px}h2{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:35px;line-height:40px;margin:0 0 10px}h3{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:28px;line-height:34px;margin:0 0 8px}h4{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:21px;line-height:30px;margin:0 0 4px}h5{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:17px;line-height:24px}h6{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400;font-size:14px;line-height:21px}.subheader{color:#777}p{margin:0 0 20px}p img{margin:0}.lead{font-size:21px;line-height:27px;color:#777}em{font-style:italic}strong{font-weight:700;color:#333}small{font-size:80%}blockquote,blockquote p{font-size:17px;line-height:24px;color:#777;font-style:italic}blockquote{margin:0 0 20px;padding:9px 20px 0 19px;border-left:1px solid #ddd}blockquote cite{display:block;font-size:12px;color:#555}blockquote cite:before{content:"\2014 \0020"}blockquote cite a,blockquote cite a:visited,blockquote cite a:visited{color:#555}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}a,a:visited{color:#333;text-decoration:underline}a:hover,a:focus{color:#000;text-decoration:none;outline:0}p a,p a:visited{line-height:inherit}ul,ol{margin:0 0 20px}ul{list-style:none outside}ol{list-style:decimal}ol,ul.square,ul.circle,ul.disc{margin:0 0 0 30px}ul.square{list-style:square outside}ul.circle{list-style:circle outside}ul.disc{list-style:disc outside}ul ul,ul ol,ol ol,ol ul{margin:4px 0 5px 30px;font-size:90%}li{line-height:18px;margin:0 0 12px}.large li{line-height:21px}li p{line-height:21px}.button,button,input[type=submit],input[type=reset],input[type=button]{background-color:#ccc;background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #aaa;border-top:1px solid #ccc;border-left:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;color:#444;display:inline-block;font-size:11px;font-weight:700;text-decoration:none;text-shadow:0 1px rgba(255,255,255,.75);cursor:pointer;margin:0 0 20px;line-height:normal;padding:8px 10px;font-family:HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif}.button:hover,button:hover,input[type=submit]:hover,input[type=reset]:hover,input[type=button]:hover{background-color:#ccc;background-color:rgba(153,153,153,.3);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.3)),to(rgba(0,0,0,.3)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-moz-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-o-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:linear-gradient(to bottom,rgba(255,255,255,.3),rgba(0,0,0,.3));background-repeat:repeat-x;color:#222;border:1px solid #888;border-top:1px solid #aaa;border-left:1px solid #aaa}.button:active,button:active,input[type=submit]:active,input[type=reset]:active,input[type=button]:active{background-color:#ccc;background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #666}.button .full-width,button.full-width,input[type=submit].full-width,input[type=reset].full-width,input[type=button].full-width{width:100%;padding-left:0;padding-right:0;text-align:center}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}form{margin:0 0 20px}fieldset{margin:0 0 20px}input[type=search],input[type=url]{-webkit-appearance:textfield;-moz-appearance:textfield}input[type=text],input[type=password],input[type=email],input[type=search],input[type=url],input[type=number],input[type=tel],textarea,select{border:1px solid #ccc;padding:6px 4px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;font:13px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#777;width:210px;max-width:100%;display:block;margin:0 0 20px;background:#fff}select{padding:0}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=search]:focus,input[type=url]:focus,input[type=number]:focus,input[type=tel]:focus,textarea:focus{border:1px solid #aaa;color:#444;outline:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.2);-webkit-box-shadow:0 0 3px rgba(0,0,0,.2);box-shadow:0 0 3px rgba(0,0,0,.2)}textarea{min-height:60px}label,legend{display:block;font-weight:700;font-size:13px}select{width:220px}input[type=checkbox]{display:inline}label span,legend span{font-weight:400;font-size:13px;color:#444}.scale-with-grid{max-width:100%;height:auto}
\ No newline at end of file
diff --git a/package.json b/package.json
index a1f6159..1380ba8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "Skeleton-SCSS",
"title": "Skeleton SCSS",
"description": "Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
- "version": "1.0.1",
+ "version": "1.0.2",
"homepage": "https://github.com/nickpack/Skeleton-SCSS",
"author": {
"name": "Nick Pack",
diff --git a/scss/_forms.scss b/scss/_forms.scss
index fa1d973..cdf1f8f 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -40,14 +40,14 @@ input[type="button"]:active {
border: $form_button_active_border;
}
-.button.full-width,
+.button .full-width,
button.full-width,
input[type="submit"].full-width,
input[type="reset"].full-width,
input[type="button"].full-width {
width: 100%;
- padding-left: 0 !important;
- padding-right: 0 !important;
+ padding-left: 0;
+ padding-right: 0;
text-align: center;
}
@@ -86,7 +86,6 @@ textarea,
select {
border: $form_input_border;
padding: $form_input_padding;
- outline: none;
@include border-radius(2px);
font: $form_input_font_size $form_element_font;
color: $form_input_text_colour;
@@ -111,6 +110,7 @@ input[type="tel"]:focus,
textarea:focus {
border: $form_input_focus_border;
color: $form_input_focus_text_colour;
+ outline: none;
@include box-shadow(0, 0, 3px, rgba(0, 0, 0, .2))
}
diff --git a/scss/_grid.scss b/scss/_grid.scss
index d26101b..63a6354 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -2,15 +2,14 @@
position: relative;
margin: 0 auto;
padding: 0;
+ & .alpha { margin-left: 0; }
+ & .omega { margin-right: 0; }
}
.column, .columns {
float: left;
- display: inline;
margin-left: $gutter/2;
margin-right: $gutter/2;
- &.alpha { margin-left: 0; }
- &.omega { margin-right: 0; }
}
.row { margin-bottom: $gutter; }
@@ -22,13 +21,13 @@
@media only screen and (max-width: 959px) {
@include grid($tablet-container-width, $column-count, $gutter);
- .container { width: $tablet-container-width; }
+ .container {
+ width: $tablet-container-width;
+ & .alpha { margin-right: 10px; }
+ & .omega { margin-left: 10px; }
+ }
- .column, .columns {
- &.alpha { margin-right: 10px; }
- &.omega { margin-left: 10px; } }
-
- .alpha.omega {
+ .alpha, .omega {
margin-right: 0;
margin-left: 0; }
}
@@ -37,27 +36,27 @@
@media only screen and (max-width: 767px) {
.container {
width: $mobile-container-width;
+ & .one,
+ & .two,
+ & .three,
+ & .four,
+ & .five,
+ & .six,
+ & .seven,
+ & .eight,
+ & .nine,
+ & .ten,
+ & .eleven,
+ & .twelve,
+ & .thirteen,
+ & .fourteen,
+ & .fifteen,
+ & .sixteen,
+ & .one-third,
+ & .two-thirds { width: $mobile-column-width; }
.column, .columns {
margin: 0;
- &.one,
- &.two,
- &.three,
- &.four,
- &.five,
- &.six,
- &.seven,
- &.eight,
- &.nine,
- &.ten,
- &.eleven,
- &.twelve,
- &.thirteen,
- &.fourteen,
- &.fifteen,
- &.sixteen,
- &.one-third,
- &.two-thirds { width: $mobile-column-width; }
}
.offset-by-one,
diff --git a/scss/_images.scss b/scss/_images.scss
index 4bcaa1c..32e7ab9 100644
--- a/scss/_images.scss
+++ b/scss/_images.scss
@@ -1,7 +1,7 @@
/* #Images
================================================== */
-img.scale-with-grid {
+.scale-with-grid {
max-width: 100%;
height: auto;
}
\ No newline at end of file
diff --git a/scss/_links.scss b/scss/_links.scss
index c726cab..af7b65d 100644
--- a/scss/_links.scss
+++ b/scss/_links.scss
@@ -3,12 +3,12 @@
a, a:visited {
color: $link_colour;
text-decoration: $link_decoration;
- outline: $link_outline;
}
a:hover, a:focus {
color: $link_hover_colour;
text-decoration: $link_hover_decoration;
+ outline: $link_outline;
}
p a, p a:visited {
diff --git a/scss/_lists.scss b/scss/_lists.scss
index 0bbe9fc..c51c2da 100644
--- a/scss/_lists.scss
+++ b/scss/_lists.scss
@@ -39,7 +39,7 @@ li {
margin: $list_item_margin;
}
-ul.large li {
+.large li {
line-height: $list_large_line_height;
}
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 71e4d72..a388633 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -5,12 +5,12 @@
}
@mixin col-count($colCount, $colSpacing) {
- column-count: $colCount;
- column-gap: $colSpacing;
-webkit-column-count: $colCount;
-webkit-column-gap: $colSpacing;
-moz-column-count: $colCount;
-moz-column-gap: $colSpacing;
+ column-count: $colCount;
+ column-gap: $colSpacing;
}
@mixin size($height, $width) {
@@ -23,33 +23,33 @@
}
@mixin border-radius($radius) {
- border-radius: $radius;
-webkit-border-radius: $radius;
-moz-border-radius: $radius;
+ border-radius: $radius;
}
@mixin border-top-left-radius($radius) {
- border-top-left-radius: $radius;
-webkit-border-top-left-radius: $radius;
-moz-border-radius-topleft: $radius;
+ border-top-left-radius: $radius;
}
@mixin border-top-right-radius($radius) {
- border-top-right-radius: $radius;
-webkit-border-top-right-radius: $radius;
-moz-border-radius-topright: $radius;
+ border-top-right-radius: $radius;
}
@mixin border-bottom-right-radius($radius) {
- border-bottom-right-radius: $radius;
-webkit-border-bottom-right-radius: $radius;
-moz-border-radius-bottomright: $radius;
+ border-bottom-right-radius: $radius;
}
@mixin border-bottom-left-radius($radius) {
- border-bottom-left-radius: $radius;
-webkit-border-bottom-left-radius: $radius;
-moz-border-radius-bottomleft: $radius;
+ border-bottom-left-radius: $radius;
}
@mixin border-top-radius($radius) {
@@ -73,23 +73,23 @@
}
@mixin background-size($size){
- background-size: $size;
-webkit-background-size: $size;
-moz-background-size: $size;
-o-background-size: $size;
+ background-size: $size;
}
@mixin box-sizing($boxsize) {
- box-sizing: $boxsize;
-webkit-box-sizing: $boxsize;
-moz-box-sizing: $boxsize;
-ms-box-sizing: $boxsize;
-o-box-sizing: $boxsize;
-khtml-box-sizing: $boxsize;
+ box-sizing: $boxsize;
}
@mixin horizontal-gradient($startColour, $endColour) {
- background-color: $endColour;
+ background-color: $fallback_hex_gradient_bg;
background-image: linear-gradient(to right, $startColour, $endColour);
background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColour), to($endColour));
background-image: -webkit-linear-gradient(left, $startColour, $endColour);
@@ -99,6 +99,7 @@
}
@mixin vertical-gradient($startColour, $endColour) {
+ background-color: $fallback_hex_gradient_bg;
background-color: mix($startColour, $endColour, 60%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColour), to($endColour));
background-image: -webkit-linear-gradient(top, $startColour, $endColour);
@@ -120,26 +121,26 @@
.container {
width: $grid-container-width;
- .columns, .column {
- &.one { width: (1*$grid-column-width - $grid-gutter); }
- &.two { width: (2*$grid-column-width - $grid-gutter); }
- &.three { width: (3*$grid-column-width - $grid-gutter); }
- &.four { width: (4*$grid-column-width - $grid-gutter); }
- &.five { width: (5*$grid-column-width - $grid-gutter); }
- &.six { width: (6*$grid-column-width - $grid-gutter); }
- &.seven { width: (7*$grid-column-width - $grid-gutter); }
- &.eight { width: (8*$grid-column-width - $grid-gutter); }
- &.nine { width: (9*$grid-column-width - $grid-gutter); }
- &.ten { width: (10*$grid-column-width - $grid-gutter); }
- &.eleven { width: (11*$grid-column-width - $grid-gutter); }
- &.twelve { width: (12*$grid-column-width - $grid-gutter); }
- &.thirteen { width: (13*$grid-column-width - $grid-gutter); }
- &.fourteen { width: (14*$grid-column-width - $grid-gutter); }
- &.fifteen { width: (15*$grid-column-width - $grid-gutter); }
- &.sixteen { width: (16*$grid-column-width - $grid-gutter); }
- &.one-third { width: ($grid-container-width/3) - $grid-gutter; }
- &.two-thirds { width: (($grid-container-width/3)*2) - $grid-gutter; }
- }
+
+ .one { width: (1*$grid-column-width - $grid-gutter); }
+ .two { width: (2*$grid-column-width - $grid-gutter); }
+ .three { width: (3*$grid-column-width - $grid-gutter); }
+ .four { width: (4*$grid-column-width - $grid-gutter); }
+ .five { width: (5*$grid-column-width - $grid-gutter); }
+ .six { width: (6*$grid-column-width - $grid-gutter); }
+ .seven { width: (7*$grid-column-width - $grid-gutter); }
+ .eight { width: (8*$grid-column-width - $grid-gutter); }
+ .nine { width: (9*$grid-column-width - $grid-gutter); }
+ .ten { width: (10*$grid-column-width - $grid-gutter); }
+ .eleven { width: (11*$grid-column-width - $grid-gutter); }
+ .twelve { width: (12*$grid-column-width - $grid-gutter); }
+ .thirteen { width: (13*$grid-column-width - $grid-gutter); }
+ .fourteen { width: (14*$grid-column-width - $grid-gutter); }
+ .fifteen { width: (15*$grid-column-width - $grid-gutter); }
+ .sixteen { width: (16*$grid-column-width - $grid-gutter); }
+ .one-third { width: ($grid-container-width/3) - $grid-gutter; }
+ .two-thirds { width: (($grid-container-width/3)*2) - $grid-gutter; }
+
.offset-by-one { padding-left: $grid-column-width; }
.offset-by-two { padding-left: $grid-column-width*2; }
diff --git a/scss/_reset.scss b/scss/_reset.scss
index fe480c4..634d47e 100644
--- a/scss/_reset.scss
+++ b/scss/_reset.scss
@@ -39,13 +39,13 @@ table {
/* #Misc
================================================== */
.remove-bottom {
- margin-bottom: 0 !important;
+ margin-bottom: 0;
}
.half-bottom {
- margin-bottom: 10px !important;
+ margin-bottom: 10px;
}
.add-bottom {
- margin-bottom: 20px !important;
+ margin-bottom: 20px;
}
\ No newline at end of file
diff --git a/scss/_typography.scss b/scss/_typography.scss
index 43973cc..e3ed6c9 100644
--- a/scss/_typography.scss
+++ b/scss/_typography.scss
@@ -11,46 +11,58 @@
font-style: normal; }
*/
-h1, h2, h3, h4, h5, h6 {
- color: $heading_colour;
- font-family: $heading_font;
- font-weight: $heading_font_weight;
-}
-
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
font-weight: inherit;
}
h1 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading1_font_size;
line-height: $heading1_line_height;
margin: $heading1_margin;
}
h2 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading2_font_size;
line-height: $heading2_line_height;
margin: $heading2_margin;
}
h3 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading3_font_size;
line-height: $heading3_line_height;
margin: $heading3_margin;
}
h4 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading4_font_size;
line-height: $heading4_line_height;
margin: $heading4_margin;
}
h5 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading5_font_size;
line-height: $heading5_line_height;
}
h6 {
+ color: $heading_colour;
+ font-family: $heading_font;
+ font-weight: $heading_font_weight;
font-size: $heading6_font_size;
line-height: $heading6_line_height;
}
@@ -67,7 +79,7 @@ p img {
margin: $paragraph_image_margin;
}
-p.lead {
+.lead {
font-size: $paragraph_lead_font_size;
line-height: $paragraph_lead_line_height;
color: $paragraph_lead_colour;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d571074..edafa8e 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -117,3 +117,5 @@ $list_item_line_height: 18px;
$list_item_margin: 0 0 12px 0;
$list_item_paragraph_line_height: 21px;
+$fallback_hex_gradient_bg: #CCC;
+
diff --git a/scss/skeleton.scss b/scss/skeleton.scss
index 7f7241e..ca44791 100644
--- a/scss/skeleton.scss
+++ b/scss/skeleton.scss
@@ -1,5 +1,5 @@
/*
-* Skeleton SCSS V1.0.1
+* Skeleton SCSS V1.0.2
* Skeleton is Copyright 2011, Dave Gamache
*
* SCSS Conversion and Mixins by Nick Pack
@@ -21,6 +21,7 @@ body {
font: 14px/21px $body_font_family;
color: #444;
-webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
}
/* #Forms