From e27a407297b4d87a923ce6274fe7b50db2c74e4e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 25 Dec 2012 20:05:42 +0100
Subject: improved header, moved notifications

---
 module/web/static/css/default/settings.less |  3 ---
 module/web/static/css/default/style.less    | 25 ++++++++++++-------------
 module/web/templates/default/base.html      | 18 ++++++++----------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/module/web/static/css/default/settings.less b/module/web/static/css/default/settings.less
index 40c04c9e8..094d56886 100644
--- a/module/web/static/css/default/settings.less
+++ b/module/web/static/css/default/settings.less
@@ -49,8 +49,5 @@
     }
 
   }
-  .form-actions {
-    background: none;
-  }
 
 }
\ No newline at end of file
diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less
index 7ad764542..86002ffd7 100644
--- a/module/web/static/css/default/style.less
+++ b/module/web/static/css/default/style.less
@@ -249,22 +249,26 @@ header .logo {
 
 .header_block {
   float: right;
-  font-family: SansationRegular, sans-serif;
+//  font-family: SansationRegular, sans-serif;
   margin: 10px 8px 0;
   line-height: 18px;
   font-size: small;
 
-  i {
-    margin-top: 0;
-    vertical-align: text-bottom;
-  }
+//  i {
+//    margin-top: 0;
+//    vertical-align: text-bottom;
+//  }
 
   .btn {
-    margin-top: 8px;
+    margin-top: 14px;
   }
 
 }
 
+.menu-block {
+  margin-top: 2px;
+}
+
 // Responsive Borders
 .header_block.left-border {
   background: url("../../img/default/box-separator.png") repeat-y;
@@ -283,18 +287,15 @@ header .logo {
   }
 }
 
-#notification_div {
+#progress-area {
   float: right;
   width: 26%;
   margin-right: 15px;
   text-align: left;
 }
 
-.notifications-area {
+#notifications-area {
   display: inline;
-  opacity: 1;
-  color: #fff;
-  height: 14px;
   line-height: 14px;
   font-size: small;
   background-color: @greyDark;
@@ -308,8 +309,6 @@ header .logo {
   height: 15px;
   margin: 8px 0 0;
   line-height: 15px;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
   border-radius: 15px;
   border: 3px solid @grey;
 
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 33b09751d..8d6ff8c14 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -37,9 +37,13 @@
         </div>
         <div class="right">
             {% if user %}
-                <div class="header_block">
-                    <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>
-                    <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>
+                <div class="header_block menu-block">
+                    <div id="notifications-area">
+                        Notifications
+                        <span class="badge badge-info">88</span>
+                    </div>
+{#                    <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>#}
+{#                    <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>#}
                     <br/>
 
                     <a class="btn btn-success btn-grabber" href="#"><i class="icon-plus icon-white"></i> Add</a>
@@ -74,12 +78,7 @@
                     <i class="icon-download-alt icon-white"></i> Downloads: <br>
                 </div>
 
-                <div id="notification_div">
-                    <div class="notifications-area">
-                        Notifications
-                        <span class="badge badge-info">88</span>
-                    </div>
-
+                <div id="progress-area" style="margin-top: 16px">
                     <div class="progress" id="globalprogress">
                         <div class="bar" style="width: 48%">downloading... (48%)</div>
                     </div>
@@ -88,7 +87,6 @@
 {#                        <span class="pull-left">3,65 MB of 5,30 MB</span>#}
 {#                        <span class="pull-right">420,7 kB / sec</span>#}
 {#                    </div>#}
-
                 </div>
 
             {% endif %}
-- 
cgit v1.2.3