Skip to content

Commit

Permalink
Merge pull request #131 from unumux/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Keale2 authored Sep 11, 2018
2 parents 4ea76e8 + 0929428 commit a7e8544
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 13,620 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ There are 3 groups of variables:
### Recommended SCSS Directory Structure For Your Project
We recommend you setup your project's styling folders and files using this project [pattern](https://github.com/unumux/standard-project-structure).
We recommend you setup your project's styling folders and files using this project [pattern](https://github.com/unumux/willow-testing-site).
---
Expand Down
3 changes: 1 addition & 2 deletions components/page-container/styles/_dependencies.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@import "default-variables";
@import "../../../global/vendors/bootstrap";
@import "default-variables";
1 change: 0 additions & 1 deletion global/base-elements/_default-variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../variables/constants/fonts";
@import "../variables/constants/spacing";
@import "../variables/constants/maps/text-styles";

Expand Down
10 changes: 3 additions & 7 deletions global/variables/constants/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
@import "../../functions/line-height";

@import url('https://fonts.googleapis.com/css?family=Oswald:300,400');
@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600");
@import url("https://fonts.googleapis.com/css?family=Source+Code+Pro");

$font-family-primary: "Oswald", "helvetica", "arial", "sans-serif" !default;
$font-family-secondary: "Open Sans", "helvetica", "arial", "sans-serif" !default;
$font-family-monospace: "Source Code Pro", monospace !default;
$font-family-primary: "arial", "sans-serif" !default;
$font-family-secondary: "arial", "sans-serif" !default;
$font-family-monospace: monospace !default;

$font-ratio: 1.2;

Expand Down
Loading

0 comments on commit a7e8544

Please sign in to comment.