From 5bbc2db33b8ffd30bf7faa5ce33c78a896144538 Mon Sep 17 00:00:00 2001
From: Zacharie <guetzac@gmail.com>
Date: Thu, 13 Aug 2020 12:55:38 +0200
Subject: [PATCH] Design fixes due to branch merging

---
 admin/themes/clear/theme.css                 | 16 ----------------
 admin/themes/default/js/cat_move.js          |  2 +-
 admin/themes/default/template/cat_modify.tpl |  2 +-
 admin/themes/default/theme.css               | 17 +++++++++++------
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index a19b00530..bdcc4eeb1 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -646,22 +646,6 @@ table.dataTable thead th, table.dataTable.no-footer {
   color:#444;
 }
 
-/* beta-test begins: specific changes on album edition page*/
-#catModify input[type="text"], #catModify textarea {
-  border: 2px solid #ddd;
-  background-color:#fff;
-  padding:5px;
-}
-
-#catModify input[type="text"].large, #catModify textarea.description {
-  width:590px;
-}
-
-#catModify input[type="text"]:focus, #catModify textarea:focus {
-  border-color: #ff7700;
-  background-color:#fff;
-}
-
 FORM#categoryOrdering p.albumTitle a { color: #5B5B5B; }
 FORM#categoryOrdering p.albumActions a { border-left:1px solid #D6D6D6;  background-color: #E8E8E8;}
 .albumInfos {color: #999999;}
diff --git a/admin/themes/default/js/cat_move.js b/admin/themes/default/js/cat_move.js
index c4aa6ebe9..de95be019 100644
--- a/admin/themes/default/js/cat_move.js
+++ b/admin/themes/default/js/cat_move.js
@@ -27,7 +27,7 @@ $(document).ready(() => {
     cont.addClass('move-cat-container');
     cont.attr('id', 'cat-'+node.id)
     cont.html('');
-    cont.append($(icon.replace(/%icon%/g, 'icon-ellipsis-vert')));
+    cont.append($(icon.replace(/%icon%/g, 'icon-grip-vertical-solid')));
 
     if (node.children.length != 0) {
       cont.append($(icon.replace(/%icon%/g, 'icon-flow-tree')));
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index aac99ad14..e631dab3b 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -196,7 +196,7 @@ function cropImage() {
 
 
 <div class="titrePage">
-  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Edit album'|@translate} #{$CAT_ID} <span style="letter-spacing:0">{$CATEGORIES_NAV}</span></h2>
 </div>
 
 <div id="catModify">
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 3b857d2ad..1f0200699 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -516,6 +516,10 @@ LI.menuLi {
   font-family: "Open Sans", "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
 }
 
+#catModify input[type="text"]:focus, #catModify textarea:focus{
+  border-color: #888;
+}
+
 #catModify button[type="submit"] {
   margin: 13px;
   font-size: 12px;
@@ -3021,6 +3025,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
   align-items: center;
   font-size: 14px;
   justify-content: space-between;
+  margin-top: 20px;
 }
 
 .cat-move-header .order-root::before {
@@ -3058,11 +3063,11 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
   padding-left: 20px;
 }
 
-.move-cat-container .icon-ellipsis-vert {
-  font-size: 20px;
+.move-cat-container .icon-grip-vertical-solid {
+  font-size: 16px;
   opacity: 0.5;
   position: absolute;
-  left: -5px;
+  left: 0px;
 }
 
 .move-cat-container .icon-folder-open, .move-cat-container .icon-flow-tree {
@@ -4452,13 +4457,13 @@ fieldset#environment legend i[class*="icon-"] {
 
 .buttonGradient {
   padding: 8px 10px; margin-left: 5px;
-  background: linear-gradient(135deg, rgba(255,119,0,1) 0%, rgba(249,76,93,1) 50%, rgba(201,74,140,1) 100%);
-  transition: 0.3s ease; 
+  background: linear-gradient(135deg, rgb(255, 119, 0) 0%, rgb(249, 76, 93) 25%, rgb(201, 74, 140) 50%, rgb(249, 76, 93) 100%);  transition: 0.3s ease; 
   cursor: pointer;
   color: white !important;
+  background-size: 200% 100%;
 }
 
-.buttonGradient:hover {filter: brightness(1.2);}
+.buttonGradient:hover {background-position-x: 100%;}
 
 #cboxLoadedContent input[type="submit"] {margin-bottom: 20px; float: none;}