From 6ec148c59c7980e4b9c792b59480ab3589ad29d3 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Mon, 25 Feb 2019 12:28:41 +0100
Subject: [PATCH] new header and menu

Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
---
 pandora_console/include/styles/menu.css    | 21 ---------------------
 pandora_console/include/styles/pandora.css | 18 +-----------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index d9ba90e604..cf8e88bae7 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -51,13 +51,9 @@ li:hover ul {
   padding: 10.5px;
   margin-left: 0px;
   width: 100%;
-<<<<<<< HEAD
   color: #91a2a7;
   font-family: "Open Sans", sans-serif;
   font-size: 10pt;
-=======
-  color: #fff;
->>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
 }
 
 .menu li.subselected a {
@@ -285,12 +281,6 @@ ul li a:hover {
  * - MAIN LEFT MENU and SUBMENU 									-
  * ---------------------------------------------------------------------
  */
-<<<<<<< HEAD
-=======
-.menu li.selected {
-  font-weight: bold;
-}
->>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
 
 .menu_icon {
   transition-property: background-color;
@@ -320,11 +310,7 @@ ul li a:hover {
   -o-transition-property: background-color;
   -o-transition-duration: 0.5s;
   -o-transition-timing-function: ease-out;
-<<<<<<< HEAD
   background-color: #282828 !important;
-=======
-  background-color: #585858 !important;
->>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
 }
 .submenu_not_selected:hover {
   transition-property: background-color;
@@ -339,17 +325,10 @@ ul li a:hover {
   -o-transition-property: background-color;
   -o-transition-duration: 0.5s;
   -o-transition-timing-function: ease-out;
-<<<<<<< HEAD
   background-color: #202020 !important;
 }
 .submenu_selected:hover {
   background-color: #202020 !important;
-=======
-  background-color: #585858 !important;
-}
-.submenu_selected:hover {
-  background-color: #585858 !important;
->>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
 }
 .sub_subMenu {
   transition-property: background-color;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index bcd011188d..e8e2632188 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -441,14 +441,6 @@ textarea.conf_error {
   background-position: top right;
 }
 
-input.button {
-  font-family: Arial, Sans-serif;
-  border: 4px solid #ccc;
-  background: #fff;
-  padding: 2px 3px;
-  margin: 10px 15px;
-}
-
 a.white_bold {
   color: #eee;
   text-decoration: none;
@@ -1562,9 +1554,6 @@ table.databox {
   font-weight: normal;
   color: #fff;
 }
-.databox > td {
-  #border-bottom: 1px solid #e2e2e2;
-}
 
 .databox > th * {
   color: #fff;
@@ -2192,9 +2181,6 @@ div.warn {
   min-height: 35px !important;
 }
 
-ol.steps {
-  margin-bottom: 70px;
-}
 div#steps_clean {
   display: none;
 }
@@ -2990,6 +2976,7 @@ div.nodata_container {
   position: absolute;
   top: 0;
   right: 20px;
+  background: #f9faf9;
 }
 
 #rmf_data {
@@ -4323,9 +4310,6 @@ form ul.form_flex li ul li {
 }
 
 /* snmp */
-#snmp_data {
-  background: #f9faf9;
-}
 #snmp_data .databox {
   border: 0px;
 }