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

Variable name change

Browse source
This commit is contained in:
Mike Francis 2014-12-01 12:26:25 +00:00
parent 155efa5567
commit c08a6446ec
8 changed files with 27 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scss/_vars.scss
View file

@ -7,7 +7,7 @@ $base-background-colour: #fff;
$base-font-stack: 'Helvetica Neue', Helvetica, Arial, sans-serif; $base-font-stack: 'Helvetica Neue', Helvetica, Arial, sans-serif;
$base-font-size: 16; $base-font-size: 16;
$base-line-height: 1.5; $base-line-height: 1.5;
$base-margin-bottom: ($base-font-size * $base-line-height) * 1px; $base-spacing-unit: ($base-font-size * $base-line-height) * 1px;
/** /**
@ -25,7 +25,7 @@ $breakpoint-ld: 2000px;
$grid-max-width: 1200px; $grid-max-width: 1200px;
$grid-grid-columns: 12; $grid-grid-columns: 12;
$grid-gutter: $base-margin-bottom; $grid-gutter: $base-spacing-unit;
/** /**

10
scss/base/_forms.scss
View file

@ -6,8 +6,8 @@ textarea {
color: $base-colour; color: $base-colour;
display: inline-block; display: inline-block;
font: inherit; font: inherit;
line-height: $base-margin-bottom; line-height: $base-spacing-unit;
padding: ($base-margin-bottom / 4); padding: ($base-spacing-unit / 4);
width: 100%; width: 100%;
} }
@ -24,15 +24,15 @@ label {
} }
select { select {
height: ($base-margin-bottom * 1.5); height: ($base-spacing-unit * 1.5);
} }
textarea { textarea {
min-height: ($base-margin-bottom * 4); min-height: ($base-spacing-unit * 4);
} }
.form__group { .form__group {
margin-bottom: $base-margin-bottom; margin-bottom: $base-spacing-unit;
.form__group__controls { .form__group__controls {
@extend .clearfix; @extend .clearfix;
label { label {

18
scss/base/_normalise.scss
View file

@ -1,11 +1,3 @@
*,
*:before,
*:after {
box-sizing: border-box;
font-smoothing: antialiased;
text-rendering: optimizeLegibility;
}
html { html {
background-color: $base-background-colour; background-color: $base-background-colour;
color: $base-colour; color: $base-colour;
@ -28,7 +20,7 @@ p,
hr, hr,
ul, ul,
ol { ol {
margin-bottom: $base-margin-bottom; margin-bottom: $base-spacing-unit;
} }
h1, h1,
@ -37,7 +29,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
line-height: $base-margin-bottom; line-height: $base-spacing-unit;
} }
h1, h1,
@ -53,7 +45,7 @@ th {
ul, ul,
ol { ol {
margin-left: $base-margin-bottom; margin-left: $base-spacing-unit;
} }
ul ul, ul ul,
@ -69,7 +61,7 @@ img {
blockquote { blockquote {
font-family: serif; font-family: serif;
padding-left: $base-margin-bottom; padding-left: $base-spacing-unit;
} }
em { em {
@ -87,7 +79,7 @@ table {
width: 100%; width: 100%;
th, th,
td { td {
padding: ($base-margin-bottom / 4); padding: ($base-spacing-unit / 4);
text-align: left; text-align: left;
} }
} }

66
scss/generic/_reset.scss
View file

@ -1,63 +1,11 @@
/* * {
* HTML5 Reset
* This is a slimmed down version of the following:
* http://html5doctor.com/html-5-reset-stylesheet
*/
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 {
border: 0; border: 0;
box-sizing: border-box;
font-size: 100%; font-size: 100%;
font: inherit; font-smoothing: antialiased;
margin: 0;
padding: 0;
vertical-align: baseline;
}
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section,
main {
display: block;
}
address,
caption,
cite,
dfn,
th,
var {
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} margin: 0;
padding: 0;
blockquote, q { text-rendering: optimizeLegibility;
quotes: none; }
}
blockquote,
q {
&:before,
&:after {
content: '';
content: none;
}
}
table {
border-collapse: collapse;
border-spacing: 0;
}
th {
font-weight: bold;
text-align: left;
}

6
scss/generic/_utilities.scss
View file

@ -7,7 +7,7 @@
} }
img.alignleft { img.alignleft {
margin-right: $base-margin-bottom; margin-right: $base-spacing-unit;
} }
.alignright { .alignright {
@ -15,7 +15,7 @@ img.alignleft {
} }
img.alignright { img.alignright {
margin-left : $base-margin-bottom; margin-left : $base-spacing-unit;
} }
.aligncenter { .aligncenter {
@ -27,7 +27,7 @@ img.alignright {
} }
img.aligncenter { img.aligncenter {
margin-bottom: $base-margin-bottom; margin-bottom: $base-spacing-unit;
} }

6
scss/modules/_buttons.scss
View file

@ -6,9 +6,9 @@
display: inline-block; display: inline-block;
font: inherit; font: inherit;
font-weight: bold; font-weight: bold;
height: ($base-margin-bottom * 1.5); height: ($base-spacing-unit * 1.5);
line-height: ($base-margin-bottom * 1.5); line-height: ($base-spacing-unit * 1.5);
padding: 0 $base-margin-bottom; padding: 0 $base-spacing-unit;
text-align: center; text-align: center;
width: auto; width: auto;
&::-moz-focus-inner { &::-moz-focus-inner {

2
scss/style.scss
View file

@ -16,4 +16,4 @@ Author: Mike Francis
@import 'base/forms'; @import 'base/forms';
@import 'modules/nav'; @import 'modules/nav';
@import 'modules/buttons'; @import 'modules/buttons';

2
style.css
View file

File diff suppressed because one or more lines are too long