fixed broken fonts, div positioning and search bar drop shadow

5 files changed, 21 insertions, 22 deletions

diff --git a/res/css/partials/base.scss b/res/css/partials/base.scss
index 7e2679f5..da6b7a68 100644
--- a/res/css/partials/base.scss
+++ b/res/css/partials/base.scss
@@ -44,7 +44,7 @@ a:active {
 //input box stuff
 input{
   background-color: white;
-  color: #363636; //$dark-grey
+  color: $dark-grey;
   border: 0;
   &:focus {
     border: 0;
@@ -55,23 +55,23 @@ input{
 }
 
 ::-webkit-input-placeholder { /* WebKit browsers */
-  color:    #919095;//$mid-grey
+  color:    $mid-grey;
 }
 :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-  color:    #919095;//$mid-grey
+  color:    $mid-grey;
   opacity:  1;
 }
 ::-moz-placeholder { /* Mozilla Firefox 19+ */
-  color:    #919095;//$mid-grey
+  color:    $mid-grey;
   opacity:  1;
 }
 :-ms-input-placeholder { /* Internet Explorer 10+ */
-  color:    #919095;//$mid-grey
+  color:    $mid-grey;
 }
 
 .powered-by{
   position:fixed;
-  color: #363636;//$dark-grey
+  color: $dark-grey;
   bottom:10px;
   right:10px;
   vertical-align: middle;
diff --git a/res/css/partials/reset.scss b/res/css/partials/reset.scss
index 86e14741..1a2e6b39 100644
--- a/res/css/partials/reset.scss
+++ b/res/css/partials/reset.scss
@@ -20,8 +20,8 @@ time, mark, audio, video {
   padding: 0;
   border: 0;
   font-size: 100%;
-  font: inherit;
-  font-family: 'Source Sans Pro', sans-serif;
+  /*font: inherit; */
+  font-family: $base-font-family;
   vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
diff --git a/res/css/partials/search-bar.scss b/res/css/partials/search-bar.scss
index c78e62c3..b9c37f40 100644
--- a/res/css/partials/search-bar.scss
+++ b/res/css/partials/search-bar.scss
@@ -1,13 +1,7 @@
 .search-bar{
-  position: fixed;
-  top: $top-bar-height;
   width:100%;
   height:$search-bar-height;
-  box-shadow:black;
-  alpha:0.3;
-  distance:1;
   background: white;
-  border: 1px solid #919095;//$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);
@@ -27,3 +21,8 @@
   left: $doc-margin;
   top: $top-bar-height+($search-bar-height - $search-icon-height)/2;
 }
+
+input {
+  font-family: $base-font-family;
+  font-size: $h3-size;
+}
\ No newline at end of file
diff --git a/res/css/partials/task-alert.scss b/res/css/partials/task-alert.scss
index a1233ce2..bd8ef12e 100644
--- a/res/css/partials/task-alert.scss
+++ b/res/css/partials/task-alert.scss
@@ -1,17 +1,17 @@
 .task-alert{
-  position:fixed;
-  top: $top-bar-height+$search-bar-height+4px;
+  position:relative;
   width: 100%;
   height:$task-alert-height;
-  background-color: #D3F2F8;//$light-cyan
-  border-top: #1D6E7F;//$dark-cyan
-  border-bottom: #1D6E7F;//$dark-cyan
+  background-color: $light-cyan;
+  color: $darker-cyan;
+  border-top: 1px solid $dark-cyan;
+  border-bottom: 1px solid $dark-cyan;
+  z-index: -1;
 }
 
 .task-desc{
   position:fixed;
   width:100%;
-  color: #1D6E7F;//$dark-cyan
   height: $task-desc-height;
   top: $top-bar-height + $search-bar-height + ($task-alert-height - $task-desc-height)/2;
   text-align: center;
@@ -21,7 +21,6 @@
 .task-close-text {
   position:fixed;
   top: $top-bar-height + $search-bar-height + ($task-alert-height - $task-desc-height)/2 + 1 ;
-  color: #1D6E7F;//$dark-cyan
   right: 70px;
   font-size: $h4-size;
 }
diff --git a/res/css/partials/top-bar.scss b/res/css/partials/top-bar.scss
index 22fa64ac..85961d41 100644
--- a/res/css/partials/top-bar.scss
+++ b/res/css/partials/top-bar.scss
@@ -1,5 +1,5 @@
 .top-bar{
-  position:fixed;
+  position:relative;
   top:0;
   left:0;
   width:100%;
@@ -12,6 +12,7 @@
   font-family: $semibold-font-family;
   color: $light-grey;
   margin: 10px $doc-margin 10px $doc-margin;
+  font-size: $h3-size;
 }
 
 .user-area {