From 6fe368cde734db1dbedf0afb294181d9b96877fd Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 3 May 2016 08:12:44 +0200 Subject: [PATCH] Updated bourbon and scss --- rpg-docs/.meteor/packages | 4 ++-- rpg-docs/.meteor/versions | 4 ++-- rpg-docs/client/style/cards.scss | 2 +- rpg-docs/client/style/main.scss | 2 +- rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss | 3 +-- rpg-docs/packages/meteor-vulcanize/.gitignore | 1 + 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 rpg-docs/packages/meteor-vulcanize/.gitignore diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index a2a666f4..c7715c09 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -22,8 +22,6 @@ useraccounts:polymer accounts-google splendido:accounts-meld email -fourseven:scss@2.1.1 -wolves:bourbon meteorhacks:subs-manager meteorhacks:kadira chuangbo:marked @@ -44,3 +42,5 @@ check useraccounts:iron-routing wizonesolutions:canonical meteorhacks:fast-render +fourseven:scss +wolves:bourbon diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 98c14e1e..37065350 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -37,7 +37,7 @@ ecwyne:mathjs@0.25.0 ejson@1.0.7 email@1.0.7 fastclick@1.0.7 -fourseven:scss@2.1.1 +fourseven:scss@3.4.3 geojson-utils@1.0.4 google@1.1.6 hot-code-push@1.0.0 @@ -116,6 +116,6 @@ useraccounts:polymer@1.12.3 webapp@1.2.2 webapp-hashing@1.0.5 wizonesolutions:canonical@0.0.5 -wolves:bourbon@1.2.0 +wolves:bourbon@3.1.0 zimme:collection-behaviours@1.1.3 zimme:collection-softremovable@1.0.4 diff --git a/rpg-docs/client/style/cards.scss b/rpg-docs/client/style/cards.scss index 1b0503b3..f0fa43b1 100644 --- a/rpg-docs/client/style/cards.scss +++ b/rpg-docs/client/style/cards.scss @@ -1,4 +1,4 @@ -@import "bourbon/bourbon"; +@import "{wolves:bourbon}/bourbon"; $thickColumnWidth: 304px; $thinColumnWidth: 240px; diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index a9cbbe7c..376e4eb9 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -1,4 +1,4 @@ -@import "bourbon/bourbon"; +@import "{wolves:bourbon}/bourbon"; @import "colors"; //apply a natural box layout model to all elements diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss index d068f0e3..db5ee47c 100644 --- a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss +++ b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss @@ -1,4 +1,4 @@ -@import "bourbon/bourbon"; +@import "{wolves:bourbon}/bourbon"; .mini-holder { position: absolute; @@ -43,4 +43,3 @@ @include transform(rotate(405deg)); } } - diff --git a/rpg-docs/packages/meteor-vulcanize/.gitignore b/rpg-docs/packages/meteor-vulcanize/.gitignore new file mode 100644 index 00000000..918ef5d7 --- /dev/null +++ b/rpg-docs/packages/meteor-vulcanize/.gitignore @@ -0,0 +1 @@ +.npm