AverageMarcus/milligram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reordering of selectors

Browse Source
This commit is contained in:
CJ Patoilo 2015-12-27 14:43:13 -03:00
parent 77a0b3af72
commit b584bf2073
7 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dist/milligram.css vendored
View File

@ -27,23 +27,21 @@ body {
box-sizing: border-box; box-sizing: border-box;
} }
.blockquote,
blockquote { blockquote {
border-left: 0.3rem solid #d1d1d1; border-left: 0.3rem solid #d1d1d1;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
padding: 1rem 1.5rem; padding: 1rem 1.5rem;
} }
.blockquote *:last-child,
blockquote *:last-child { blockquote *:last-child {
margin: 0; margin: 0;
} }
.button, .button,
button, button,
input[type='submit'], input[type='button'],
input[type='reset'], input[type='reset'],
input[type='button'] { input[type='submit'] {
background-color: #9b4dca; background-color: #9b4dca;
border: 0.1rem solid #9b4dca; border: 0.1rem solid #9b4dca;
border-radius: 0.4rem; border-radius: 0.4rem;
@ -65,12 +63,12 @@ input[type='button'] {
.button:hover, .button:focus, .button:hover, .button:focus,
button:hover, button:hover,
button:focus, button:focus,
input[type='submit']:hover, input[type='button']:hover,
input[type='submit']:focus, input[type='button']:focus,
input[type='reset']:hover, input[type='reset']:hover,
input[type='reset']:focus, input[type='reset']:focus,
input[type='button']:hover, input[type='submit']:hover,
input[type='button']:focus { input[type='submit']:focus {
background-color: #606c76; background-color: #606c76;
border-color: #606c76; border-color: #606c76;
color: #ffffff; color: #ffffff;
@ -78,30 +76,30 @@ input[type='button']:focus {
} }
.button.button-outline, .button.button-outline,
button.button-outline, button.button-outline,
input[type='submit'].button-outline, input[type='button'].button-outline,
input[type='reset'].button-outline, input[type='reset'].button-outline,
input[type='button'].button-outline { input[type='submit'].button-outline {
color: #9b4dca; color: #9b4dca;
background-color: transparent; background-color: transparent;
} }
.button.button-outline:hover, .button.button-outline:focus, .button.button-outline:hover, .button.button-outline:focus,
button.button-outline:hover, button.button-outline:hover,
button.button-outline:focus, button.button-outline:focus,
input[type='submit'].button-outline:hover, input[type='button'].button-outline:hover,
input[type='submit'].button-outline:focus, input[type='button'].button-outline:focus,
input[type='reset'].button-outline:hover, input[type='reset'].button-outline:hover,
input[type='reset'].button-outline:focus, input[type='reset'].button-outline:focus,
input[type='button'].button-outline:hover, input[type='submit'].button-outline:hover,
input[type='button'].button-outline:focus { input[type='submit'].button-outline:focus {
color: #606c76; color: #606c76;
background-color: transparent; background-color: transparent;
border-color: #606c76; border-color: #606c76;
} }
.button.button-clear, .button.button-clear,
button.button-clear, button.button-clear,
input[type='submit'].button-clear, input[type='button'].button-clear,
input[type='reset'].button-clear, input[type='reset'].button-clear,
input[type='button'].button-clear { input[type='submit'].button-clear {
color: #9b4dca; color: #9b4dca;
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
@ -109,12 +107,12 @@ input[type='button'].button-clear {
.button.button-clear:hover, .button.button-clear:focus, .button.button-clear:hover, .button.button-clear:focus,
button.button-clear:hover, button.button-clear:hover,
button.button-clear:focus, button.button-clear:focus,
input[type='submit'].button-clear:hover, input[type='button'].button-clear:hover,
input[type='submit'].button-clear:focus, input[type='button'].button-clear:focus,
input[type='reset'].button-clear:hover, input[type='reset'].button-clear:hover,
input[type='reset'].button-clear:focus, input[type='reset'].button-clear:focus,
input[type='button'].button-clear:hover, input[type='submit'].button-clear:hover,
input[type='button'].button-clear:focus { input[type='submit'].button-clear:focus {
color: #606c76; color: #606c76;
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
@ -145,11 +143,11 @@ pre > code {
input[type='email'], input[type='email'],
input[type='number'], input[type='number'],
input[type='search'],
input[type='text'],
input[type='tel'],
input[type='url'],
input[type='password'], input[type='password'],
input[type='search'],
input[type='tel'],
input[type='text'],
input[type='url'],
textarea, textarea,
select { select {
-webkit-appearance: none; -webkit-appearance: none;
@ -166,11 +164,11 @@ select {
} }
input[type='email']:focus, input[type='email']:focus,
input[type='number']:focus, input[type='number']:focus,
input[type='search']:focus,
input[type='text']:focus,
input[type='tel']:focus,
input[type='url']:focus,
input[type='password']:focus, input[type='password']:focus,
input[type='search']:focus,
input[type='tel']:focus,
input[type='text']:focus,
input[type='url']:focus,
textarea:focus, textarea:focus,
select:focus { select:focus {
border: 0.1rem solid #9b4dca; border: 0.1rem solid #9b4dca;
@ -394,8 +392,8 @@ hr {
margin-top: 3rem; margin-top: 3rem;
} }
button, .button,
.button { button {
margin-bottom: 1rem; margin-bottom: 1rem;
} }

2
dist/milligram.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/milligram.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/_Base.sass
View File

@ -2,10 +2,8 @@
// Base // Base
// –––––––––––––––––––––––––––––––––––––––––––––––––– // ––––––––––––––––––––––––––––––––––––––––––––––––––
// NOTE
// The base font-size is set at 62.5% for having the convenience // The base font-size is set at 62.5% for having the convenience
// of sizing rems in a way that is similar to using px. 1.6rem=16px // of sizing rems in a way that is similar to using px. 1.6rem=16px
html html
box-sizing: border-box box-sizing: border-box
font-size: 62.5% font-size: 62.5%

4
src/_Button.sass
View File

@ -4,9 +4,9 @@
.button, .button,
button, button,
input[type='submit'], input[type='button'],
input[type='reset'], input[type='reset'],
input[type='button'] input[type='submit']
background-color: $color-primary background-color: $color-primary
border: .1rem solid $color-primary border: .1rem solid $color-primary
border-radius: .4rem border-radius: .4rem

8
src/_Form.sass
View File

@ -4,11 +4,11 @@
input[type='email'], input[type='email'],
input[type='number'], input[type='number'],
input[type='search'],
input[type='text'],
input[type='tel'],
input[type='url'],
input[type='password'], input[type='password'],
input[type='search'],
input[type='tel'],
input[type='text'],
input[type='url'],
textarea, textarea,
select select
appearance: none // Removes awkward default styles on some inputs for iOS appearance: none // Removes awkward default styles on some inputs for iOS

4
src/_Spacing.sass
View File

@ -2,8 +2,8 @@
// Spacing // Spacing
// –––––––––––––––––––––––––––––––––––––––––––––––––– // ––––––––––––––––––––––––––––––––––––––––––––––––––
button, .button,
.button button
margin-bottom: 1rem margin-bottom: 1rem
input, input,