Merge pull request #65 from diggyk/master

Modified look-and-feel
dropbox · Oct 5, 2015 · ad2a322 · ad2a322
2 parents 22cc9a4 + ea584e9
commit ad2a322
Show file tree

Hide file tree

Showing 8 changed files with 640 additions and 561 deletions.
diff --git a/hermes/webapp/src/css/main.less b/hermes/webapp/src/css/main.less
diff --git a/hermes/webapp/src/img/logo.gif b/hermes/webapp/src/img/logo.gif
diff --git a/hermes/webapp/src/img/logo.png b/hermes/webapp/src/img/logo.png
diff --git a/hermes/webapp/src/index.html b/hermes/webapp/src/index.html
@@ -21,7 +21,7 @@
                     <span class="icon-bar"></span>
                 </button>
                 <a class="navbar-brand" href="#">
-                    <img alt="Brand" src="/img/logo.gif">
+                    <img alt="Brand" src="/img/logo.png">
                 </a>
             </div>
             <div class="collapse navbar-collapse"

diff --git a/hermes/webapp/src/js/controllers/questStatusCtrl.js b/hermes/webapp/src/js/controllers/questStatusCtrl.js
@@ -22,7 +22,7 @@
         vm.offset = 0;
         vm.totalQuests = 10;
 
-        vm.colors = ['#0071ce', '#72b6ec', '#cce6fa', '#f4faff'];
+        vm.colors = ['#688ab4', '#9cbfea', '#232f3e', '#7e8184'];
 
         vm.runNewFilter = runNewFilter;
         vm.getOpenQuests = getOpenQuests;

diff --git a/hermes/webapp/src/js/directives/questProgressChart.js b/hermes/webapp/src/js/directives/questProgressChart.js
@@ -86,12 +86,14 @@
                         // add the quest info to the top left
                         var title = raphael.text(0, titleFontSize, "Quest " + data[0].id)
                             .attr('text-anchor', 'start')
-                            .attr('font-size', titleFontSize);
+                            .attr('font-size', titleFontSize)
+                            .attr('font-family', "Montserrat");
 
                         // add the quest description
                         var desc = raphael.text(0, legendY)
                             .attr('text-anchor', 'start')
-                            .attr('font-size', legendFontSize);
+                            .attr('font-size', legendFontSize)
+                            .attr('font-family', "Montserrat");
                         wrapText(data[0].description, desc, width *.25);
 
                         // draw out the legend on the right
@@ -103,7 +105,7 @@
                             var y = legendY + (i * legendSpacing * 1.1);
                             var text = raphael.text(
                                 x, y, type
-                            ).attr('font-size', legendFontSize).attr('text-anchor', 'start')
+                            ).attr('font-size', legendFontSize).attr('font-family', "Montserrat").attr('text-anchor', 'start')
 
                             var boxX = x - legendSpacing- (legendSpacing/4);
                             var boxY = y - legendSpacing/2;

diff --git a/hermes/webapp/src/templates/laborList.html b/hermes/webapp/src/templates/laborList.html
@@ -170,7 +170,7 @@
                 Are you sure you want to create a <code>{{lsc.selectedEventType.category}} {{lsc.selectedEventType.state}}</code> event for {{lsc.selected.length}} servers?
             </div>
             <div class="dialog-buttons">
-                <button style="float: none" class="big-button" ng-click="lsc.createEvents()">Yes</button>
+                <button style="float: none" class="big-button be-positive" ng-click="lsc.createEvents()">Yes</button>
                 <button style="float: none" class="big-button" ng-click="lsc.createEventsModal = false">No</button>
             </div>
         </div>

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -144,7 +144,7 @@
                 Are you sure you want to create a <code>{{qc.selectedEventType.category}} {{qc.selectedEventType.state}}</code> event for {{qc.selectedLabors.length}} servers?
             </div>
             <div class="dialog-buttons">
-                <button style="float: none" class="big-button" ng-click="qc.createEvents()">Yes</button>
+                <button style="float: none" class="big-button be-positive" ng-click="qc.createEvents()">Yes</button>
                 <button style="float: none" class="big-button" ng-click="qc.createEventsModal = false">No</button>
             </div>
         </div>