Fix branch 'master'

This commit is contained in:
CJ Patoilo
2016-09-09 21:53:14 -03:00
60 changed files with 703 additions and 253 deletions

View File

@@ -12,7 +12,7 @@ html
body
color: $color-secondary
font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif
font-size: 1.6em // currently ems cause chrome bug misinterpreting rems on body element
font-size: 1.6em // Currently ems cause chrome bug misinterpreting rems on body element
font-weight: 300
letter-spacing: .01em
line-height: 1.6

View File

@@ -8,5 +8,5 @@ blockquote
margin-right: 0
padding: 1rem 1.5rem
& *:last-child
margin: 0
*:last-child
margin-bottom: 0

View File

@@ -24,20 +24,19 @@ input[type='submit']
text-transform: uppercase
white-space: nowrap
&:hover,
&:focus
&:focus,
&:hover
background-color: $color-secondary
border-color: $color-secondary
color: $color-initial
outline: 0
&.button-disabled,
&[disabled]
cursor: default
opacity: .5
&:hover,
&:focus
&:focus,
&:hover
background-color: $color-primary
border-color: $color-primary
@@ -45,17 +44,16 @@ input[type='submit']
background-color: transparent
color: $color-primary
&:hover,
&:focus
&:focus,
&:hover
background-color: transparent
border-color: $color-secondary
color: $color-secondary
&.button-disabled,
&[disabled]
&:hover,
&:focus
&:focus,
&:hover
border-color: inherit
color: $color-primary
@@ -64,15 +62,14 @@ input[type='submit']
border-color: transparent
color: $color-primary
&:hover,
&:focus
&:focus,
&:hover
background-color: transparent
border-color: transparent
color: $color-secondary
&.button-disabled,
&[disabled]
&:hover,
&:focus
&:focus,
&:hover
color: $color-primary

View File

@@ -25,11 +25,11 @@ select
outline: 0
select
background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTQiIHZpZXdCb3g9IjAgMCAyOSAxNCIgd2lkdGg9IjI5Ij48cGF0aCBmaWxsPSIjZDFkMWQxIiBkPSJNOS40IDMuNmw1IDcgNS4yLTciLz48L3N2Zz4=) center right no-repeat
padding: .6rem 3rem .6rem 1rem
background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="#d1d1d1" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>') center right no-repeat
padding-right: 3.0rem
&:focus
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTQiIHZpZXdCb3g9IjAgMCAyOSAxNCIgd2lkdGg9IjI5Ij48cGF0aCBmaWxsPSIjOWI0ZGNmIiBkPSJNMTkuNiAzLjZIOS40bDUgNyIvPjwvc3ZnPg==)
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="#9b4dca" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>')
textarea
min-height: 6.5rem

View File

@@ -21,15 +21,17 @@
padding: 0
width: 100%
// Larger than mobile screen
@media (min-width: 40.0rem)
flex-direction: row
margin-left: -1.0rem
width: calc(100% + 2.0rem)
&.row-no-padding
padding: 0
&> .column
padding: 0
&.row-wrap
flex-wrap: wrap
// Vertically Align Columns
// .row-* vertically aligns every .col in the .row
&.row-top
align-items: flex-start
@@ -58,20 +60,6 @@
max-width: 100%
width: 100%
@media (min-width: 40.0rem)
margin-bottom: inherit
padding: 0 1.0rem
// .column-* vertically aligns an individual .column
.col-top
align-self: flex-start
.col-bottom
align-self: flex-end
.col-center
align-self: center
// Column Offsets
&.column-offset-10
margin-left: 10%
@@ -151,3 +139,25 @@
&.column-90
flex: 0 0 90%
max-width: 90%
// .column-* vertically aligns an individual .column
.column-top
align-self: flex-start
.column-bottom
align-self: flex-end
.column-center
align-self: center
// Larger than mobile screen
@media (min-width: 640px)
.row
flex-direction: row
margin-left: -1.0rem
width: calc(100% + 2.0rem)
.column
margin-bottom: inherit
padding: 0 1.0rem

View File

@@ -3,4 +3,4 @@
//
img
max-width: 100%
max-width: 100%

View File

@@ -9,21 +9,21 @@ ul
padding-left: 0
dl,
ul,
ol
ol,
ul
font-size: 90%
margin: 1.5rem 0 1.5rem 3.0rem
dl
list-style: none
ul
list-style: circle inside
ol
list-style: decimal inside
dt,
ul
list-style: circle inside
dd,
dt,
li
margin-bottom: 1.0rem

View File

@@ -2,23 +2,23 @@
// Spacing
//
.button,
button
button,
.button
margin-bottom: 1.0rem
fieldset,
input,
textarea,
select,
fieldset
textarea
margin-bottom: 1.5rem
pre,
blockquote,
dl,
figure,
table,
p,
ul,
form,
ol,
form
p,
pre,
table,
ul
margin-bottom: 2.5rem

View File

@@ -5,8 +5,8 @@
table
width: 100%
th,
td
td,
th
border-bottom: .1rem solid $color-quinary
padding: 1.2rem 1.5rem
text-align: left

View File

@@ -46,7 +46,7 @@ h6
line-height: 1.4
// Larger than mobile screen
@media (min-width: 40.0rem)
@media (min-width: 640px)
h1
font-size: 5.0rem

View File

@@ -2,21 +2,21 @@
// Utility
//
// Float either direction
.float-right
float: right
.float-left
float: left
// Clear a float with .clearfix
.clearfix
*zoom: 1
&:after
clear: both
&:after,
&:before
content: ''
display: table
&:after
clear: both
// Float either direction
.float-left
float: left
.float-right
float: right