From fd6a89a69609aeedf14efac21a5c72b5691ec91d Mon Sep 17 00:00:00 2001 From: mesh00 Date: Wed, 12 Apr 2017 17:03:59 +0100 Subject: [PATCH] fine tune sponsor text --- app/app.css | 18 ++++-------------- app/index.html | 8 +++++--- app/user/blocks/blocks.html | 9 +-------- app/user/blocks/blocks.js | 23 ----------------------- 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/app/app.css b/app/app.css index 9f3b1f3..55b9ba0 100644 --- a/app/app.css +++ b/app/app.css @@ -196,11 +196,7 @@ md-dialog .login{ } .power { - position: absolute; - bottom: 0px; - margin-bottom: 10px; width: 100%; - text-align: center; color: #fff; } @@ -233,7 +229,6 @@ md-dialog .login{ height: 100px; position: relative; cursor: pointer; - margin-bottom: 55px !important; } .sponsor-text{ @@ -284,14 +279,8 @@ md-dialog .login{ .scaling{ -webkit-transform-origin: 100% 50%; -webkit-animation: slideAnimation 1s both ease-in-out; - /*-webkit-animation-name: scalex; - -webkit-animation-duration:3s; - -webkit-animation-iteration-count:1; - -webkit-animation-timing-function:ease-in;*/ - /*-moz-animation-name: scale; - -moz-animation-duration:3s; - -moz-animation-iteration-count:infinite; - -moz-animation-timing-function:ease-in;*/ + -moz-transform-origin: 100% 50%; + -moz-animation: slideAnimation 1s both ease-in-out; } @-webkit-keyframes slideAnimation { @@ -302,7 +291,8 @@ md-dialog .login{ -webkit-transform: translateX(85px) translateY(-20px) scale(0.5); } } - @-webkit-keyframes closeAnimation { + + @-moz-keyframes slideAnimation { 0% { webkit-transform: translateX(0px) translateX(0px) scale(1.0); } diff --git a/app/index.html b/app/index.html index 1754f1f..df7d49a 100644 --- a/app/index.html +++ b/app/index.html @@ -88,16 +88,18 @@

XMRPool.net beta

-
+
+
Powered by nodejs-pool & poolui
MIT Licence +
diff --git a/app/user/blocks/blocks.html b/app/user/blocks/blocks.html index 898715c..0af08d3 100644 --- a/app/user/blocks/blocks.html +++ b/app/user/blocks/blocks.html @@ -1,11 +1,4 @@ - -
- -
- -
-
-
+
diff --git a/app/user/blocks/blocks.js b/app/user/blocks/blocks.js index cbee112..abadc5b 100644 --- a/app/user/blocks/blocks.js +++ b/app/user/blocks/blocks.js @@ -2,23 +2,6 @@ app.controller('BlocksCtrl', function($scope, $route, dataService, timerService) { $scope.blocks = {}; - $scope.chart = { - dataset : {}, - options : { - margin: {top: 5}, - series: [ - { - axis: "y", - dataset: "global", - key: "height", - label: "A line series", - type: ["line"], - id: "blocksperday" - } - ], - axes: {x: {key: "ts", type: "date"}} - } - }; $scope.selected = []; $scope.options = { @@ -33,15 +16,9 @@ app.controller('BlocksCtrl', function($scope, $route, dataService, timerService) $scope.promise = dataService.getData("/pool/blocks?"+urlParams, function(data){ $scope.blocks.global = data; updateMaturity(); - updateChart(); }); }; - var updateChart = function () { - console.log($scope.blocks); - $scope.chart.dataset = $scope.blocks; - } - var updateMaturity = function () { var luck; if($scope.poolStats.global !== undefined){