Commit a279224a8828fb260ae975d4ba5e5783c5b6d6d3

Authored by Renato De Donato
2 parents 2ab5559c 1463340a

Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

controllets/animated-grid-controllet/animated-grid-controllet.html
@@ -157,7 +157,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN @@ -157,7 +157,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
157 { 157 {
158 $('.grid').masonry({ 158 $('.grid').masonry({
159 itemSelector: '.grid-item', 159 itemSelector: '.grid-item',
160 - columnWidth: 200 160 + columnWidth: 20
161 }); 161 });
162 }, 162 },
163 163
controllets/room-controllet/room-controllet.html
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 }, 150 },
151 151
152 attached : function() { 152 attached : function() {
153 - console.log(this.views); 153 + //console.log(this.views);
154 }, 154 },
155 155
156 _showTooltip: function() { 156 _showTooltip: function() {
demo.html
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 </script> 139 </script>
140 </head> 140 </head>
141 <body> 141 <body>
142 - <data-sevc-controllet localization="en" id="dsc" deep-url="http://deep.routetopa.eu/DEEP/" datalets-list-url="http://deep.routetopa.eu/DEEP/datalets-list"></data-sevc-controllet> 142 + <data-sevc-controllet localization="en" id="dsc" deep-url="http://172.16.15.77/DEEalerProvider/DEEP/" datalets-list-url="http://deep.routetopa.eu/DEEP/datalets-list"></data-sevc-controllet>
143 </body> 143 </body>
144 '> 144 '>
145 </iframe> 145 </iframe>