From cacbceb9e201c9294fcfe8b8a42acd6eef681e5b Mon Sep 17 00:00:00 2001
From: kilo <kilowwwww@gmail.com>
Date: Thu, 7 Sep 2017 17:56:02 +0200
Subject: [PATCH] Move close button to upper right corner of cookie warning &
 styling adjustements (#1522)

* Move close button before to upper right corner of cookie warning

* Update index_admin.jet.html

* Update main.css

* Update tomorrow.css

* Update tomorrow.css

* Update main.css

* lighter background
---
 public/css/main.css                      | 23 +++++++++++++++++------
 public/css/tomorrow.css                  |  9 +++++----
 templates/layouts/index_admin.jet.html   |  2 +-
 templates/layouts/partials/base.jet.html |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/public/css/main.css b/public/css/main.css
index f2c584b6..90cb2799 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -450,6 +450,9 @@ select.form-input {
 .results {
     padding: 0!important;
 }
+.admin-content .results {
+	border-top: none;
+}
 
 table {
     border-collapse: collapse;
@@ -1897,11 +1900,11 @@ span.tag {
 #admin-header {
     width: 100%;
     display: inline-block;
-    border-bottom:none;
-    border-radius: 3px 3px 0 0;
-    word-spacing: -0.26em;
+    word-spacing: -0.265em;
+    margin-bottom: -2px;
     border: 1px solid #b3b3b3;
-    background: white;
+    border-radius: 3px 3px 0 0;
+    background: #e8e8e8;
 }
 #admin-header .nav-btn {
     display: inline-block;
@@ -1911,8 +1914,16 @@ span.tag {
     text-decoration: initial;
     border-right: 1px solid #b3b3b3;
 }
-#admin-header .nav-btn.active {
-    background: #ffebc7;
+#admin-header .nav-btn.active, #admin-header .nav-btn:hover, #admin-header:hover .nav-btn.active:hover,  #admin-header .nav-btn:focus {
+    background: hsl(198, 100%, 100%);
+    height: 37px;
+    margin-bottom: -1px;
+}
+
+#admin-header:hover .nav-btn.active, #admin-header:active .nav-btn.active{
+    background: none;
+    height: 36px;
+    margin-bottom: 0;
 }
 
 /* Language specific CSS */
diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css
index 58929b54..6603590a 100644
--- a/public/css/tomorrow.css
+++ b/public/css/tomorrow.css
@@ -224,7 +224,7 @@ td.tr-le, .error-text {
 #announce {
     color: #3a4249;
     background-color: #F4E0C9;
-   border-color: #ae875b;
+    border-color: #ae875b;
 }
 
 #admin-header {
@@ -233,10 +233,11 @@ td.tr-le, .error-text {
 }
 #admin-header .nav-btn {
     border-color: #141517;
-    color: #c5c8c6;
+	color: #a2a7a4;
 }
-#admin-header .nav-btn.active {
-    background-color: #3d4144;
+#admin-header .nav-btn.active, #admin-header .nav-btn:hover, #admin-header:hover .nav-btn.active:hover, #admin-header .nav-btn:focus {
+    background-color: #2c2f34;
+    color: #c5c8c6;
 }
 
 .torrent-preview-table>table {
diff --git a/templates/layouts/index_admin.jet.html b/templates/layouts/index_admin.jet.html
index f6e94eb2..02bc1f3d 100644
--- a/templates/layouts/index_admin.jet.html
+++ b/templates/layouts/index_admin.jet.html
@@ -8,7 +8,7 @@
 {{end}}
 
 {* We used to add the class content for admin *}
-{{ block contclass()}}{{end}}
+{{ block contclass()}}admin-content{{end}}
 
 {* We add the mod panel title and the title block *}
 {{block titleBase()}} Moderation Panel - {{block title()}}{{end}}
diff --git a/templates/layouts/partials/base.jet.html b/templates/layouts/partials/base.jet.html
index 16347d59..f09e13f9 100644
--- a/templates/layouts/partials/base.jet.html
+++ b/templates/layouts/partials/base.jet.html
@@ -97,7 +97,7 @@
       </div>
     </footer>
   </div>
-  {{ if !EUCookieLaw }}<div id="cookie-warning">{{ T("cookie_warning")|raw }}<span id="cookie-warning-close" class="close">×</span></div>{{ end }}
+  {{ if !EUCookieLaw }}<div id="cookie-warning"><span id="cookie-warning-close" class="close">×</span>{{ T("cookie_warning")|raw }}</div>{{ end }}
   <script type="text/javascript" charset="utf-8">var commitVersion = "{{ Config.Build }}", UserID = {{User.ID}};</script>
   <script type="text/javascript" src="/js/query.js?v={{ Config.Version}}{{ Config.Build }}"></script>
   <script type="text/javascript" charset="utf-8" src="/js/main.js?v={{ Config.Version }}{{ Config.Build }}" async></script>