Skip to content

Commit

Permalink
Rename middle/medium cases without suffix, add anchor tag reset
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Litwin committed Apr 15, 2016
1 parent 813a75a commit 0505bdd
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/styles/_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ input[type="submit"]::-moz-focus-inner,
input[type="reset"]::-moz-focus-inner {
padding: 0 !important;
border: 0 none !important;
}
}
6 changes: 3 additions & 3 deletions src/styles/_tc-includes.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import 'tc-mixins';
@import 'tc-typography';
@import 'colors';
@import 'mixins';
@import 'typography';
@import 'colors';
11 changes: 9 additions & 2 deletions src/styles/_tc-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@ html {
box-sizing: inherit;
}

//TODO: add necessary body styling for tc app
body {
min-height: 100%;
}
}

a {
text-decoration: none;

&:visited, &:hover, &:active {
color: inherit;
}
}
50 changes: 25 additions & 25 deletions src/styles/_tc-mixins.scss → src/styles/mixins.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
// FONTS

@mixin roboto-regular {
font-family: 'Roboto', Arial, Helvetica, sans-serif;
@mixin roboto {
font-family: 'Roboto', Helvetica, Arial, sans-serif;
font-weight: 400;
}

@mixin roboto-medium {
font-family: 'Roboto', Arial, Helvetica, sans-serif;
font-family: 'Roboto', Helvetica, Arial, sans-serif;
font-weight: 500;
}

@mixin proxima-nova-thin {
font-family: 'Proxima-Nova', Arial, Helvetica, sans-serif;
font-weight: 100;
font-family: 'Proxima-Nova', Helvetica, Arial, sans-serif;
font-weight: 200;
}

@mixin proxima-nova-light {
font-family: 'Proxima-Nova', Arial, Helvetica, sans-serif;
font-family: 'Proxima-Nova', Helvetica, Arial, sans-serif;
font-weight: 300;
}

@mixin proxima-nova-regular {
font-family: 'Proxima-Nova', Arial, Helvetica, sans-serif;
@mixin proxima-nova {
font-family: 'Proxima-Nova', Helvetica, Arial, sans-serif;
font-weight: 400;
}

@mixin proxima-nova-semi-bold {
font-family: 'Proxima-Nova', Arial, Helvetica, sans-serif;
font-family: 'Proxima-Nova', Helvetica, Arial, sans-serif;
font-weight: 600;
}

Expand All @@ -45,59 +45,59 @@
}

@mixin tc-label-small {
@include roboto-regular
@include roboto
font-size: 12px;
line-height: 15px;
}

@mixin tc-label-extra-small {
@include roboto-regular;
@include roboto;
font-size: 11px;
line-height: 15px;
}

//BODY TYPOGRAPHY SIZES

@mixin tc-body {
@include proxima-nova-regular;
@include proxima-nova;
font-size: 16px;
line-height: 25px;
}

@mixin tc-body-large {
@include proxima-nova-regular;
@include proxima-nova;
font-size: 20px;
line-height: 25px;
}

@mixin tc-body-small {
@include proxima-nova-regular;
@include proxima-nova;
font-size: 14px;
line-height: 20px;
}

@mixin tc-body-extra-small {
@include proxima-nova-regular;
@include proxima-nova;
font-size: 12px;
line-height: 20px;
}

//HEADING TYPOGRAPHY SIZES

@mixin tc-heading {
@include proxima-nova-regular;
font-size: 28px;
line-height: 35px;
}

@mixin tc-heading-large {
@mixin tc-heading-extra-large {
@include proxima-nova-light;
font-size: 42px;
line-height: 50px;
}

@mixin tc-heading-medium {
@include proxima-nova-regular;
@mixin tc-heading-large {
@include proxima-nova;
font-size: 28px;
line-height: 35px;
}

@mixin tc-heading {
@include proxima-nova;
font-size: 20px;
line-height: 30px;
}
Expand All @@ -112,4 +112,4 @@
@include proxima-nova-semi-bold;
font-size: 14px;
line-height: 25px;
}
}
8 changes: 4 additions & 4 deletions src/styles/_tc-typography.scss → src/styles/typography.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
h1 {
@include tc-heading-large;
@include tc-heading-extra-large;
}

h2 {
@include tc-heading;
@include tc-heading-large;
}

h3 {
@include tc-heading-medium;
@include tc-heading;
}

h4 {
Expand Down Expand Up @@ -48,4 +48,4 @@ label {
&.extra-small {
@include tc-label-extra-small;
}
}
}

0 comments on commit 0505bdd

Please sign in to comment.