Skip to content
This repository has been archived by the owner on Jan 17, 2021. It is now read-only.

Improve compatibility with projects using multiple style languages #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Node
node_modules/
npm-debug.log

# OS specific trash
.DS_Store
._.DS_Store
Thumbs.db

# Sass-specific
.sass-cache
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'BoldItalic', 700, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'Bold', 700, normal);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'LightItalic', 300, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'Light', 300, normal);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'RegularItalic', 400, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-condensed', 'Roboto-Condensed', 'Regular', 400, normal);
12 changes: 6 additions & 6 deletions css/roboto-condensed/less/roboto-condensed-fontface.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "roboto-condensed-fontface-regular";
@import "roboto-condensed-fontface-regular-italic";
@import "roboto-condensed-fontface-light";
@import "roboto-condensed-fontface-light-italic";
@import "roboto-condensed-fontface-bold";
@import "roboto-condensed-fontface-bold-italic";
@import "roboto-condensed-fontface-regular.less";
@import "roboto-condensed-fontface-regular-italic.less";
@import "roboto-condensed-fontface-light.less";
@import "roboto-condensed-fontface-light-italic.less";
@import "roboto-condensed-fontface-bold.less";
@import "roboto-condensed-fontface-bold-italic.less";
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'BoldItalic', 700, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'Bold', 700, normal);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'LightItalic', 300, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'Light', 300, normal);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'RegularItalic', 400, italic);
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-condensed', 'Roboto-Condensed', 'Regular', 400, normal);
12 changes: 6 additions & 6 deletions css/roboto-condensed/sass/roboto-condensed-fontface.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "roboto-condensed-fontface-regular";
@import "roboto-condensed-fontface-regular-italic";
@import "roboto-condensed-fontface-light";
@import "roboto-condensed-fontface-light-italic";
@import "roboto-condensed-fontface-bold";
@import "roboto-condensed-fontface-bold-italic";
@import "roboto-condensed-fontface-regular.scss";
@import "roboto-condensed-fontface-regular-italic.scss";
@import "roboto-condensed-fontface-light.scss";
@import "roboto-condensed-fontface-light-italic.scss";
@import "roboto-condensed-fontface-bold.scss";
@import "roboto-condensed-fontface-bold-italic.scss";
2 changes: 1 addition & 1 deletion css/roboto-slab/less/roboto-slab-fontface-bold.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-slab', 'Roboto-Slab', 'Bold', 700, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/less/roboto-slab-fontface-light.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-slab', 'Roboto-Slab', 'Light', 300, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/less/roboto-slab-fontface-regular.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-slab', 'Roboto-Slab', 'Regular', 400, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/less/roboto-slab-fontface-thin.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto-slab', 'Roboto-Slab', 'Thin', 100, normal);
8 changes: 4 additions & 4 deletions css/roboto-slab/less/roboto-slab-fontface.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "roboto-slab-fontface-regular";
@import "roboto-slab-fontface-light";
@import "roboto-slab-fontface-thin";
@import "roboto-slab-fontface-bold";
@import "roboto-slab-fontface-regular.less";
@import "roboto-slab-fontface-light.less";
@import "roboto-slab-fontface-thin.less";
@import "roboto-slab-fontface-bold.less";
2 changes: 1 addition & 1 deletion css/roboto-slab/sass/roboto-slab-fontface-bold.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-slab', 'Roboto-Slab', 'Bold', 700, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/sass/roboto-slab-fontface-light.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-slab', 'Roboto-Slab', 'Light', 300, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/sass/roboto-slab-fontface-regular.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-slab', 'Roboto-Slab', 'Regular', 400, normal);
2 changes: 1 addition & 1 deletion css/roboto-slab/sass/roboto-slab-fontface-thin.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto-slab', 'Roboto-Slab', 'Thin', 100, normal);
8 changes: 4 additions & 4 deletions css/roboto-slab/sass/roboto-slab-fontface.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "roboto-slab-fontface-regular";
@import "roboto-slab-fontface-light";
@import "roboto-slab-fontface-thin";
@import "roboto-slab-fontface-bold";
@import "roboto-slab-fontface-regular.scss";
@import "roboto-slab-fontface-light.scss";
@import "roboto-slab-fontface-thin.scss";
@import "roboto-slab-fontface-bold.scss";
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-black-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'BlackItalic', 900, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-black.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Black', 900, normal);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-bold-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'BoldItalic', 700, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-bold.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Bold', 700, normal);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-light-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'LightItalic', 300, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-light.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Light', 300, normal);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-medium-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'MediumItalic', 500, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-medium.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Medium', 500, normal);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-regular-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'RegularItalic', 400, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-regular.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Regular', 400, normal);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-thin-italic.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'ThinItalic', 100, italic);
2 changes: 1 addition & 1 deletion css/roboto/less/roboto-fontface-thin.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.less";

.roboto-font('roboto', 'Roboto', 'Thin', 100, normal);
24 changes: 12 additions & 12 deletions css/roboto/less/roboto-fontface.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import "roboto-fontface-regular";
@import "roboto-fontface-regular-italic";
@import "roboto-fontface-light";
@import "roboto-fontface-light-italic";
@import "roboto-fontface-thin";
@import "roboto-fontface-thin-italic";
@import "roboto-fontface-medium";
@import "roboto-fontface-medium-italic";
@import "roboto-fontface-bold";
@import "roboto-fontface-bold-italic";
@import "roboto-fontface-black";
@import "roboto-fontface-black-italic";
@import "roboto-fontface-regular.less";
@import "roboto-fontface-regular-italic.less";
@import "roboto-fontface-light.less";
@import "roboto-fontface-light-italic.less";
@import "roboto-fontface-thin.less";
@import "roboto-fontface-thin-italic.less";
@import "roboto-fontface-medium.less";
@import "roboto-fontface-medium-italic.less";
@import "roboto-fontface-bold.less";
@import "roboto-fontface-bold-italic.less";
@import "roboto-fontface-black.less";
@import "roboto-fontface-black-italic.less";
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-black-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'BlackItalic', 900, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-black.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Black', 900, normal);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-bold-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'BoldItalic', 700, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-bold.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Bold', 700, normal);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-light-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'LightItalic', 300, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-light.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Light', 300, normal);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-medium-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'MediumItalic', 500, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-medium.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Medium', 500, normal);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-regular-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'RegularItalic', 400, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-regular.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Regular', 400, normal);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-thin-italic.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'ThinItalic', 100, italic);
2 changes: 1 addition & 1 deletion css/roboto/sass/roboto-fontface-thin.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../mixins";
@import "../../mixins.scss";

@include roboto-font('roboto', 'Roboto', 'Thin', 100, normal);
24 changes: 12 additions & 12 deletions css/roboto/sass/roboto-fontface.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import "roboto-fontface-regular";
@import "roboto-fontface-regular-italic";
@import "roboto-fontface-light";
@import "roboto-fontface-light-italic";
@import "roboto-fontface-thin";
@import "roboto-fontface-thin-italic";
@import "roboto-fontface-medium";
@import "roboto-fontface-medium-italic";
@import "roboto-fontface-bold";
@import "roboto-fontface-bold-italic";
@import "roboto-fontface-black";
@import "roboto-fontface-black-italic";
@import "roboto-fontface-regular.scss";
@import "roboto-fontface-regular-italic.scss";
@import "roboto-fontface-light.scss";
@import "roboto-fontface-light-italic.scss";
@import "roboto-fontface-thin.scss";
@import "roboto-fontface-thin-italic.scss";
@import "roboto-fontface-medium.scss";
@import "roboto-fontface-medium-italic.scss";
@import "roboto-fontface-bold.scss";
@import "roboto-fontface-bold-italic.scss";
@import "roboto-fontface-black.scss";
@import "roboto-fontface-black-italic.scss";