primer/css
1
1
Fork 0
mirror of https://github.com/primer/css.git synced 2024-12-01 20:53:06 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #252 from primer/shawnbot/type-vars

Browse Source 
Replace static type values with variables
This commit is contained in:
Shawn Allen 2017-07-27 13:41:42 -07:00 committed by GitHub
commit e30626a8a4
16 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/primer-avatars/lib/avatar.scss
View File

@ -1,7 +1,7 @@
.avatar {
display: inline-block;
overflow: hidden; // Ensure page layout in Firefox should images fail to load
line-height: 1;
line-height: $lh-condensed-ultra;
vertical-align: middle;
border-radius: 3px;
}
@ -10,7 +10,7 @@
.avatar-link {
float: left;
line-height: 1;
line-height: $lh-condensed-ultra;
}
// User for example on /stars and /user for grids of avatars

5
modules/primer-base/lib/typography-base.scss
View File

@ -66,13 +66,14 @@ dd {
tt,
code {
font-family: $mono-font;
font-size: 12px;
font-size: $font-size-small;
}
pre {
margin-top: 0;
margin-bottom: 0;
font: 12px $mono-font;
font-family: $mono-font;
font-size: $font-size-small;
}
// Octicons

2
modules/primer-blankslate/lib/blankslate.scss
View File

@ -10,7 +10,7 @@
code {
padding: 2px 5px 3px;
font-size: 14px;
font-size: $h5-size;
background: $bg-white;
border: 1px solid $border-gray-light;
border-radius: 3px;

4
modules/primer-buttons/lib/button.scss
View File

@ -21,7 +21,7 @@
i {
font-style: normal;
font-weight: 500;
font-weight: $font-weight-semibold;
opacity: 0.6;
}
@ -115,7 +115,7 @@
display: inline-block;
height: 12px;
padding: 0 5px 5px;
font-size: 12px;
font-size: $font-size-small;
font-weight: $font-weight-bold;
line-height: 6px;
color: $gray-700;

10
modules/primer-forms/lib/form-control.scss
View File

@ -63,7 +63,7 @@ label {
// Large inputs
.input-lg {
padding: $spacer-1 10px;
font-size: 16px;
font-size: $h4-size;
}
// Full-width inputs
@ -117,8 +117,8 @@ label {
.note {
display: block;
margin: 0;
font-size: 12px;
font-weight: normal;
font-size: $font-size-small;
font-weight: $font-weight-normal;
color: $gray-600;
}
}
@ -196,7 +196,7 @@ input::-webkit-inner-spin-button {
.form-warning {
padding: $spacer-2 10px;
margin: 10px 0;
font-size: 14px;
font-size: $h5-size;
color: $yellow-900;
background: $yellow-100;
border: 1px solid $border-yellow;
@ -204,7 +204,7 @@ input::-webkit-inner-spin-button {
p {
margin: 0;
line-height: 1.5;
line-height: $lh-default;
}
a { font-weight: $font-weight-bold; }

6
modules/primer-forms/lib/form-group.scss
View File

@ -97,7 +97,7 @@
.error,
.indicator {
display: none;
font-size: 12px;
font-size: $font-size-small;
font-weight: $font-weight-bold;
}
@ -136,7 +136,7 @@
padding: 5px $spacer-2;
margin: $spacer-1 0 0;
font-size: 13px;
font-weight: normal;
font-weight: $font-weight-normal;
border-style: solid;
border-width: 1px;
border-radius: 3px;
@ -205,7 +205,7 @@
.note {
min-height: 17px;
margin: $spacer-1 0 2px;
font-size: 12px;
font-size: $font-size-small;
color: $text-gray;
.spinner {

6
modules/primer-forms/lib/form-validation.scss
View File

@ -235,7 +235,7 @@ dl.form-group > dd {
}
.drag-and-drop-error-info {
font-weight: normal;
font-weight: $font-weight-normal;
color: $text-gray;
a {
@ -368,13 +368,13 @@ div.composer {
h2.account {
margin: 15px 0 0;
font-size: 18px;
font-weight: normal;
font-weight: $font-weight-normal;
color: $gray-600;
}
p.explain {
position: relative;
font-size: 12px;
font-size: $font-size-small;
color: $gray-600;
strong {

2
modules/primer-labels/lib/counters.scss
View File

@ -4,7 +4,7 @@
padding: 2px 5px;
font-size: $font-size-small;
font-weight: $font-weight-bold;
line-height: 1;
line-height: $lh-condensed-ultra;
color: $gray-600;
background-color: rgba($black, 0.08);
border-radius: 20px;

4
modules/primer-labels/lib/labels.scss
View File

@ -20,7 +20,7 @@
padding: 3px $spacer-1;
font-size: $font-size-small;
font-weight: $font-weight-bold;
line-height: 1; // prevent inheritance from changing proportions
line-height: $lh-condensed-ultra; // prevent inheritance from changing proportions
color: $text-white;
border-radius: 2px;
box-shadow: inset 0 -1px 0 rgba($black, 0.12);
@ -42,7 +42,7 @@
.Label--outline {
margin-top: -1px; // offsets the 1px border
margin-bottom: -1px; // offsets the 1px border
font-weight: normal;
font-weight: $font-weight-normal;
color: $text-gray;
background-color: transparent;
border: 1px solid $black-fade-15;

4
modules/primer-markdown/lib/blob-csv.scss
View File

@ -4,8 +4,8 @@
th {
padding: 5px;
overflow: hidden;
font-size: 12px;
line-height: 1;
font-size: $font-size-small;
line-height: $lh-condensed-ultra;
text-align: left;
white-space: nowrap;
}

4
modules/primer-markdown/lib/markdown-body.scss
View File

@ -6,7 +6,7 @@
// includes some GitHub Flavored Markdown specific styling (like @mentions)
.markdown-body {
font-family: $body-font;
font-size: 16px;
font-size: $h4-size;
line-height: $body-line-height;
word-wrap: break-word;
@ -50,7 +50,7 @@
float: left;
padding-right: $spacer-1;
margin-left: -20px;
line-height: 1;
line-height: $lh-condensed-ultra;
&:focus {
outline: none;

12
modules/primer-marketing-type/lib/typography.scss
View File

@ -20,7 +20,7 @@
}
@mixin alt-h0 {
font-size: 48px;
font-size: $h00-size;
font-weight: $font-weight-light;
@include breakpoint(md) { font-size: 54px; }
@include breakpoint(lg) { font-size: 72px; }
@ -33,7 +33,7 @@
@mixin alt-h1 {
font-size: 36px;
font-weight: $font-weight-light;
@include breakpoint(md) { font-size: 48px; }
@include breakpoint(md) { font-size: $h00-size; }
@include breakpoint(lg) { font-size: 54px; }
}
@ -55,7 +55,7 @@
@mixin alt-h3 {
font-size: 18px;
font-weight: $font-weight-normal;
@include breakpoint(md) { font-size: 20px; }
@include breakpoint(md) { font-size: $h3-size; }
@include breakpoint(lg) { font-size: 22px; }
}
@ -64,7 +64,7 @@
}
.alt-h4 {
font-size: 16px;
font-size: $h4-size;
font-weight: $font-weight-semibold;
}
@ -83,7 +83,7 @@
-webkit-font-smoothing: antialiased;
font-size: 21px;
font-weight: $font-weight-light;
@include breakpoint(md) { font-size: 24px; }
@include breakpoint(md) { font-size: $h2-size; }
@include breakpoint(lg) { font-size: 26px; }
}
@ -115,7 +115,7 @@
margin-bottom: $spacer-5;
margin-left: (-$spacer * 1.5) - 3px;
font-size: 18px;
line-height: 1.5;
line-height: $lh-default;
}
}

4
modules/primer-navigation/lib/filter-list.scss
View File

@ -7,7 +7,7 @@
&.small .filter-item {
padding: $spacer-1 10px;
margin: 0 0 2px;
font-size: 12px;
font-size: $font-size-small;
}
&.pjax-active .filter-item {
@ -27,7 +27,7 @@
padding: $spacer-2 10px;
margin-bottom: 5px;
overflow: hidden;
font-size: 14px;
font-size: $h5-size;
color: $text-gray;
text-decoration: none;
text-overflow: ellipsis;

4
modules/primer-navigation/lib/tabnav.scss
View File

@ -17,7 +17,7 @@
.tabnav-tab {
display: inline-block;
padding: $spacer-2 12px;
font-size: 14px;
font-size: $h5-size;
line-height: 20px;
color: $gray-600;
text-decoration: none;
@ -48,7 +48,7 @@
display: inline-block;
padding-top: 10px;
margin-left: 10px;
font-size: 12px;
font-size: $font-size-small;
color: $gray-600;
> .octicon {

2
modules/primer-tables/lib/tables.scss
View File

@ -8,7 +8,7 @@
box-shadow: 0 1px 1px rgba($black, 0.05);
th {
font-weight: 400;
font-weight: $font-weight-normal;
text-align: left;
}

2
modules/primer-utilities/lib/typography.scss
View File

@ -181,7 +181,7 @@
// Text styles
/* Set the font weight to normal */
.text-normal { font-weight: normal !important; }
.text-normal { font-weight: $font-weight-normal !important; }
/* Set the font weight to bold */
.text-bold { font-weight: $font-weight-bold !important;}
/* Set the font to italic */