Stop being a n00b update

This commit is contained in:
Mike Francis 2014-02-03 15:33:44 +00:00
parent f8fc7a5487
commit 006d3c8235
7 changed files with 42 additions and 82 deletions

View file

@ -1,13 +1,11 @@
input, select, textarea, button {
input, select, textarea {
display: inline-block;
font-family: $base-font-stack;
font-size: 1em;
font: inherit;
line-height: $base-margin-bottom + px;
padding: 4px 8px;
color: $base-colour;
background: $input-background;
border: $input-border;
@include border-radius(3px);
width: 208px;
}
@ -15,16 +13,16 @@ textarea {
min-height: ($base-margin-bottom * 4) + px;
}
.control-group {
.form__group {
margin-bottom: $base-margin-bottom + px;
}
.control-label {
.form__label {
float: left;
width: 140px;
}
.controls {
.form__controls {
margin-left: 160px;
@extend .clearfix;
}
@ -36,12 +34,12 @@ textarea {
.btn {
background: $btn-background;
border: $btn-border;
@include border-radius(3px);
color: $btn-color;
cursor: pointer;
display: inline-block;
line-height: $base-margin-bottom + px;
padding: 5px 20px;
line-height: ($base-margin-bottom * 2) + px;
height: ($base-margin-bottom * 2) + px;
padding: 0 20px;
width: auto;
&:hover {
background: $btn-background-hover;

View file

@ -1,13 +1,11 @@
.nav {
list-style: none;
margin-left: 0;
}
.nav > li {
display: inline-block;
*display: inline;
}
.nav > li > a {
display: block;
}
>li {
display: inline-block;
*display: inline;
>a {
display: block;
}
}
}

View file

@ -5,7 +5,7 @@
@extend .clearfix;
}
.container-fluid {
.container--fluid {
width: 100%;
@extend .clearfix;
}
@ -14,7 +14,7 @@
margin-left: -($column-gutter / $container-max-width) * 100%;
_overflow: hidden;
@extend .clearfix;
@include breakpoint(mobile) {
@include media($mobile) {
margin-left: 0;
}
}
@ -24,7 +24,7 @@
float: left;
margin-left: ($column-gutter / $container-max-width) * 100%;
vertical-align: top;
@include breakpoint(mobile) {
@include media($mobile) {
display: block;
float: none;
margin-left: 0;
@ -39,12 +39,12 @@
}
}
.row-no-gutters .column {
.row--no-gutters .column {
margin-left: 0;
}
@for $i from 1 through $column-count {
.row-no-gutters .column-span-#{$i} {
.row--no-gutters .column-span-#{$i} {
width: ((100 / $column-count) * $i) * 1%;
*width: ((100 / $column-count) * $i) - .02 * 1%;
}