Configure project to use by default clear sans family font

This commit also adds two external fonts ClearSans-Bold and ClearSans Light Signed-off-by: Bruno Bottazzini <bruno.bottazzini@intel.com>
solettaproject · Apr 15, 2016 · 49ead27 · 49ead27
1 parent 413aca2
commit 49ead27
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/client/css/app.css b/client/css/app.css
@@ -1,3 +1,12 @@
+@font-face {
+    font-family: clearsans-bold;
+    src: url(/css/font/ClearSans-Bold.ttf);
+}
+@font-face {
+    font-family: clearsans-light;
+    src: url(/css/font/ClearSans-Light.ttf);
+}
+
 .tree-browser {
   overflow-x: hidden;
   background-color: #2d3237;
@@ -52,21 +61,25 @@ tbody {
   padding-left: 35px;
 }
 .menu-item{
-  display:inline-block;
-  margin-right: 40px;
-  font-size: 0.9em;
-  color: 8c8c8c;
+  display: inline-block;
+  margin-right: 31px;
+  margin-left: -35px;
+  font-size: 12px;
+  font-family: clearsans-bold;
+  color: #616568;
   height: 40px;
   padding-top: 10px;
   box-sizing: border-box;
   cursor: pointer;
+  text-align: center;
+  width: 140px;
 }
 .menu-item-selected{
-  color:white;
-  border-bottom: 3px solid #33b7e9;
+  background-color: #2d3237;
+  border-top: 4px solid #33b7e9;
 }
 .menu-item-hover{
-  color:white;
+  border-top: 4px solid #33b7e9;
 }
 .tabcontents{
     margin-top: 50px;
@@ -219,7 +232,7 @@ iframe{
 }
 
 .ui-widget {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
+    font-family: clear-sans !important;
     font-size: 14px !important;
 }
 
@@ -267,10 +280,6 @@ iframe{
     display: none;
 }
 
-.enable_div {
-    display: inline;
-}
-
 .ui-dialog {
     z-index: 9999 !important ;
 }

diff --git a/client/css/font/ClearSans-Bold.ttf b/client/css/font/ClearSans-Bold.ttf
diff --git a/client/css/font/ClearSans-Light.ttf b/client/css/font/ClearSans-Light.ttf
diff --git a/server/views/index.html b/server/views/index.html
@@ -123,9 +123,9 @@
 
         <!-- NAVIGATION MENU !-->
         <div ng-controller="menuController" id="top-menu">
-            <div class='menu-item' id='menu-cb'>Editor</div>
-            <div ng-class="{'enable_div': journal == true, 'disable_div': journal == false}" class='menu-item' id='menu-sj'>Systemd Journal</div>
-            <div ng-class="{'enable_div': cheat_sheet == true, 'disable_div': cheat_sheet == false}" class='menu-item' id='menu-sc'>Cheat Sheet</div>
+            <div align="center" class='menu-item' id='menu-cb'>EDITOR</div>
+            <div  align="center" ng-class="{'enable_div': journal == true, 'disable_div': journal == false}" class='menu-item' id='menu-sj'>JOURNAL</div>
+            <div  align="center" ng-class="{'enable_div': cheat_sheet == true, 'disable_div': cheat_sheet == false}" class='menu-item' id='menu-sc'>CHEAT SHEET</div>
         </div>
 
         <!-- CONTENT REGION !-->
@@ -136,7 +136,7 @@
                 <!-- -------------------------------------------------------------- !-->
                 <div ng-controller="editor as ctrl" id="cb">
                     <!-- TOP OF THE PAGE !-->
-                    <div class="container" style="width: 100%;">
+                    <div class="container" style="width: 100%; height: 56px;">
 
                     <!--TOP MENU !-->
                     <div class="menuStyle" style="margin-right: -7px; width: 100%;">
@@ -145,7 +145,7 @@
                             <button ng-click="$mdOpenMenu()">
                             File
                             </button>
-                            <md-menu-content>
+                            <md-menu-content style="font-family: clearsans-light">
                                 <md-menu-item>
                                     <md-button ng-click="ctrl.menuAction('file.projectnew', $event)">
                                         New Project
@@ -180,11 +180,11 @@
                                  </md-menu-item>
                             </md-menu-content>
                           </md-menu>
-                          <md-menu>
+                          <md-menu style="margin-right: 15px;">
                             <button ng-click="$mdOpenMenu()">
                                 Edit
                             </button>
-                            <md-menu-content>
+                            <md-menu-content style="font-family: clearsans-light">
                                 <md-menu-item>
                                     <md-button ng-click="ctrl.menuAction('edit.undo', $event)">
                                         Undo
@@ -218,7 +218,7 @@
                             <button ng-click="$mdOpenMenu()">
                                 View
                             </button>
-                            <md-menu-content>
+                            <md-menu-content style="font-family: clearsans-light">
                                 <md-menu-item>
                                     <md-button ng-click="ctrl.menuAction('view.code', $event)">
                                         {{showhideCode}}