primer/css
1
1
Fork 0
mirror of https://github.com/primer/css.git synced 2024-09-21 21:58:42 +03:00
Code Issues Projects Releases Wiki Activity

some merge-able rules

Browse Source
This commit is contained in:
Jon Rohan 2015-05-21 16:20:19 -04:00
parent 7ad676a0be
commit 36b4f861b4
2 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scss/_buttons.scss
View File

@ -348,11 +348,11 @@
&:focus {
z-index: 3;
}
}
// Tuck buttons into one another to prevent double border
.btn + .btn {
margin-left: -1px;
// Tuck buttons into one another to prevent double border
+ .btn {
margin-left: -1px;
}
}
.btn + .button_to,

129
scss/_forms.scss
View File

@ -42,7 +42,7 @@ textarea {
}
// Inputs with contrast for easy light gray backgrounds against white.
// input.class is needed here to increase specificity over input[…]
// input.class is needed here to increase specificity over input[...]
input.input-contrast,
.input-contrast {
background-color: #fafafa;
@ -179,12 +179,11 @@ dl.form {
&.is-error { color: $brand-red; }
&.is-success { color: $brand-green; }
}
h4 + p.note {
margin-top: 0;
+ p.note {
margin-top: 0;
}
}
}
//
@ -198,63 +197,11 @@ dl.form {
content: "*";
}
}
}
.note {
min-height: 17px;
margin: 4px 0 2px;
font-size: 12px;
color: #777;
.spinner {
margin-right: 3px;
vertical-align: middle;
}
}
// Checkboxes and Radiobuttons
//
// For checkboxes and radio button selections.
.form-checkbox {
padding-left: 20px;
margin: 15px 0;
vertical-align: middle;
label {
em.highlight {
position: relative;
left: -4px;
padding: 2px 4px;
font-style: normal;
background: #fffbdc;
border-radius: 3px;
}
}
input[type=checkbox],
input[type=radio] {
float: left;
margin: 2px 0 0 -20px;
vertical-align: middle;
}
.note {
display: block;
margin: 0;
font-size: 12px;
font-weight: normal;
color: #666;
}
}
// Form AJAX states
//
// Form fields that need feedback for AJAX loading, success
// states and errored states.
dl.form {
// Form AJAX states
//
// Form fields that need feedback for AJAX loading, success
// states and errored states.
.success,
.error,
.indicator {
@ -344,6 +291,55 @@ dl.form {
}
}
.note {
min-height: 17px;
margin: 4px 0 2px;
font-size: 12px;
color: #777;
.spinner {
margin-right: 3px;
vertical-align: middle;
}
}
// Checkboxes and Radiobuttons
//
// For checkboxes and radio button selections.
.form-checkbox {
padding-left: 20px;
margin: 15px 0;
vertical-align: middle;
label {
em.highlight {
position: relative;
left: -4px;
padding: 2px 4px;
font-style: normal;
background: #fffbdc;
border-radius: 3px;
}
}
input[type=checkbox],
input[type=radio] {
float: left;
margin: 2px 0 0 -20px;
vertical-align: middle;
}
.note {
display: block;
margin: 0;
font-size: 12px;
font-weight: normal;
color: #666;
}
}
// Field groups
//
@ -357,10 +353,13 @@ dl.form {
float: left;
margin: 0 30px 0 0;
& > dt label {
display: inline-block;
margin: 5px 0 0;
color: #666;
> dt {
label {
display: inline-block;
margin: 5px 0 0;
color: #666;
}
img {
position: relative;