Skip to content

Commit

Permalink
fine tune sponsor text
Browse files Browse the repository at this point in the history
  • Loading branch information
mesh0000 committed Apr 12, 2017
1 parent 8bbaec7 commit fd6a89a
Showing 4 changed files with 10 additions and 48 deletions.
18 changes: 4 additions & 14 deletions app/app.css
Original file line number Diff line number Diff line change
@@ -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);
}
8 changes: 5 additions & 3 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -88,16 +88,18 @@ <h1 class="md-toolbar-tools">XMRPool.net <i class="md-caption">beta</i></h1>
</md-list>
<div flex layout="row" layout-align="center end">
<a href="http://www.cloudsigma.com" target="_new" class="sponsor-area text-center" flex layout="row" layout-align="center center">
<span class="sponsor-text" ng-class="{closed: !sponsor_open, appear: sponsor_open}">Sponsored by</span>
<span class="sponsor-text" ng-class="{closed: !sponsor_open, appear: sponsor_open}">cloud hosting by</span>
<img id="floating-sponsor" src="assets/sponsor-logo.png" class="sponsor-logo floating" ng-class="{floating: !sponsor_open, scaling: sponsor_open}" ng-mouseover="sponsor_open = true" />
<img id="floating-sponsor" src="assets/cloudsigma.png" class="sponsor-brand closed" ng-class="{closed: !sponsor_open, appear: sponsor_open}" />
<span class="sponsor-tagline" ng-class="{closed: !sponsor_open, appear: sponsor_open}">SLA with 24/7 support</span>
<span class="sponsor-tagline" ng-class="{closed: !sponsor_open, appear: sponsor_open}">Free 24/7 support with SLA</span>
</a>
</div>
<div class="power md-subhead" flex>
<div class="power text-center md-subhead" layout="row" layout-align="center end">
<div flex>
Powered by <a href="https://github.com/Snipa22/nodejs-pool" target="_new">nodejs-pool</a> & <a class="alt" href="https://github.com/mesh0000/poolui" target="_new">poolui</a>
<br/>
MIT Licence
</div>
</div>
</md-sidenav>

9 changes: 1 addition & 8 deletions app/user/blocks/blocks.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<!-- <ng-include src="'user/dashboard/poolstats.html'"></ng-include> -->
<div layout-md="column" layout="row" flex>
<md-container>
<div class="chartcontainer" flex>
<linechart data="chart.dataset" options="chart.options"></linechart>
</div>
</md-container>
</div>
<ng-include src="'user/dashboard/poolstats.html'"></ng-include>
<div layout-md="column" layout="row" flex>
<div layout="column" flex>
<md-card>
23 changes: 0 additions & 23 deletions app/user/blocks/blocks.js
Original file line number Diff line number Diff line change
@@ -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){

0 comments on commit fd6a89a

Please sign in to comment.