Commit c934b663 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3239 Reworking CSS and HTML theme

parent d24ffe14
#menucell {
border:1px solid #AAA;
border:none;
width:140px;
background-color:white;
vertical-align:top;
}
/* Side menu */
p.menuheader {
ul.menu, ul.menu ul {
margin:0;
padding:0;
list-style-type:none;
}
ul.menu li > a {
display:block;
}
ul.menu > li {
border:1px solid #AAA;
margin-bottom:5px;
padding-bottom:3px;
}
ul.menu > li > a {
font-family:arial,helvetica,sans-serif;
font-size:12px;
font-weight:bold;
color:#00008F;
text-decoration:none;
border-bottom:1px solid #AAA;
font-weight:bold;
background-color:#dbe6c6;
font-size:12px;
text-align:center;
vertical-align:middle;
padding:5px;
margin-top:0.8em;
margin-bottom:3px;
border-top:1px solid #AAA;
padding-bottom:5px;
padding-top:5px;
}
p.menuheader:first-child {
border-top:none;
margin-top:0;
}
p.menuitem {
font-family:arial,helvetica,sans-serif;
ul.menu ul > li > a {
color:#00008F;
text-decoration:none;
font-weight:normal;
font-size:12px;
text-align:left;
vertical-align:middle;
margin:2px 0px;
background-color:#FFF;
padding-top:2px;
padding-bottom:2px;
transition:box-shadow .5s ease, background .5s ease;
}
html.rtl p.menuitem {
html.ltr ul.menu ul > li > a {
text-align:left;
padding-left:15px;
}
html.rtl ul.menu ul > li > a {
text-align:right;
padding-right:15px;
}
p.menuitem.menucurrent {
.menuitem.menucurrent {
background-color:#E5F5D5;
box-shadow:0px 0px 2px black inset;
}
p.menuitem:hover {
.menuitem:hover {
background-color:#F0F0F0;
box-shadow:0px 0px 2px black inset;
}
p.menuitem a {
padding-top:2px;
padding-bottom:2px;
display:block;
}
html.rtl p.menuitem a {
padding-left:5px;
padding-right:15px;
.menuitem a:link, .menuitem a:visited {
text-decoration:none;
color:#00008f;
}
html.ltr p.menuitem a {
padding-left:15px;
padding-right:5px;
.menuitem a:hover {
text-decoration:none;
}
/* Main menu */
......@@ -104,20 +111,6 @@ border-left:1px solid #AAAAAA;
float:right;
}
p.menuitem a:link {
text-decoration:none;
color:#00008f;
}
p.menuitem a:visited {
text-decoration:none;
color:#00008f;
}
p.menuitem a:hover {
text-decoration:none;
}
.iconmenu {
cursor:pointer;
display:inline-block;
......
......@@ -668,10 +668,11 @@ color:#000;
@media (max-width: 640px) {
div.setup_header {
padding:2px;
height:36px;
}
a.maintitlebar {
width:34px;
height:34px;
width:36px;
height:36px;
overflow:hidden;
display:inline-block;
}
......@@ -683,7 +684,6 @@ color:#000;
html.rtl a.maintitlebar {
float:right;
margin:0;
padding:0;
}
a.maintitlebar img {
padding:6px;
......@@ -699,14 +699,14 @@ color:#000;
float:left;
}
html.ltr div#header_left, html.rtl div#header_left {
height:34px;
height:40px;
width:100%;
float:none;
}
html.ltr div#header_right, html.rtl div#header_right {
padding-top:8px;
height:26px;
margin-top:-34px;
height:30px;
margin-top:-40px;
width:100%;
float:none;
}
......@@ -721,19 +721,17 @@ color:#000;
hyphens:none;
overflow:hidden;
white-space: nowrap;
padding-top:0;
padding-bottom:0;
padding-top:2px;
padding-bottom:2px;
font-size:1em;
}
html.ltr div#header_left .plugtop {
margin:0;
padding-left:0;
padding-right:5px;
padding-left:6px;
}
html.rtl div#header_left .plugtop {
margin:0;
padding-left:5px;
padding-right:0;
padding-right:6px;
}
div.logout-label {
display:inline-block;
......
......@@ -298,10 +298,11 @@ class pluglist {
function gen_menu()
{
if ($this->menu == "") {
$this->menu = '<ul class="menu">';
/* Parse headlines */
foreach ($this->config->data['SECTIONS'] as $section => $section_infos) {
$menu = '<p class="menuheader">'.$section_infos['NAME']."</p>\n";
$entries = "";
//~ $menu = '<p class="menuheader">'.$section_infos['NAME']."</p>\n";
$entries = '';
/* Parse sub-plugins */
foreach ($this->config->data['MENU'][$section] as $info) {
......@@ -340,8 +341,8 @@ class pluglist {
$this->allowed_plugins[$index] = $index;
$entries = $entries.'<p class="menuitem" id="menuitem_'.$info['CLASS'].'">';
$entries .= "<a href=\"$href\">$plHeadline</a></p>\n";
$entries .= '<li class="menuitem" id="menuitem_'.$info['CLASS'].'">';
$entries .= '<a href="'.$href.'">'.$plHeadline.'</a></li>'."\n";
if (!session::is_set('maxC')) {
session::set('maxC', "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
......@@ -351,7 +352,7 @@ class pluglist {
/* Append to menu */
if ($entries != "") {
$this->menu .= $menu.$entries;
$this->menu .= '<li><a>'.$section_infos['NAME']."</a>\n<ul>\n".$entries."\n</ul></li>\n";
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment