jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update-meteor-1.4' into update-meteor-1.4-polymer-1.0

Browse Source
This commit is contained in:
Stefan Zermatten
2016-12-20 13:57:56 +02:00
parent 7af2e80ec1 b1fdaa726c
commit 07cb3859db
17 changed files with 222 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpg-docs/.meteor/.finished-upgraders
View File

@@ -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

41
rpg-docs/.meteor/packages
View File

@@ -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

2
rpg-docs/.meteor/release
View File

@@ -1 +1 @@
METEOR@1.3.2.4
METEOR@1.4.2.3

177
rpg-docs/.meteor/versions
View File

@@ -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

4
rpg-docs/bower.json
View File

@@ -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"
}
}

12
rpg-docs/client/style/cards.scss
View File

@@ -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;

1
rpg-docs/client/style/main.scss
View File

@@ -1,4 +1,3 @@
@import "{wolves:bourbon}/bourbon";
@import "colors";
//apply a natural box layout model to all elements

2
rpg-docs/client/views/layout/layout.html
View File

@@ -1,5 +1,5 @@
<template name="layout">
<core-drawer-panel class="layout" responsiveWidth="905px">
<core-drawer-panel class="layout" responsiveWidth="905px" disableSwipe>
<core-header-panel drawer navigation flex mode="seamed" class="white">
<div id="accountSummary">
{{#if currentUser}}

43
rpg-docs/client/views/layout/polymer.imports.html Normal file
View File

@@ -0,0 +1,43 @@
<!--core components-->
<link rel="import" href="/components/core-animated-pages/core-animated-pages.html">
<link rel="import" href="/components/core-animated-pages/transitions/cross-fade.html">
<link rel="import" href="/components/core-animated-pages/transitions/hero-transition.html">
<link rel="import" href="/components/core-animated-pages/transitions/slide-from-right.html">
<link rel="import" href="/components/core-icons/av-icons.html">
<link rel="import" href="/components/core-icons/core-icons.html">
<link rel="import" href="/components/core-icons/editor-icons.html">
<link rel="import" href="/components/core-icons/image-icons.html">
<link rel="import" href="/components/core-icons/social-icons.html">
<link rel="import" href="/components/core-image/core-image.html">
<link rel="import" href="/components/core-item/core-item.html">
<link rel="import" href="/components/core-menu/core-menu.html">
<link rel="import" href="/components/core-scaffold/core-scaffold.html">
<link rel="import" href="/components/core-transition/core-transition.html">
<!--paper components-->
<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="/components/paper-checkbox/paper-checkbox.html">
<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
<link rel="import" href="/components/paper-dialog/paper-dialog.html">
<link rel="import" href="/components/paper-dialog/paper-dialog-transition.html">
<link rel="import" href="/components/paper-fab/paper-fab.html">
<link rel="import" href="/components/paper-fab-menu/paper-fab-menu.html">
<link rel="import" href="/components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="/components/paper-input/paper-autogrow-textarea.html">
<link rel="import" href="/components/paper-input/paper-input.html">
<link rel="import" href="/components/paper-input/paper-input-decorator.html">
<link rel="import" href="/components/paper-item/paper-item.html">
<link rel="import" href="/components/paper-menu-button/paper-menu-button.html">
<link rel="import" href="/components/paper-radio-button/paper-radio-button.html">
<link rel="import" href="/components/paper-radio-group/paper-radio-group.html">
<link rel="import" href="/components/paper-shadow/paper-shadow.html">
<link rel="import" href="/components/paper-spinner/paper-spinner.html">
<link rel="import" href="/components/paper-slider/paper-slider.html">
<link rel="import" href="/components/paper-tabs/paper-tabs.html">
<link rel="import" href="/components/paper-toast/paper-toast.html">
<link rel="import" href="/components/paper-toggle-button/paper-toggle-button.html">
<!--custom components-->
<link rel="import" href="/custom_components/paper-dropdown-menu/paper-dropdown-menu.html">
<link rel="import" href="/custom_components/paper-dropdown/paper-dropdown.html">
<link rel="import" href="/custom_components/paper-diff-slider/paper-diff-slider.html">

24
rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss
View File

@@ -1,5 +1,3 @@
@import "{wolves:bourbon}/bourbon";
.mini-holder {
position: absolute;
padding: 4px;
@@ -9,37 +7,37 @@
pointer-events: none;
flex-direction: column-reverse !important;
core-tooltip{
@include transform(scale(0));
@include transition-property(transform);
@include transition-duration(0.3s);
@include transition-timing-function(ease-in-out);
transform: scale(0);
transition-property: transform;
transition-duration: 0.3s;
transition-timing-function: ease-in-out;
margin: 4px;
}
&.active {
pointer-events: auto;
core-tooltip{
@include transform(scale(1));
transform: scale(1);
}
core-tooltip:nth-child(2){
@include transition-delay(0.1s);
transition-delay: 0.1s;
}
core-tooltip:nth-child(3){
@include transition-delay(0.2s);
transition-delay: 0.2s;
}
core-tooltip:nth-child(4){
@include transition-delay(0.3s);
transition-delay: 0.3s;
}
core-tooltip:nth-child(5){
@include transition-delay(0.4s);
transition-delay: 0.4s;
}
}
}
.expand-menu {
&::shadow core-icon {
@include transition(transform 0.3s ease-in-out);
transition: transform 0.3s ease-in-out;
}
&.active::shadow core-icon{
@include transform(rotate(405deg));
transform: rotate(405deg);
}
}

29
rpg-docs/config.vulcanize
View File

@@ -2,6 +2,7 @@
"polyfill": "/components/webcomponentsjs/webcomponents.min.js",
"useShadowDom": true,
"imports": [
<<<<<<< HEAD
"/components/neon-animated-pages/neon-animated-pages.html",
"/components/neon-animated-pages/animations/cross-fade.html",
"/components/neon-animated-pages/animations/hero-animation.html",
@@ -15,6 +16,27 @@
"/components/iron-item/iron-item.html",
"/components/iron-menu/iron-menu.html",
"/components/app-layout/app-layout.html",
=======
"/custom_components/paper-dropdown/paper-dropdown.html",
"/custom_components/paper-dropdown-menu/paper-dropdown-menu.html",
"/custom_components/paper-diff-slider/paper-diff-slider.html",
"/custom_components/swipe-detect/swipe-detect.html",
"/components/core-animated-pages/core-animated-pages.html",
"/components/core-animated-pages/transitions/cross-fade.html",
"/components/core-animated-pages/transitions/hero-transition.html",
"/components/core-animated-pages/transitions/slide-from-right.html",
"/components/core-icons/av-icons.html",
"/components/core-icons/core-icons.html",
"/components/core-icons/editor-icons.html",
"/components/core-icons/image-icons.html",
"/components/core-icons/social-icons.html",
"/components/core-image/core-image.html",
"/components/core-item/core-item.html",
"/components/core-menu/core-menu.html",
"/components/core-scaffold/core-scaffold.html",
"/components/core-transition/core-transition.html",
>>>>>>> update-meteor-1.4
"/components/paper-button/paper-button.html",
"/components/paper-checkbox/paper-checkbox.html",
@@ -36,11 +58,6 @@
"/components/paper-slider/paper-slider.html",
"/components/paper-tabs/paper-tabs.html",
"/components/paper-toast/paper-toast.html",
"/components/paper-toggle-button/paper-toggle-button.html",
"/custom_components/paper-dropdown/paper-dropdown.html",
"/custom_components/paper-dropdown-menu/paper-dropdown-menu.html",
"/custom_components/paper-diff-slider/paper-diff-slider.html",
"/custom_components/swipe-detect/swipe-detect.html"
"/components/paper-toggle-button/paper-toggle-button.html"
]
}

1
rpg-docs/package.json
View File

@@ -11,6 +11,7 @@
},
"author": "Stefan Zermatten",
"dependencies": {
"babel-runtime": "^6.18.0",
"bower": "^1.7.9"
}
}

7
rpg-docs/private/changeLogs/changeLogs.js
View File

@@ -319,3 +319,10 @@ ChangeLogs.insert({
"Fixed invisible dropdown boxes in Chrome 52",
],
});
ChangeLogs.insert({
version: "0.9.4",
changes: [
"Fixed app not working on iOS 10",
],
});

15
rpg-docs/public/custom_components/paper-dropdown/paper-dropdown-transition.html
View File

@@ -18,9 +18,9 @@ enable the optional list cascade transition.
@extends core-transition-css
@status unstable
-->
<link href="../polymer/polymer.html" rel="import">
<link href="../core-transition/core-transition-css.html" rel="import">
<link href="../core-animation/web-animations.html" rel="import">
<link href="../../components/polymer/polymer.html" rel="import">
<link href="../../components/core-transition/core-transition-css.html" rel="import">
<link href="../../components/core-animation/web-animations.html" rel="import">
<polymer-element name="paper-dropdown-transition" extends="core-transition-css">
<template>
@@ -41,7 +41,7 @@ enable the optional list cascade transition.
* @type number
* @default 500
*/
duration: 500
duration: 350
},
@@ -160,9 +160,9 @@ enable the optional list cascade transition.
}));
}
var group = new AnimationGroup(anims, {
var group = new AnimationGroup(anims/*, {
easing: 'cubic-bezier(0.4, 0, 0.2, 1)'
});
}*/);
this.player = document.timeline.play(group);
this.player.onfinish = function() {
this.fire('core-transitionend', this, node);
@@ -172,9 +172,8 @@ enable the optional list cascade transition.
this.fire('core-transitionend', this, node);
}
},
});
</script>
</polymer-element>
<paper-dropdown-transition id="paper-dropdown-transition"></paper-dropdown-transition>
<paper-dropdown-transition id="paper-dropdown-transition"></paper-dropdown-transition>

5
rpg-docs/public/custom_components/paper-dropdown/paper-dropdown.html
View File

@@ -40,6 +40,8 @@ Style the background color of the dropdown with these selectors:
<link href="../../components/core-dropdown/core-dropdown.html" rel="import">
<link href="../../components/paper-shadow/paper-shadow.html" rel="import">
<!--<link href="paper-dropdown-transition.html" rel="import">-->
<style shim-shadowdom>
html /deep/ paper-dropdown {
position: absolute;
@@ -99,6 +101,9 @@ Style the background color of the dropdown with these selectors:
<script>
Polymer({
publish: { //Chrome 52 breaks this
// transition: 'paper-dropdown-transition'
},
ready: function() {
this.super();
this.sizingTarget = this.$.scroller;

5
rpg-docs/scss.json
View File

@@ -1,5 +0,0 @@
{
"includePaths": [
".meteor/local/build/programs/server/assets/packages/wolves_bourbon"
]
}

1
rpg-docs/server/kadira.js
View File

@@ -1 +0,0 @@
Kadira.connect("erzTBaxBGjsd28SDt", "1c100582-dfce-4378-884f-e133e347b7b3");