Merge pull request #72 from diggyk/master

Fix CSS for quest creation page
dropbox · Oct 14, 2015 · 775a925 · 775a925
2 parents 63169ea + 108c715
commit 775a925
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 51 deletions.
diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.4.16"
+__version__ = "0.4.22"
diff --git a/hermes/webapp/src/css/main.less b/hermes/webapp/src/css/main.less
@@ -37,31 +37,15 @@
 @height2: 60px;
 // Appears 4 times
 
-@font-face {
-  font-family: "Open Sans";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Open Sans"), local("OpenSans"), url("//fonts.gstatic.com/s/opensans/v10/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: 'Noto Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Noto Sans'), local('NotoSans'), url(http://fonts.gstatic.com/s/notosans/v6/LeFlHvsZjXu2c3ZRgBq9nJBw1xU1rKptJj_0jans920.woff2) format('woff2');
-}
-
-
 .container-fluid {
   padding: 0px;
 }
 
 body {
-  font-family: 'Noto', Verdana;
+  font-family: 'Titillium Web', Verdana;
   font-size: 1.2em;
   margin: 0;
   padding: 0px 0px 20px 0px;
-  overflow: hidden;
 }
 
 h1 {
@@ -103,7 +87,6 @@ button {
   -webkit-border-radius: 5px;
   background: @btn-color2;
   border-radius: 5px;
-  //border: 1px @btn-color solid;
   border: none;
   color: @btn-text-color;
   float: right;
@@ -331,7 +314,6 @@ a {
   }
   &:hover {
     &:not(.selected) {
-      //background: @c-highlight;
       cursor: pointer;
       -webkit-box-shadow: 1px 1px 3px 0px @shadow-color;
       -moz-box-shadow: 1px 1px 3px 0px @shadow-color;
@@ -410,19 +392,18 @@ a {
 
 .quest-labors {
   font-size: 1em;
-  .row {
-    margin: 0;
-  }
+
   .header {
     font-weight: bold;
   }
+
   .labor-entry {
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border-radius: 5px;
     cursor: pointer;
     margin-bottom: 1px;
-    padding: 2px;
+    padding: 2px 15px;
     transition: 0.15s ease-out all;
     -webkit-transition: 0.15s ease-out all;
     -moz-transition: 0.15s ease-out all;
@@ -455,21 +436,17 @@ a {
   }
   .owner-group {
     margin-bottom: 5px;
-    margin-left: -15px;
-    margin-right: -15px;
-    &:nth-child(odd) {
-      //background: @alt-row-color;
-    }
     .type-group {
-      padding-bottom: 5px;
-      padding-left: 15px;
-      padding-right: 15px;
-      padding-top: 5px;
+      //padding-bottom: 5px;
+      //padding-left: 15px;
+      //padding-right: 15px;
+      //padding-top: 5px;
     }
   }
 }
 
 .quest-creation {
+  overflow: hidden;
   .panel-row {
     overflow: hidden;
     &.top-row{
@@ -489,13 +466,13 @@ a {
         -webkit-border-radius: 0px 0px 5px 5px;
         -moz-border-radius: 0px 0px 5px 5px;
         border-radius: 0px 0px 5px 5px;
-        padding: 0;
-        margin: 0;
+        padding-bottom: 0;
+        margin-bottom: 0;
         max-height: 8px;
       }
       .create-panel {
-        padding: 0;
-        margin: 0;
+        padding-bottom: 0;
+        margin-bottom: 0;
         max-height: 8px;
       }
     }
@@ -525,7 +502,6 @@ a {
     -webkit-border-radius: 5px;
     background: @alt-row-color;
     border-radius: 5px;
-    //border: @input-outline-color solid 1px;
     margin: 5px 0px;
     max-height: 200px;
     min-height: 50px;
@@ -745,20 +721,19 @@ a {
     opacity: 0.5;
   }
   .labor-entry {
-    -moz-border-radius: 5px;
-    -moz-transition: 0.15s ease-in all;
     -ms-transition: 0.15s ease-in all;
     -o-transition: 0.15s ease-in all;
-    -webkit-border-radius: 5px;
     -webkit-transition: 0.15s ease-in all;
+    -moz-transition: 0.15s ease-in all;
+    transition: 0.15s ease-in all;
     background: @unselected-color;
+    -webkit-border-radius: 5px;
     border-radius: 5px;
+    -moz-border-radius: 5px;
     border: transparent 2px solid;
     margin-bottom: 10px;
-    margin-left: 0;
     overflow: auto;
-    padding: 2px;
-    transition: 0.15s ease-in all;
+    padding: 2px 15px;
     -webkit-transform: none;
     -moz-transform: none;
     -ms-transform: none;
@@ -775,9 +750,6 @@ a {
       -o-transform: translate(-2px, -2px);
       transform: translate(-2px, -2px);
     }
-    .row {
-      margin: 0px;
-    }
     .hostname {
       -moz-border-radius: 5px 0px 0px 0px;
       -webkit-border-radius: 5px 0px 0px 0px;

diff --git a/hermes/webapp/src/index.html b/hermes/webapp/src/index.html
@@ -4,6 +4,7 @@
     <title>Hermes</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href='https://fonts.googleapis.com/css?family=Titillium+Web:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/css/bootstrap.css">
     <link href="/css/hermes.css" rel="stylesheet" type="text/css"/>
 </head>

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

diff --git a/hermes/webapp/src/templates/questCreation.html b/hermes/webapp/src/templates/questCreation.html
@@ -1,5 +1,5 @@
 <div ng-cloak ng-controller="QuestCreationCtrl as qc">
-    <div class="quest-creation">
+    <div class="row quest-creation col-md-12">
         <div class="row">
             <div class="col-md-12 create-panel">
                 <div><h1>Create a quest:</h1></div>