tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

new header and menu

Browse Source 
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
This commit is contained in:
Tatiana Llorente 2019-02-25 12:28:41 +01:00
parent 4c92375a58
commit 6ec148c59c
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/include/styles/menu.css
View File

@ -51,13 +51,9 @@ li:hover ul {
padding: 10.5px; padding: 10.5px;
margin-left: 0px; margin-left: 0px;
width: 100%; width: 100%;
<<<<<<< HEAD
color: #91a2a7; color: #91a2a7;
font-family: "Open Sans", sans-serif; font-family: "Open Sans", sans-serif;
font-size: 10pt; font-size: 10pt;
=======
color: #fff;
>>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
} }
.menu li.subselected a { .menu li.subselected a {
@ -285,12 +281,6 @@ ul li a:hover {
* - MAIN LEFT MENU and SUBMENU - * - MAIN LEFT MENU and SUBMENU -
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
<<<<<<< HEAD
=======
.menu li.selected {
font-weight: bold;
}
>>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
.menu_icon { .menu_icon {
transition-property: background-color; transition-property: background-color;
@ -320,11 +310,7 @@ ul li a:hover {
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
<<<<<<< HEAD
background-color: #282828 !important; background-color: #282828 !important;
=======
background-color: #585858 !important;
>>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
} }
.submenu_not_selected:hover { .submenu_not_selected:hover {
transition-property: background-color; transition-property: background-color;
@ -339,17 +325,10 @@ ul li a:hover {
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
<<<<<<< HEAD
background-color: #202020 !important; background-color: #202020 !important;
} }
.submenu_selected:hover { .submenu_selected:hover {
background-color: #202020 !important; background-color: #202020 !important;
=======
background-color: #585858 !important;
}
.submenu_selected:hover {
background-color: #585858 !important;
>>>>>>> 01fee147745dfd638487449f20211abd8e83b71e
} }
.sub_subMenu { .sub_subMenu {
transition-property: background-color; transition-property: background-color;

18
pandora_console/include/styles/pandora.css
View File

@ -441,14 +441,6 @@ textarea.conf_error {
background-position: top right; 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 { a.white_bold {
color: #eee; color: #eee;
text-decoration: none; text-decoration: none;
@ -1562,9 +1554,6 @@ table.databox {
font-weight: normal; font-weight: normal;
color: #fff; color: #fff;
} }
.databox > td {
#border-bottom: 1px solid #e2e2e2;
}
.databox > th * { .databox > th * {
color: #fff; color: #fff;
@ -2192,9 +2181,6 @@ div.warn {
min-height: 35px !important; min-height: 35px !important;
} }
ol.steps {
margin-bottom: 70px;
}
div#steps_clean { div#steps_clean {
display: none; display: none;
} }
@ -2990,6 +2976,7 @@ div.nodata_container {
position: absolute; position: absolute;
top: 0; top: 0;
right: 20px; right: 20px;
background: #f9faf9;
} }
#rmf_data { #rmf_data {
@ -4323,9 +4310,6 @@ form ul.form_flex li ul li {
} }
/* snmp */ /* snmp */
#snmp_data {
background: #f9faf9;
}
#snmp_data .databox { #snmp_data .databox {
border: 0px; border: 0px;
} }