fixed sass variable colors and polished top bar css

5 files changed, 49 insertions, 35 deletions

diff --git a/res/css/partials/base.scss b/res/css/partials/base.scss
index 957f9127..7e2679f5 100644
--- a/res/css/partials/base.scss
+++ b/res/css/partials/base.scss
@@ -6,6 +6,7 @@
 //Globals
 html, body {
   height: 100%;
+  font-family: $base-font-family;
 }
 
 body {
@@ -15,7 +16,7 @@ body {
   min-width: 980px;
   padding: 0;
   color: #FFF;
-  font-size: 14px;
+  font-size: 12px;
   background-color:#f5f5fa;
 }
 
diff --git a/res/css/partials/input-bar.scss b/res/css/partials/input-bar.scss
index 07df842e..9fb47d64 100644
--- a/res/css/partials/input-bar.scss
+++ b/res/css/partials/input-bar.scss
@@ -1,22 +1,30 @@
 .input-bar {
+  font-family: $base-font-family;
+  color: $mid-grey;
   position: fixed;
   display: block;
   height: $input-bar-height;
   width: 420px;
   top: $top-bar-height+$search-bar-height+$task-alert-height+20px;
-  left: $left-margin;
+  left: $doc-margin;
   padding-left:8px;
   border-radius: 4px;
-  border: 1px solid #919095;//$mid-grey
+  border: 1px solid $mid-grey;
   background: white;
   &:focus {
     border-radius: 4px;
-    border: 1px solid #919095;//$mid-grey
+    border: 1px solid $mid-grey;
     -webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
     -moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
     box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);  }
 }
 
+#textanalyser.ui-autocomplete-input {
+  font-family: $base-font-family;
+  color: $mid-grey;
+}
+
+
 .add-button {
   position:fixed;
   top: $top-bar-height+$search-bar-height+$task-alert-height+22px;
@@ -37,7 +45,7 @@
 .ui-helper-hidden-accessible{
   position:fixed;
   top: $top-bar-height+$search-bar-height+$task-alert-height+35px+$input-bar-height;
-  left:$left-margin+8px;
+  left:$doc-margin+8px;
   text-shadow: -1px 1px 8px #E DE275, 1px -1px 8px #EDE275;
   font-size:16px;
 }
\ No newline at end of file
diff --git a/res/css/partials/search-bar.scss b/res/css/partials/search-bar.scss
index 5e8d95ba..c78e62c3 100644
--- a/res/css/partials/search-bar.scss
+++ b/res/css/partials/search-bar.scss
@@ -18,13 +18,12 @@
   width: 100%;
   top: $top-bar-height+($search-bar-height - $search-icon-height)/2;
   height:$search-icon-height;
-  left: $left-margin + 40px;
+  left: $doc-margin + 40px;
 }
 .search-icon {
   position:fixed;
   width:20px;
   height:$search-icon-height;
-  left: $left-margin;
+  left: $doc-margin;
   top: $top-bar-height+($search-bar-height - $search-icon-height)/2;
-
 }
diff --git a/res/css/partials/top-bar.scss b/res/css/partials/top-bar.scss
index aeebe9f2..22fa64ac 100644
--- a/res/css/partials/top-bar.scss
+++ b/res/css/partials/top-bar.scss
@@ -3,45 +3,54 @@
   top:0;
   left:0;
   width:100%;
-  height:$top-bar-height;
-  background-color:#363636; //todo: $dark-grey
+  min-height:$top-bar-height;
+  background-color:$dark-grey;
 }
 
 .doc-title{
-  position:fixed;
+  float: left;
   font-family: $semibold-font-family;
-  left:$left-margin;
-  top:10px;
-  color: #f5f5fa; //todo: $light-grey:
+  color: $light-grey;
+  margin: 10px $doc-margin 10px $doc-margin;
+}
 
+.user-area {
+  float: right;
+  margin: 3px $doc-margin 3px $doc-margin;
 }
 
-.profile-circle {
-  position:fixed;
-  right: 400px;
+.username {
+  display: inline-block;
+  text-align: right;
+}
+
+.profile-circle{
   border-radius: 50%;
   width: 30px;
   height: 30px;
-  background: #33c2e0;//todo: $cyan
-  top:3px;
+  background: $cyan;
+  display: inline-block;
 }
 
 .profile-initials {
-  position:fixed;
-  top:10px;
-  right:405px;
-  color: #f5f5fa;//$light-grey
+  display: inline-block;
+  color: $light-grey;
+  font-size: $h4-size;
+  position: relative;
+  left: -27px;
+  top: -10px;
 }
 
 .profile-username {
-  position:fixed;
-  top:10px;
-  right: 295px;
-  color: #f5f5fa;//$light-grey
+  display: inline-block;
+  top:12px;
+  color: $light-grey;
+  position: relative;
+  left: -20px;
+  top: -10px;
 }
 
-.owner-logo {
-  position:fixed;
-  top:3px;
-  right: 50px;
+.organization-logo {
+  display: inline-block;
+  margin-left: 12px;
 }
\ No newline at end of file
diff --git a/res/css/partials/typography.scss b/res/css/partials/typography.scss
index 63074f90..388afef5 100644
--- a/res/css/partials/typography.scss
+++ b/res/css/partials/typography.scss
@@ -1,7 +1,4 @@
-@font-face {
-  font-family: 'MyWebFont';
-  src: url(../../font/SourceSansPro-Regular.ttf) format('ttf');
-}
+/* Headings */
 
 h1 {
   font-size: $h1-size;