Skip to content

Commit c284d16

Browse files
Merge pull request #10 from fritzSF/font-size
Font size
2 parents 114b927 + d30ced5 commit c284d16

File tree

13 files changed

+127
-77
lines changed

13 files changed

+127
-77
lines changed

app/styles/_badge.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $badge-minwidth: 1.9em !default;
2222
$badge-radius: 1em !default;
2323

2424
/// Default font size and line height for badges.
25-
$badge-font-size: 0.625rem !default;
25+
$badge-font-size: 1rem !default;
2626
$badge-lineheight: 1em !default;
2727

2828
/// Generates the base styles for a badge.

app/styles/_buttons.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/// Padding inside buttons.
22
/// @type List
3-
$button-padding: 0.4375rem 0.875rem !default;
4-
$button-padding-small: 0.3125rem 0.625rem;
5-
$button-padding-large: 0.625rem 1.25rem;
3+
$button-padding: 0.7rem 1.4rem !default;
4+
$button-padding-small: 0.5rem 1rem;
5+
$button-padding-large: 1rem 2rem;
66

77
/// Margin around buttons.
88
/// @type List
@@ -36,9 +36,9 @@ $button-radius: 2px !default;
3636
/// Sizes for buttons / Font size
3737
/// @type Map
3838
$button-sizes: (
39-
btn--small: 0.625rem,
40-
btn--default: 0.75rem,
41-
btn--large: 0.875rem,
39+
btn--small: 1rem,
40+
btn--default: 1.2rem,
41+
btn--large: 1.4rem,
4242
) !default;
4343

4444
/// opacity for a disabled button.

app/styles/_labels.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ $label-color-alt: $gray !default;
1313
$label-palette: $sd-extended-palette;
1414

1515
/// Default padding inside labels.
16-
$label-padding: 0 0.375rem !default;
17-
$label-padding-large: 0.25rem 0.75rem;
16+
$label-padding: 0 0.6rem !default;
17+
$label-padding-large: 0.4rem 1.2rem;
1818

1919
$label-lineheight-large: 1;
2020

2121
/// Default radius of labels.
2222
$label-radius: 2px !default;
2323

2424
$label-sizes: (
25-
label--default: 0.5625rem,
26-
label--large: 0.6875rem,
25+
label--default: 0.9rem,
26+
label--large: 1.1rem,
2727
) !default;
2828

2929
/// Removes background fill for hollow buttons.
@@ -40,7 +40,7 @@ $label-sizes: (
4040
vertical-align: middle;
4141
border-radius: $label-radius;
4242
text-transform: uppercase;
43-
line-height: 0.875rem;
43+
line-height: 1.4rem;
4444
letter-spacing: 0.125em;
4545
font-size: map-get($label-sizes, label--default);
4646
white-space: nowrap;

app/styles/_reboot.scss

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* SD Reboot
3+
*/
4+
5+
// ============================================================================
6+
// GLOBAL
7+
// ============================================================================
8+
9+
// Reset box sizing
10+
* {
11+
box-sizing: border-box;
12+
}
13+
// Set box-sizing globally to handle padding and border widths
14+
15+
*::before,
16+
*::after {
17+
box-sizing: inherit;
18+
}
19+
// remove deafult browser focus
20+
:focus {outline:none;}
21+
22+
// Body reset
23+
html {
24+
font-size: 10px;
25+
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
26+
}
27+
28+
body {
29+
font-family: $baseFontFamily;
30+
font-size: $baseFontSize;
31+
line-height: $baseLineHeight;
32+
}
33+
34+
$baseFontSize: 13px;
35+
$baseFontFamily: "Roboto", Helvetica, Arial, sans-serif;
36+
$baseLineHeight: 18px;
37+
$altFontFamily: Georgia, "Times New Roman", Times, serif;
38+
39+
// override content-box in normalize.css
40+
input[type="search"] {
41+
box-sizing: border-box;
42+
}

app/styles/_reset.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/styles/_variables.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
1-
html {
2-
box-sizing: border-box;
3-
}
4-
5-
// Set box-sizing globally to handle padding and border widths
6-
*,
7-
*::before,
8-
*::after {
9-
box-sizing: inherit;
10-
}
11-
121
@import 'variables/typography';
132
@import 'variables/colors';

app/styles/app.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
12
@import "normalize";
2-
@import "reset";
3+
@import "variables";
4+
@import "reboot";
35
@import "mixins";
46
@import "helpers";
5-
@import "variables";
67
@import "buttons";
78
@import "labels";
89
@import "badge";

app/styles/form-elements/_inputs.scss

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
.form-label {
44
display: inline-block;
55
min-width: 75px;
6-
font-size: 11px;
7-
line-height: 26px;
8-
margin: 0 5px 0 0;
6+
font-size: 1.1rem;
7+
line-height: 2.6rem;
8+
margin: 0 0.5rem 0 0;
99
color: #747474;
1010
text-transform: uppercase;
1111
font-weight: 500;
1212
}
1313

1414
.sd-line-input {
1515
margin: 0 0 1.8em 0;
16-
padding-top: 14px;
16+
padding-top: 1.4rem;
1717
position: relative;
1818
input, textarea {
1919
&.sd-line-input__input {
@@ -23,8 +23,8 @@
2323
border-bottom: 1px solid rgba(0,0,0,0.15)!important;
2424
background-color: transparent;
2525
padding: 0;
26-
font-size: 14px;
27-
height:24px;
26+
font-size: 1.4rem;
27+
height:2.4rem;
2828
transition: border linear 0.2s, box-shadow linear 0.2s;
2929
&:hover {
3030
border-color: rgba(0,0,0,0.3) !important;
@@ -43,19 +43,19 @@
4343
.sd-line-input__label {
4444
position: absolute;
4545
display: inline-block;
46-
font-size: 11px;
46+
font-size: 1.1rem;
4747
line-height: 100%;
4848
margin: 0;
49-
color: #747474;
49+
color: $grayText;
5050
text-transform: uppercase;
5151
font-weight: 500;
5252
top:0;
5353
}
5454
.sd-line-input__hint,
5555
.sd-line-input__message,
5656
.sd-line-input__char-count {
57-
font-size: 12px;
58-
line-height: 14px;
57+
font-size: 1.2rem;
58+
line-height: 1.4rem;
5959
transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2);
6060
color: grey;
6161
font-weight: 300;
@@ -65,20 +65,20 @@
6565
position: absolute;
6666
left: 1px;
6767
right: auto;
68-
top: 42px;
69-
padding-right: 55px;
68+
top: 4.2rem;
69+
padding-right: 5.5rem;
7070
}
7171
.sd-line-input__char-count {
7272
position: absolute;
7373
right: 1px;
7474
left: auto;
75-
top: 43px;
76-
font-size: 11px;
75+
top: 4.3rem;
76+
font-size: 1.1rem;
7777
font-weight: 400;
7878
font-style: italic;
7979
}
8080
.sd-line-input__message {
81-
padding-top: 4px;
81+
padding-top: 0.4rem;
8282
}
8383
&.sd-line-input--invalid {
8484
.sd-line-input__label,

app/styles/variables/_colors.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $black: #000;
44
$grayDarker: #222;
55
$grayDark: #333;
66
$gray: #666;
7+
$grayText: #747474;
78
$grayLight: #999;
89
$grayLighter: #F5F5F5;
910
$white: #fff;

app/styles/variables/_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
$baseFontSize: 13px;
55
$baseFontFamily: "Roboto", Helvetica, Arial, sans-serif;
6-
$baseLineHeight: 18px;
6+
$baseLineHeight: 140%;
77
$altFontFamily: Georgia, "Times New Roman", Times, serif;
88

99
$headingsFontFamily: inherit; // empty to use BS default, $baseFontFamily

0 commit comments

Comments
 (0)