diff --git a/rpg-docs/.meteor/.finished-upgraders b/rpg-docs/.meteor/.finished-upgraders index dacc2c0d..aa607041 100644 --- a/rpg-docs/.meteor/.finished-upgraders +++ b/rpg-docs/.meteor/.finished-upgraders @@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2 1.2.0-cordova-changes 1.2.0-breaking-changes 1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index 26c3e4bf..b23d4b1f 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -5,12 +5,12 @@ thaum:vulcanize iron:router -accounts-password -accounts-ui -random +accounts-password@1.3.3 +accounts-ui@1.1.9 +random@1.0.10 dburles:collection-helpers -reactive-var -underscore +reactive-var@1.0.11 +underscore@1.0.10 aldeed:collection2 matb33:collection-hooks zimme:collection-softremovable @@ -19,29 +19,28 @@ dburles:mongo-collection-instances percolate:migrations ecwyne:mathjs useraccounts:polymer -accounts-google +accounts-google@1.0.11 splendido:accounts-meld -email +email@1.1.18 meteorhacks:subs-manager -meteorhacks:kadira chuangbo:marked reywood:iron-router-ga -meteor-base -mobile-experience -mongo +meteor-base@1.0.4 +mobile-experience@1.0.4 +mongo@1.1.14 blaze-html-templates -session -jquery -tracker -logging -reload -ejson +session@1.1.7 +jquery@1.11.10 +tracker@1.1.1 +logging@1.1.16 +reload@1.1.11 +ejson@1.0.13 spacebars -check +check@1.2.4 useraccounts:iron-routing wizonesolutions:canonical meteorhacks:fast-render +standard-minifier-js@1.2.1 +shell-server fourseven:scss -wolves:bourbon -standard-minifier-css -standard-minifier-js +seba:minifiers-autoprefixer diff --git a/rpg-docs/.meteor/release b/rpg-docs/.meteor/release index 940e0b5d..61f6c675 100644 --- a/rpg-docs/.meteor/release +++ b/rpg-docs/.meteor/release @@ -1 +1 @@ -METEOR@1.3.2.4 +METEOR@1.4.2.3 diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 95763ae3..89bc10f1 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -1,115 +1,116 @@ -accounts-base@1.2.7 -accounts-google@1.0.9 -accounts-oauth@1.1.12 -accounts-password@1.1.8 +accounts-base@1.2.14 +accounts-google@1.0.11 +accounts-oauth@1.1.15 +accounts-password@1.3.3 accounts-ui@1.1.9 accounts-ui-unstyled@1.1.12 -aldeed:collection2@2.9.1 -aldeed:collection2-core@1.1.1 -aldeed:schema-deny@1.0.1 -aldeed:schema-index@1.0.1 +aldeed:collection2@2.10.0 +aldeed:collection2-core@1.2.0 +aldeed:schema-deny@1.1.0 +aldeed:schema-index@1.1.1 aldeed:simple-schema@1.5.3 -allow-deny@1.0.4 -autoupdate@1.2.9 -babel-compiler@6.6.4 -babel-runtime@0.1.8 -base64@1.0.8 -binary-heap@1.0.8 -blaze@2.1.7 -blaze-html-templates@1.0.4 -blaze-tools@1.0.8 -boilerplate-generator@1.0.8 -caching-compiler@1.0.4 -caching-html-compiler@1.0.6 -callback-hook@1.0.8 -check@1.2.1 +allow-deny@1.0.5 +autoupdate@1.2.11 +babel-compiler@6.13.0 +babel-runtime@1.0.1 +base64@1.0.10 +binary-heap@1.0.10 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.11 +caching-compiler@1.1.9 +caching-html-compiler@1.0.7 +callback-hook@1.0.10 +check@1.2.4 chuangbo:cookie@1.1.0 chuangbo:marked@0.3.5_1 coffeescript@1.0.17 -dburles:collection-helpers@1.0.4 +dburles:collection-helpers@1.1.0 dburles:mongo-collection-instances@0.3.5 ddp@1.2.5 -ddp-client@1.2.7 -ddp-common@1.2.5 -ddp-rate-limiter@1.0.4 -ddp-server@1.2.6 +ddp-client@1.2.9 +ddp-common@1.2.8 +ddp-rate-limiter@1.0.6 +ddp-server@1.2.10 deps@1.0.12 -diff-sequence@1.0.5 -ecmascript@0.4.3 -ecmascript-runtime@0.2.10 +diff-sequence@1.0.7 +ecmascript@0.6.1 +ecmascript-runtime@0.3.15 ecwyne:mathjs@0.25.0 -ejson@1.0.11 -email@1.0.12 -fastclick@1.0.11 -fourseven:scss@3.4.3 -geojson-utils@1.0.8 -google@1.1.11 +ejson@1.0.13 +email@1.1.18 +fastclick@1.0.13 +fourseven:scss@3.13.0 +geojson-utils@1.0.10 +google@1.1.15 hot-code-push@1.0.4 -html-tools@1.0.9 -htmljs@1.0.9 -http@1.1.5 -id-map@1.0.7 +html-tools@1.0.11 +htmljs@1.0.11 +http@1.2.10 +id-map@1.0.9 iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 iron:location@1.0.11 iron:middleware-stack@1.1.0 -iron:router@1.0.12 +iron:router@1.0.13 iron:url@1.0.11 -jquery@1.11.8 +jquery@1.11.10 lai:collection-extensions@0.2.1_1 -launch-screen@1.0.11 -less@2.6.0 +launch-screen@1.0.12 +less@2.6.5 livedata@1.0.18 -localstorage@1.0.9 -logging@1.0.12 -matb33:collection-hooks@0.8.1 +localstorage@1.0.12 +logging@1.1.16 +matb33:collection-hooks@0.8.4 mdg:validation-error@0.2.0 -meteor@1.1.14 +meteor@1.6.0 meteor-base@1.0.4 -meteorhacks:fast-render@2.14.0 +meteorhacks:fast-render@2.16.0 meteorhacks:inject-data@2.0.0 -meteorhacks:kadira@2.28.7 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 -minifier-css@1.1.11 -minifier-js@1.1.11 -minimongo@1.0.16 +minifier-css@1.1.13 +minifier-js@1.2.15 +minimongo@1.0.19 mobile-experience@1.0.4 -mobile-status-bar@1.0.12 -modules@0.6.1 -modules-runtime@0.6.3 -momentjs:moment@2.13.1 -mongo@1.1.7 -mongo-id@1.0.4 -mongo-livedata@1.0.12 -npm-bcrypt@0.8.5 -npm-mongo@1.4.43 -oauth@1.1.10 -oauth2@1.1.9 -observe-sequence@1.0.11 -ordered-dict@1.0.7 +mobile-status-bar@1.0.13 +modules@0.7.7 +modules-runtime@0.7.7 +momentjs:moment@2.17.1 +mongo@1.1.14 +mongo-id@1.0.6 +npm-bcrypt@0.9.2 +npm-mongo@2.2.11_2 +oauth@1.1.12 +oauth2@1.1.11 +observe-sequence@1.0.14 +ordered-dict@1.0.9 percolate:migrations@0.9.8 -promise@0.6.7 +promise@0.8.8 raix:eventemitter@0.1.3 -random@1.0.9 -rate-limit@1.0.4 -reactive-dict@1.1.7 -reactive-var@1.0.9 -reload@1.1.8 -retry@1.0.7 +random@1.0.10 +rate-limit@1.0.6 +reactive-dict@1.1.8 +reactive-var@1.0.11 +reload@1.1.11 +retry@1.0.9 reywood:iron-router-ga@0.7.1 -routepolicy@1.0.10 -service-configuration@1.0.9 -session@1.1.5 -sha@1.0.7 -softwarerero:accounts-t9n@1.3.4 -spacebars@1.0.11 -spacebars-compiler@1.0.11 +routepolicy@1.0.12 +seba:minifiers-autoprefixer@1.0.1 +service-configuration@1.0.11 +session@1.1.7 +sha@1.0.9 +shell-server@0.2.1 +softwarerero:accounts-t9n@1.3.6 +spacebars@1.0.13 +spacebars-compiler@1.0.13 splendido:accounts-emails-field@1.2.0 splendido:accounts-meld@1.3.1 +<<<<<<< HEAD srp@1.0.8 standard-minifier-css@1.0.6 standard-minifier-js@1.0.6 @@ -120,12 +121,24 @@ tracker@1.0.13 ui@1.0.11 underscore@1.0.8 url@1.0.9 +======= +srp@1.0.10 +standard-minifier-js@1.2.1 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 +thaum:vulcanize@0.0.5 +tracker@1.1.1 +ui@1.0.12 +underscore@1.0.10 +url@1.0.11 +>>>>>>> update-meteor-1.4 useraccounts:core@1.14.2 useraccounts:iron-routing@1.14.2 useraccounts:polymer@1.12.3 -webapp@1.2.8 +webapp@1.3.12 webapp-hashing@1.0.9 wizonesolutions:canonical@0.0.5 -wolves:bourbon@3.1.0 zimme:collection-behaviours@1.1.3 zimme:collection-softremovable@1.0.5 diff --git a/rpg-docs/bower.json b/rpg-docs/bower.json index 426d3a1b..73e21394 100644 --- a/rpg-docs/bower.json +++ b/rpg-docs/bower.json @@ -21,8 +21,6 @@ "app-layout": "PolymerElements/app-layout#~0.10.4" }, "resolutions": { - "core-component-page": "^0.5.0", - "polymer": "^0.5.0", - "webcomponentsjs": "^0.5.0" + "webcomponentsjs": "0.7.23" } } diff --git a/rpg-docs/client/style/cards.scss b/rpg-docs/client/style/cards.scss index f0fa43b1..56e345d3 100644 --- a/rpg-docs/client/style/cards.scss +++ b/rpg-docs/client/style/cards.scss @@ -1,18 +1,16 @@ -@import "{wolves:bourbon}/bourbon"; - $thickColumnWidth: 304px; $thinColumnWidth: 240px; //Column layout .column-container { - @include column-fill(balance); - @include column-gap(0px); - @include column-width($thickColumnWidth); + column-fill: balance; + column-gap: 0px; + column-width: $thickColumnWidth; padding: 4px; &.thin-columns { - @include column-count(4); - @include column-width($thinColumnWidth); + column-count: 4; + column-width: $thinColumnWidth; } & > div { padding: 4px; diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index 376e4eb9..45b03193 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -1,4 +1,3 @@ -@import "{wolves:bourbon}/bourbon"; @import "colors"; //apply a natural box layout model to all elements diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index 15e32fd7..d966d54a 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -1,5 +1,5 @@