nutella_framework 0.6.17 → 0.6.18

data/framework_components/roomcast-package-creator/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^3.5.5",
     "jquery": "^2.1.4",
-    "material-ui": "^0.4.1",
+    "material-ui": "^0.5.0",
     "nutella_lib": "^0.5.10",
     "react": "^0.12.2",
     "react-tap-event-plugin": "^0.1.3"

data/framework_components/roomcast-package-creator/src/app/components/material-ui/floating-action-button_.jsx

@@ -4,7 +4,7 @@ var Classable = require('../../../../node_modules/material-ui/src/js/mixins/clas
 var EnhancedButton = require('../../../../node_modules/material-ui/src/js/enhanced-button.jsx');
 var Icon = require('../../../../node_modules/material-ui/src/js/icon.jsx');
 var Paper = require('../../../../node_modules/material-ui/src/js/paper.jsx');
-var Ripple = require('../../../../node_modules/material-ui/src/js/ripple.jsx');
+var Ripple = require('./ripple.jsx');
 
 var FloatingActionButton_ = React.createClass({
 

data/framework_components/roomcast-package-creator/src/app/components/material-ui/raised-button_.jsx

@@ -4,7 +4,7 @@ var CssEvent = require('../../../../node_modules/material-ui/src/js/utils/css-ev
 var Classable = require('../../../../node_modules/material-ui/src/js/mixins/classable');
 var EnhancedButton = require('../../../../node_modules/material-ui/src/js/enhanced-button.jsx');
 var Paper = require('../../../../node_modules/material-ui/src/js/paper.jsx');
-var Ripple = require('../../../../node_modules/material-ui/src/js/ripple.jsx');
+var Ripple = require('./ripple.jsx');
 
 var RaisedButton_ = React.createClass({
 

data/framework_components/roomcast-package-creator/src/app/components/material-ui/ripple.jsx

@@ -0,0 +1,52 @@
+var React = require('react'),
+    CssEvent = require('./utils/css-event.js'),
+    Dom = require('./utils/dom.js'),
+    Classable = require('../../../../node_modules/material-ui/src/js/mixins/classable');
+
+var Ripple = React.createClass({
+
+  mixins: [Classable],
+
+  render: function() {
+    var classes = this.getClasses('mui-ripple');
+
+    return (
+        <div className={classes} />
+    );
+  },
+
+  animate: function(e, callback) {
+    var el = this.getDOMNode(),
+        offset = Dom.offset(el.parentNode),
+        pageX = e.pageX == undefined ? e.nativeEvent.pageX : e.pageX,
+        pageY = e.pageY == undefined ? e.nativeEvent.pageY : e.pageY,
+        x = pageX - offset.left,
+        y = pageY - offset.top;
+
+    this._animateRipple(el, x, y, callback);
+  },
+
+  animateFromCenter: function(callback) {
+    var el = this.getDOMNode(),
+        x = el.parentNode.offsetWidth / 2,
+        y = el.parentNode.offsetHeight / 2;
+
+    this._animateRipple(el, x, y, callback);
+  },
+
+  _animateRipple: function(el, x, y, callback) {
+    el.style.transition = 'none';
+    el.style.top = y + 'px';
+    el.style.left = x + 'px';
+
+    Dom.addClass(el, 'mui-is-visible');
+
+    CssEvent.onAnimationEnd(el, function() {
+      Dom.removeClass(el, 'mui-is-visible');
+      if (callback) callback();
+    });
+  }
+
+});
+
+module.exports = Ripple;

data/framework_components/roomcast-package-creator/src/less/main.less

@@ -51,6 +51,7 @@ html, body {
   overflow-y: scroll;
   background-color: #e9eaed;
   -webkit-user-select: none;
+  //min-width: 1160px;
 }
 .resources-panel {
   width: 50%;
@@ -232,11 +233,14 @@ html, body {
   margin-right: 10px;
   margin-bottom: 10px;
   //line-height: 10px;
-  .mui-raised-button {
+}
+.mui-raised-button {
+  //height: 50%;
+  .mui-raised-button-label {
+    font-size: 0.75vw !important;
+  }
+  .mui-raised-button-container {
     //height: 50%;
-    .mui-raised-button-container {
-      //height: 50%;
-    }
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.6.18
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -128,7 +128,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: 0.4.24
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: 0.4.24
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -697,8 +697,8 @@ files:
 - framework_components/roomcast-main-app/package.json
 - framework_components/roomcast-main-app/roomcast-default.png
 - framework_components/roomcast-main-app/src/app/app.js
+- framework_components/roomcast-main-app/src/app/components/NutellaMixin.js
 - framework_components/roomcast-main-app/src/app/components/app/Channel.js
-- framework_components/roomcast-main-app/src/app/components/app/NutellaMixin.js
 - framework_components/roomcast-main-app/src/app/components/app/Player.js
 - framework_components/roomcast-main-app/src/app/components/app/iOSMixin.js
 - framework_components/roomcast-main-app/src/app/components/app/main.js
@@ -786,6 +786,7 @@ files:
 - framework_components/roomcast-package-creator/src/app/components/material-ui/overlay.jsx
 - framework_components/roomcast-package-creator/src/app/components/material-ui/raised-button_.jsx
 - framework_components/roomcast-package-creator/src/app/components/material-ui/right-nav.jsx
+- framework_components/roomcast-package-creator/src/app/components/material-ui/ripple.jsx
 - framework_components/roomcast-package-creator/src/app/components/material-ui/svg-icons/drop-down-arrow.jsx
 - framework_components/roomcast-package-creator/src/app/components/material-ui/svg-icons/navigation-chevron-left.jsx
 - framework_components/roomcast-package-creator/src/app/components/material-ui/svg-icons/navigation-chevron-right.jsx

data/framework_components/roomcast-main-app/src/app/components/app/NutellaMixin.js

@@ -1,23 +0,0 @@
-
-var NutellaMixin = {
-
-    getChannelsForRid: function(message, rid) {
-        var myChannelsId = [];
-        var myChannels = [];
-        message.forEach(function(f) {
-            for (var i in f.items) {
-                var item = f.items[i];
-                if (item.name === 'iPad1') {
-                    myChannelsId = item.channels;
-                    break;
-                }
-            }
-        });
-        myChannelsId.forEach(function(id) {
-            myChannels.push(CHANNELS[id]);
-        });
-    },
-
-};
-
-module.exports = NutellaMixin;