Skip to content

Commit a6a2a95

Browse files
author
Dmytro Lukianenko
committed
[UPD] finish with new left menu
1 parent 6440598 commit a6a2a95

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

manager/media/style/default/css/custom.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,15 @@ table.actionButtons .searchtext { padding: 5px; height: 24px; width: 150px; }
155155
.table.data .actions { white-space: nowrap }
156156
.table.data .actions a { color: #555 }
157157
.table.data .actions a .fa, .table.data .actions span .fa { position: relative; margin: 0 0.375rem; font-size: 0.9rem; color: #555 }
158+
.table.data .actions a .action-icon, .table.data .actions span .action-icon { position: relative; margin: 0 0.375rem; display: inline-flex; align-items: center; justify-content: center; width: 1.5rem; height: 1.5rem; pointer-events: none; }
159+
.table.data .actions a .action-icon svg, .table.data .actions span .action-icon svg { width: 0.9rem; height: 0.9rem; display: block; color: #555; pointer-events: none; }
158160
.table.data .actions a:hover .fa { color: #000; }
161+
.table.data .actions a:hover .action-icon svg { color: #000; }
159162
.table.data .actions a:hover .fa.fa-trash { color: #d80030 }
163+
.table.data .actions a:hover .action-icon.action-icon-trash svg { color: #d80030 }
160164
.table.data .actions a .fa::before { position: relative; z-index: 2; }
161-
.table.data .actions a .fa::after { content: ""; position: absolute; z-index: 1; left: 50%; top: 50%; width: 1.5rem; height: 1.5rem; margin: -0.75rem 0 0 -0.75rem; border-radius: 50%; -webkit-transition: 0.15s; transition: 0.15s; }
162-
.table.data .actions a:hover .fa::after { background-color: #fff }
165+
.table.data .actions a .fa::after, .table.data .actions a .action-icon::after { content: ""; position: absolute; z-index: 1; left: 50%; top: 50%; width: 1.5rem; height: 1.5rem; margin: -0.75rem 0 0 -0.75rem; border-radius: 50%; -webkit-transition: 0.15s; transition: 0.15s; }
166+
.table.data .actions a:hover .fa::after, .table.data .actions a:hover .action-icon::after { background-color: transparent }
163167
.table.data .actions .disabled { visibility: hidden }
164168
/* table-data-nowrap */
165169
.table.data.nowrap th, .table.data.nowrap td { white-space: nowrap }
@@ -218,7 +222,7 @@ ul.breadcrumbs span::after { margin-left: 2em; font-family: 'Font Awesome 5 Free
218222
.widgets .table:not(.data) tr th, .widgets .table:not(.data) tr td { padding: .15rem; }
219223
.widgets .table tr th:first-child, .widgets .table tr td:first-child { padding-left: 1rem !important }
220224
.widgets .table tr th:last-child, .widgets .table tr td:last-child { padding-right: 1rem !important }
221-
.widgets .table .actions a .fa { margin: 0 .05rem; }
225+
.widgets .table .actions a .fa, .widgets .table .actions a .action-icon { margin: 0 .05rem; }
222226
/* widgets custom */
223227
.widgets #welcome .wm_buttons { display: -ms-flexbox; display: flex; -ms-flex-wrap: wrap; flex-wrap: wrap; margin-bottom: 1rem; padding: 0; text-align: center; border-bottom: 1px solid rgba(0, 0, 0, .05); }
224228
.widgets #welcome .wm_button { max-width: 50%; flex: 0 0 50%; }
@@ -359,10 +363,11 @@ ul.sortableList li.ghost { z-index: 2; box-shadow: 0 0.25rem 1.5rem rgba(0, 0, 0
359363
.darkness .table.data tr > td:last-child, .darkness .table.data tr > th:last-child, .darkness .grid tr > td:last-child, .darkness .grid > tr > th:last-child { padding-right: 1.25rem !important; }
360364
.darkness table.table.table--edit > tbody > tr > th, .darkness table.table.table--edit > tbody > tr > td, .darkness form[name="settings"] table > tbody td, .darkness form[name="settings"] table > tbody th {
361365
padding: .25rem .5rem; background: none; border: none !important; color: inherit; }
362-
.darkness .table.data .actions a, .darkness .table.data .actions a .fa, .darkness .table.data .actions span .fa { color: inherit; }
366+
.darkness .table.data .actions a, .darkness .table.data .actions a .fa, .darkness .table.data .actions span .fa, .darkness .table.data .actions a .action-icon svg { color: inherit; }
363367
.darkness .table.data .actions a:hover .fa::before { color: #eee; }
364-
.darkness .table.data .actions a:hover .fa::after { background-color: #3b414e; }
365-
.darkness .table.data .actions a:hover .fa.fa-trash::before { color: #d80030; }
368+
.darkness .table.data .actions a:hover .action-icon svg { color: #eee; }
369+
.darkness .table.data .actions a:hover .fa::after, .darkness .table.data .actions a:hover .action-icon::after { background-color: transparent; }
370+
.darkness .table.data .actions a:hover .fa.fa-trash::before, .darkness .table.data .actions a:hover .action-icon.action-icon-trash svg { color: #d80030; }
366371
.darkness table .split, .darkness table.table.table--edit > tbody > tr, .darkness .sysSettings > tbody > tr { border: none; border-bottom: 1px solid #23262b !important; }
367372
.darkness table .split { margin: 0 -.5rem; }
368373
.darkness table tr.noborder { border: none !important; }

manager/media/style/default/css/mainmenu.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,13 @@
138138
align-items: center;
139139
justify-content: center;
140140
width: 20px;
141-
height: 20px;
141+
height: 20px !important;
142142
pointer-events: none;
143+
vertical-align: middle;
144+
align-self: center;
145+
}
146+
#mainMenu #nav #site a .icon.menu-icon-evo {
147+
margin: 0;
143148
}
144149
#mainMenu .menu-icon-evo svg {
145150
width: 20px;
@@ -999,6 +1004,9 @@ body.sidebar-closed #bars .icon-collapse { display: none !important; }
9991004
margin-top: 0;
10001005
margin-left: 0;
10011006
}
1007+
.navbar-left #mainMenu .menu-icon-evo {
1008+
height: auto !important;
1009+
}
10021010
.navbar-left #mainMenu #nav #bars {
10031011
width: 100%;
10041012
}

manager/media/style/default/snippets/welcome/RecentInfo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</tr>';
4444

4545
$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main">' . $_style['icon_edit'] . '</a> ';
46-
$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]">' . $_style['icon_eye'] . '</a> ';
46+
$btntpl['preview_btn'] = '<a class="[+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]">' . $_style['icon_eye'] . '</a> ';
4747

4848
$output = array();
4949
foreach ($contents->get()->toArray() as $ph) {
@@ -67,7 +67,7 @@
6767
$ph['edit_btn'] = '';
6868
}
6969

70-
$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';
70+
$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';
7171
$ph['preview_btn'] = str_replace(array(
7272
'[+id+]',
7373
'[+preview_disabled+]'

0 commit comments

Comments
 (0)