Grid push and pull, tidied up css and gruntfile, addded more form variables

This commit is contained in:
Nick Pack committed 2013-07-21 21:49:03 +01:00
1 parent 4f1d9febce
commit aa2f2231f0
9 files changed
+222 -40

No files matched your search

+1 -1
View File
@@ -34,7 +34,7 @@ module.exports = function(grunt) {
},
watch: {
files: 'src/scss/**/*',
tasks: ['sass', 'csslint', 'cssmin']
tasks: ['sass', 'csslint:scssoutput', 'cssmin']
}
});
+128 -11
View File
@@ -455,6 +455,66 @@ hr {
padding-left: 840px; }
.container .offset-by-fifteen {
padding-left: 900px; }
.container .pull-by-one {
left: -60px; }
.container .pull-by-two {
left: -120px; }
.container .pull-by-three {
left: -180px; }
.container .pull-by-four {
left: -240px; }
.container .pull-by-five {
left: -300px; }
.container .pull-by-six {
left: -360px; }
.container .pull-by-seven {
left: -420px; }
.container .pull-by-eight {
left: -480px; }
.container .pull-by-nine {
left: -540px; }
.container .pull-by-ten {
left: -600px; }
.container .pull-by-eleven {
left: -660px; }
.container .pull-by-twelve {
left: -720px; }
.container .pull-by-thirteen {
left: -780px; }
.container .pull-by-fourteen {
left: -840px; }
.container .pull-by-fifteen {
left: -900px; }
.container .push-by-one {
left: 60px; }
.container .push-by-two {
left: 120px; }
.container .push-by-three {
left: 180px; }
.container .push-by-four {
left: 240px; }
.container .push-by-five {
left: 300px; }
.container .push-by-six {
left: 360px; }
.container .push-by-seven {
left: 420px; }
.container .push-by-eight {
left: 480px; }
.container .push-by-nine {
left: 540px; }
.container .push-by-ten {
left: 600px; }
.container .push-by-eleven {
left: 660px; }
.container .push-by-twelve {
left: 720px; }
.container .push-by-thirteen {
left: 780px; }
.container .push-by-fourteen {
left: 840px; }
.container .push-by-fifteen {
left: 900px; }
@media only screen and (max-width: 959px) {
.container {
@@ -531,6 +591,66 @@ hr {
padding-left: 672px; }
.container .offset-by-fifteen {
padding-left: 720px; }
.container .pull-by-one {
left: -48px; }
.container .pull-by-two {
left: -96px; }
.container .pull-by-three {
left: -144px; }
.container .pull-by-four {
left: -192px; }
.container .pull-by-five {
left: -240px; }
.container .pull-by-six {
left: -288px; }
.container .pull-by-seven {
left: -336px; }
.container .pull-by-eight {
left: -384px; }
.container .pull-by-nine {
left: -432px; }
.container .pull-by-ten {
left: -480px; }
.container .pull-by-eleven {
left: -528px; }
.container .pull-by-twelve {
left: -576px; }
.container .pull-by-thirteen {
left: -624px; }
.container .pull-by-fourteen {
left: -672px; }
.container .pull-by-fifteen {
left: -720px; }
.container .push-by-one {
left: 48px; }
.container .push-by-two {
left: 96px; }
.container .push-by-three {
left: 144px; }
.container .push-by-four {
left: 192px; }
.container .push-by-five {
left: 240px; }
.container .push-by-six {
left: 288px; }
.container .push-by-seven {
left: 336px; }
.container .push-by-eight {
left: 384px; }
.container .push-by-nine {
left: 432px; }
.container .push-by-ten {
left: 480px; }
.container .push-by-eleven {
left: 528px; }
.container .push-by-twelve {
left: 576px; }
.container .push-by-thirteen {
left: 624px; }
.container .push-by-fourteen {
left: 672px; }
.container .push-by-fifteen {
left: 720px; }
.container {
width: 768px; }
@@ -583,8 +703,7 @@ hr {
.clearfix:after {
clear: both; }
.row,
.clearfix {
.row, .clearfix {
zoom: 1; }
.clear {
@@ -713,7 +832,7 @@ ol {
list-style: decimal; }
ol, ul.square, ul.circle, ul.disc {
margin: 0 0 0 30px; }
margin: 0 0 0 10px; }
ul.square {
list-style: square outside; }
@@ -852,7 +971,8 @@ select {
background: white; }
select {
padding: 10px; }
padding: 10px;
width: 220px; }
input[type="text"]:focus,
input[type="password"]:focus,
@@ -878,9 +998,6 @@ legend {
font-weight: bold;
font-size: 13px; }
select {
width: 220px; }
input[type="checkbox"] {
display: inline; }
@@ -991,10 +1108,10 @@ table {
-webkit-border-top-left-radius: 3px;
-moz-border-radius-topleft: 3px;
border-top-left-radius: 3px; }
.table-bordered caption + thead tr:first-child th:last-child,
.table-bordered caption + tbody tr:first-child td:last-child,
.table-bordered colgroup + thead tr:first-child th:last-child,
.table-bordered colgroup + tbody tr:first-child td:last-child {
.table-bordered caption thead tr:first-child th:last-child,
.table-bordered caption tbody tr:first-child td:last-child,
.table-bordered colgroup thead tr:first-child th:last-child,
.table-bordered colgroup tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 3px;
-moz-border-radius-topright: 3px;
border-top-right-radius: 3px; }
+2 -2
View File
@@ -1,2 +1,2 @@
/* Ribs 1.0.4 - https://github.com/nickpack/Ribs - 17-07-2013 */
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}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%}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}.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}.alpha-omega{margin-right:0;margin-left:0}.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 .one-half{width:460px}.container .one-quarter{width:220px}.container .three-quarters{width:700px}.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 .one-half{width:364px}.container .one-quarter{width:172px}.container .three-quarters{width:556px}.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}.contaLine truncated
/* Ribs 1.0.5 - https://github.com/nickpack/Ribs - 21-07-2013 */
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}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%}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}.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}.alpha-omega{margin-right:0;margin-left:0}.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 .one-half{width:460px}.container .one-quarter{width:220px}.container .three-quarters{width:700px}.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}.container .pull-by-one{left:-60px}.container .pull-by-two{left:-120px}.container .pull-by-three{left:-180px}.container .pull-by-four{left:-240px}.container .pull-by-five{left:-300px}.container .pull-by-six{left:-360px}.container .pull-by-seven{left:-420px}.container .pull-by-eight{left:-480px}.container .pull-by-nine{left:-540px}.container .pull-by-ten{left:-600px}.container .pull-by-eleven{left:-660px}.container .pull-by-twelve{left:-720px}.container .pull-by-thirteen{left:-780px}.container .pull-by-fourteen{left:-840px}.container .pull-by-fifteen{left:-900px}.container .push-by-one{left:60px}.container .push-by-two{left:120px}.container .push-by-three{left:180px}.container .push-by-four{left:240px}.container .push-by-five{left:300px}.container .push-by-six{left:360px}.container .push-by-seven{left:420px}.container .push-by-eight{left:480px}.container .push-by-nine{left:540px}.container .push-by-ten{left:600px}.container .push-by-eleven{left:660px}.container .push-by-twelve{left:720px}.container .push-by-thirteen{left:780px}.container .push-by-fourteen{left:840px}.container .push-by-fifteen{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}.cLine truncated
+3 -6
View File
@@ -90,7 +90,7 @@ select {
font: $form_input_font_size $form_element_font;
color: $form_input_text_colour;
width: $form_input_width;
max-width: 100%;
max-width: $form_input_max_width;
display: block;
margin: $form_input_margin;
background: $form_input_background;
@@ -98,6 +98,7 @@ select {
select {
padding: $form_input_select_padding;
width: $form_input_select_width;
}
input[type="text"]:focus,
@@ -125,17 +126,13 @@ legend {
font-size: $legend_font_size;
}
select {
width: $form_input_select_width;
}
input[type="checkbox"] {
display: $form_input_checkbox_display;
}
label span,
legend span {
font-weight: normal;
font-weight: $form_label_legend_font_weight;
font-size: $form_input_font_size;
color: $form_label_legend_colour;
}
+33 -13
View File
@@ -2,8 +2,12 @@
position: relative;
margin: 0 auto;
padding: 0;
& .alpha { margin-left: 0; }
& .omega { margin-right: 0; }
& .alpha {
margin-left: 0;
}
& .omega {
margin-right: 0;
}
}
.column, .columns {
@@ -17,7 +21,9 @@
margin-left: 0;
}
.row { margin-bottom: $gutter; }
.row {
margin-bottom: $gutter;
}
@include grid($desktop-container-width, $column-count, $gutter);
@@ -28,8 +34,12 @@
.container {
width: $tablet-container-width;
& .alpha { margin-right: 10px; }
& .omega { margin-left: 10px; }
& .alpha {
margin-right: 10px;
}
& .omega {
margin-left: 10px;
}
}
}
//--------------------------------------------------------------------
@@ -85,7 +95,13 @@
// #Clearing
// ==================================================
.container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
.container:after {
content: "\0020";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
// Use clearfix class on parent to clear nested columns,
// or wrap each row of columns in a <div class="row">
@@ -98,13 +114,17 @@
overflow: hidden;
visibility: hidden;
width: 0;
height: 0; }
.row:after,
.clearfix:after {
clear: both; }
.row,
.clearfix {
zoom: 1; }
height: 0;
}
.row:after,
.clearfix:after {
clear: both;
}
.row, .clearfix {
zoom: 1;
}
// You can also use a <br class="clear" /> to clear columns
.clear {
+42
View File
@@ -159,6 +159,38 @@
.offset-by-thirteen { padding-left: $grid-column-width*13; }
.offset-by-fourteen { padding-left: $grid-column-width*14; }
.offset-by-fifteen { padding-left: $grid-column-width*15; }
.pull-by-one { left: -$grid-column-width; }
.pull-by-two { left: -$grid-column-width*2; }
.pull-by-three { left: -$grid-column-width*3; }
.pull-by-four { left: -$grid-column-width*4; }
.pull-by-five { left: -$grid-column-width*5; }
.pull-by-six { left: -$grid-column-width*6; }
.pull-by-seven { left: -$grid-column-width*7; }
.pull-by-eight { left: -$grid-column-width*8; }
.pull-by-nine { left: -$grid-column-width*9; }
.pull-by-ten { left: -$grid-column-width*10; }
.pull-by-eleven { left: -$grid-column-width*11; }
.pull-by-twelve { left: -$grid-column-width*12; }
.pull-by-thirteen { left: -$grid-column-width*13; }
.pull-by-fourteen { left: -$grid-column-width*14; }
.pull-by-fifteen { left: -$grid-column-width*15; }
.push-by-one { left: $grid-column-width; }
.push-by-two { left: $grid-column-width*2; }
.push-by-three { left: $grid-column-width*3; }
.push-by-four { left: $grid-column-width*4; }
.push-by-five { left: $grid-column-width*5; }
.push-by-six { left: $grid-column-width*6; }
.push-by-seven { left: $grid-column-width*7; }
.push-by-eight { left: $grid-column-width*8; }
.push-by-nine { left: $grid-column-width*9; }
.push-by-ten { left: $grid-column-width*10; }
.push-by-eleven { left: $grid-column-width*11; }
.push-by-twelve { left: $grid-column-width*12; }
.push-by-thirteen { left: $grid-column-width*13; }
.push-by-fourteen { left: $grid-column-width*14; }
.push-by-fifteen { left: $grid-column-width*15; }
}
}
@@ -170,3 +202,13 @@
width: 0;
height: 0;
}
@mixin visible {
display: block !important;
visibility: visible;
}
@mixin hidden {
display: none !important;
visibility: hidden;
}
+4 -4
View File
@@ -115,10 +115,10 @@ table {
colgroup tbody tr:first-child td:first-child {
@include border-top-left-radius($table_border_radius);
}
caption + thead tr:first-child th:last-child,
caption + tbody tr:first-child td:last-child,
colgroup + thead tr:first-child th:last-child,
colgroup + tbody tr:first-child td:last-child {
caption thead tr:first-child th:last-child,
caption tbody tr:first-child td:last-child,
colgroup thead tr:first-child th:last-child,
colgroup tbody tr:first-child td:last-child {
@include border-top-right-radius($table_border_radius);
}
+2 -2
View File
@@ -77,7 +77,7 @@ p img {
}
em {
font-style: italic;
font-style: $em_font_style;
}
strong {
@@ -86,7 +86,7 @@ strong {
}
small {
font-size: 80%;
font-size: $small_font_size;
}
blockquote, blockquote p {
+7 -1
View File
@@ -34,6 +34,7 @@ $form_input_text_colour: #777;
$form_input_background: #fff;
$form_input_padding: 6px 4px;
$form_input_width: 210px;
$form_input_max_width: 100%;
$form_input_select_width: 220px;
$form_input_margin: 0 0 20px 0;
$form_input_font_size: 13px;
@@ -52,6 +53,7 @@ $form_input_focus_box_shadow_colour: rgba(0, 0, 0, .2);
$form_input_select_padding: 10px;
$form_label_legend_colour: #444;
$form_label_legend_font_weight: normal;
$form_fieldset_margin: 0 0 20px 0;
$legend_font_weight: bold;
@@ -101,6 +103,10 @@ $paragraph_lead_font_size: 21px;
$paragraph_lead_line_height: $paragraph_lead_font_size * 1.5;
$paragraph_lead_colour: #777;
$em_font_style: italic;
$small_font_size: 80%;
$strong_colour: #333;
$blockquote_colour: #777;
@@ -126,7 +132,7 @@ $list_large_line_height: 21px;
$ul_list_style: none outside;
$ol_list_style: decimal;
$list_styled_margin: 0 0 0 30px; // ul, ol with disc, square etc.
$list_styled_margin: 0 0 0 10px; // ul, ol with disc, square etc.
$list_styled_position: outside; // List item bullet position
$nested_list_margin: 4px 0 5px 30px;