Added top-bar + removed deprecated elements and classes

8 files changed, 50 insertions, 131 deletions

diff --git a/res/css/partials/base.scss b/res/css/partials/base.scss
index ba9413d1..b9b14886 100644
--- a/res/css/partials/base.scss
+++ b/res/css/partials/base.scss
@@ -1,5 +1,6 @@
 @import "../modules/colors";
 @import "../modules/mixins";
+@import "../modules/typography";
 
 //Globals
 html, body {
diff --git a/res/css/partials/buttons.scss b/res/css/partials/buttons.scss
index 945dce46..e69de29b 100644
--- a/res/css/partials/buttons.scss
+++ b/res/css/partials/buttons.scss
@@ -1,63 +0,0 @@
-.onoffswitch {
-  z-index:100;
-  position: fixed;
-  width: 160px;
-  top:35px;
-  right: 180px;
-  -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
-}
-
-.onoffswitch-checkbox {
-  display: none;
-}
-
-.onoffswitch-label {
-  display: block; overflow: hidden; cursor: pointer;
-  border: 2px solid #303030; border-radius: 5px;
-}
-
-.onoffswitch-inner {
-  display: block; width: 200%; margin-left: -100%;
-  -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s;
-  -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s;
-}
-
-.onoffswitch-inner:before, .onoffswitch-inner:after {
-  display: block; float: left; width: 50%; height: 20px; padding: 0; line-height: 20px;
-  font-size: 14px; color: white; font-weight: bold;
-  -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
-}
-
-.onoffswitch-inner:before {
-  content: "TIMELINE VIEW";
-  padding-left: 5px;
-  background-color: #080808; color: #FFFFFF;
-}
-
-.onoffswitch-inner:after {
-  content: "GRAPH VIEW";
-  padding-right: 5px;
-  background-color: #080808; color: #FFFFFF;
-  text-align: right;
-}
-
-.onoffswitch-switch {
-  display: block; width: 35px; margin: 0px;
-  background: #3D3D3D;
-  border: 1px solid #FFFFFF; border-radius: 5px;
-  position: absolute; top: 0; bottom: 0; right: 125px;
-  -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
-  -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
-  background-image: -moz-linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 100%);
-  background-image: -webkit-linear-gradient(rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 100%);
-  background-image: -o-linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 100%);
-  background-image: linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 100%);
-}
-
-.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
-  margin-left: 0;
-}
-
-.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
-  right: 0px;
-}
diff --git a/res/css/partials/graph-view.scss b/res/css/partials/graph-view.scss
index 10120964..b885031d 100644
--- a/res/css/partials/graph-view.scss
+++ b/res/css/partials/graph-view.scss
@@ -176,4 +176,9 @@
 
   font-size: 17px;
 
+}
+
+.rhizi-logo {
+  position: fixed;
+  left:800px;
 }
\ No newline at end of file
diff --git a/res/css/partials/reset.scss b/res/css/partials/reset.scss
index d9f27b5a..86e14741 100644
--- a/res/css/partials/reset.scss
+++ b/res/css/partials/reset.scss
@@ -21,6 +21,7 @@ time, mark, audio, video {
   border: 0;
   font-size: 100%;
   font: inherit;
+  font-family: 'Source Sans Pro', sans-serif;
   vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
diff --git a/res/css/partials/task-alert.scss b/res/css/partials/task-alert.scss
index 0cd101b7..670808f3 100644
--- a/res/css/partials/task-alert.scss
+++ b/res/css/partials/task-alert.scss
@@ -1,6 +1,5 @@
 .help{
   font-size: 20px;
-  position: fixed;
   top: 5px;
   left: 10px;
   margin-left: 12px;
diff --git a/res/css/partials/timeline-view.scss b/res/css/partials/timeline-view.scss
deleted file mode 100644
index 04eefda0..00000000
--- a/res/css/partials/timeline-view.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.history-timeline {
-  pointer-events: none;
-  z-index: -1;
-  position: absolute;
-  width: 100%;
-  justify-content: center;
-  bottom: 100px;
-}
-
-#gantbox{
-  position:absolute;
-  background-color: rgba(200,200,200,0.1);
-  height:100%;
-  width: 100%;
-  overflow: auto;
-  z-index:0;
-}
-
-.missingdates{
-  position:fixed;
-  bottom:60px;
-  left:160px;
-}
-
-.axis{
-  stroke: #ccc;
-  fill: #ccc;
-}
-
-.axis path,.axis line {
-  fill: none;
-  stroke: #ccc;
-  shape-rendering: crispEdges;
-}
diff --git a/res/css/partials/top-bar.scss b/res/css/partials/top-bar.scss
index c43f6cce..71414b7a 100644
--- a/res/css/partials/top-bar.scss
+++ b/res/css/partials/top-bar.scss
@@ -1,9 +1,49 @@
-.logo {
+.top-bar{
   position:fixed;
+  top:0;
+  left:0;
+  width:100%;
+  height:36px;
+  background-color:#363636; //todo: $dark-grey
+}
+
+.doc-title{
+  position:fixed;
+  font-family: $semibold-font-family;
+  left:60px;
   top:10px;
-  right:10px;
-  opacity: 0.7;
+  color: #f5f5fa; //todo: $light-grey:
+
+}
+
+.profile-circle {
+  position:fixed;
+  right: 400px;
+  border-radius: 50%;
+  width: 30px;
+  height: 30px;
+  background: #33c2e0;//todo: $cyan
+  top:3px;
+}
 
+.profile-initials {
+  position:fixed;
+  top:10px;
+  right:405px;
+  color: #f5f5fa;//$light-grey
+}
+
+.profile-username {
+  position:fixed;
+  top:10px;
+  right: 295px;
+  color: #f5f5fa;//$light-grey
+}
+
+.owner-logo {
+  position:fixed;
+  top:3px;
+  right: 50px;
 }
 
 .poweredby{
diff --git a/res/css/partials/typography.scss b/res/css/partials/typography.scss
deleted file mode 100644
index 817770cb..00000000
--- a/res/css/partials/typography.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-//Font size
-$h1-size: 30px;
-$h2-size: 24px;
-$h3-size: 18px;
-$h4-size: 14px;
-$h5-size: 12px;
-
-//Font weights
-$light: 100;
-$regular: 400;
-$bold: 600;
-
-// Base font
-$base-font-family: 'Source Sans Pro', sans-serif;
-$base-font-weight: $regular;
-$base-font-size: 13px;
-$base-line-height: 1.4;
-
-// Fixed Font
-$fixed-font-family: monospace;
-$fixed-font-size: 85%;
-$fixed-line-height: $base-line-height;
-
-// Headings
-$header-font-weight: $bold;
-
-@font-face {
-  font-family: 'MyWebFont';
-  src: url(../../font/SourceSansPro-Regular.ttf) format('ttf');
-}
\ No newline at end of file