Congegni/barebones
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gulp integration

Browse source
This commit is contained in:
Mike Francis 2014-02-06 15:16:07 +00:00
parent aa573e574c
commit d0ef06c80a
18 changed files with 86 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

15
css/_vars.scss
View file

@ -8,13 +8,6 @@ $base-font-size: 16;
$base-line-height: 1.5;
$base-margin-bottom: $base-font-size * $base-line-height;
$h1-font-size: 28;
$h2-font-size: 24;
$h3-font-size: 21;
$h4-font-size: 18;
$h5-font-size: 16;
$h6-font-size: 16;
// Media Queries
$mobile: 640px;
@ -25,10 +18,4 @@ $container-max-width: 960;
$column-count: 12;
$column-gutter: 20;
// Forms
$input-border: solid 1px #ccc;
$input-background: #fff;
$btn-border: solid 1px #ccc;
$btn-background: #eee;
$btn-background-hover: #ddd;
$btn-color: #333;
// Custom colours etc.

26
css/generic/_normalise.scss
View file

@ -13,30 +13,6 @@ h1, h2, h3, h4, h5, h6, p, ul, ol {
margin-bottom: $base-margin-bottom * 1px;
}
h1 {
@include font-size($h1-font-size);
}
h2 {
@include font-size($h2-font-size);
}
h3 {
@include font-size($h3-font-size);
}
h4 {
@include font-size($h4-font-size);
}
h5 {
@include font-size($h5-font-size);
}
h6 {
@include font-size($h6-font-size);
}
ul, ol {
margin-left: $base-margin-bottom * 1px;
}
@ -47,6 +23,6 @@ ul ul, ol ol {
img {
display: block;
max-width: 100%;
height: auto;
max-width: 100%;
}

4
css/generic/_utilities.scss
View file

@ -21,11 +21,11 @@ img.alignright {
}
.clearfix {
*zoom:1;
&:before,
&:after{
content: " ";
content: '';
display: table;
line-height: 0;
}
&:after{
clear: both;

15
css/objects/_forms.scss
View file

@ -1,8 +1,8 @@
input,
select,
textarea {
background: $input-background;
border: $input-border;
background-color: $base-background-colour;
border: solid 1px $base-colour;
color: $base-colour;
display: inline-block;
font: inherit;
@ -35,16 +35,13 @@ textarea {
}
.btn {
background: $btn-background;
border: $btn-border;
color: $btn-color;
background-color: $base-background-colour;
border: solid 1px $base-colour;
color: $base-colour;
cursor: pointer;
display: inline-block;
line-height: ($base-margin-bottom * 2) * 1px;
height: ($base-margin-bottom * 2) * 1px;
line-height: ($base-margin-bottom * 2) * 1px;
padding: 0 $base-margin-bottom;
width: auto;
&:hover {
background: $btn-background-hover;
}
}

3
css/objects/_scaffolding.scss
View file

@ -12,7 +12,6 @@
.row {
margin-left: -($column-gutter / $container-max-width) * 100%;
_overflow: hidden;
@extend .clearfix;
@include media($mobile) {
margin-left: 0;
@ -35,7 +34,6 @@
@for $i from 1 through $column-count {
.col-span-#{$i} {
width: (((100 / $column-count) * $i) - (($column-gutter / $container-max-width) * 100)) * 1%;
*width: (((100 / $column-count) * $i) - (($column-gutter / $container-max-width) * 100)) - .02 * 1%;
}
}
@ -46,6 +44,5 @@
@for $i from 1 through $column-count {
.row--no-gutters .column-span-#{$i} {
width: ((100 / $column-count) * $i) * 1%;
*width: ((100 / $column-count) * $i) - .02 * 1%;
}
}

1
css/style.scss
View file

@ -19,5 +19,4 @@ Author: Mike Francis
@import 'objects/forms';
@import 'objects/scaffolding';
@import 'objects/scaffolding';
@import 'objects/nav';