Skip to content

Commit 510d42b

Browse files
author
Dmytro Lukianenko
committed
[UPD] update main icons to tabler
1 parent c2bfdd2 commit 510d42b

7 files changed

Lines changed: 489 additions & 125 deletions

File tree

‎core/src/Controllers/Frame.php‎

Lines changed: 120 additions & 25 deletions
Large diffs are not rendered by default.

‎manager/media/style/default/chunks/welcome/Widget.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="[+cols+]" id="[+id+]">
22
<div class="card"[+cardAttr+]>
3-
<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>
3+
<div class="card-header"[+headAttr+]> [+icon_html+] [+title+] </div>
44
<div class="card-block"[+bodyAttr+]> [+body+] </div>
55
</div>
66
</div>

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

Lines changed: 133 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,18 @@
6262
}
6363
#mainMenu .nav > li.active > a {
6464
color: #fff;
65-
background-color: rgba(255, 255, 255, 0.07);
65+
background-color: transparent;
66+
}
67+
#mainMenu #nav #site::before {
68+
content: none !important;
69+
display: none !important;
70+
background: none !important;
71+
}
72+
#mainMenu #nav #bars.active > a,
73+
#mainMenu #nav #bars.hover > a,
74+
#mainMenu.show #nav #bars.hover > a {
75+
background-color: transparent;
76+
color: inherit;
6677
}
6778
#mainMenu .nav > li > a,
6879
#mainMenu .nav .label_searchid {
@@ -113,28 +124,104 @@
113124
vertical-align: top;
114125
}
115126
#mainMenu #nav > li > a > .fa {
116-
display: none;
127+
display: inline-block;
128+
font-size: 20px;
129+
line-height: 20px;
130+
}
131+
#mainMenu #nav > li > a > svg {
132+
display: inline-block;
133+
width: 20px;
134+
height: 20px;
135+
}
136+
#mainMenu .menu-icon-evo {
137+
display: inline-flex;
138+
align-items: center;
139+
justify-content: center;
140+
width: 20px;
141+
height: 20px;
142+
}
143+
#mainMenu .menu-icon-evo svg {
144+
width: 20px;
145+
height: 20px;
146+
display: block;
147+
}
148+
#mainMenu #nav > li > a,
149+
#mainMenu #settings > li > a {
150+
display: flex;
151+
align-items: center;
152+
gap: 0.45rem;
153+
}
154+
#mainMenu #nav > li > a > .fa,
155+
#mainMenu #nav > li > a > svg {
156+
margin-right: 0;
157+
line-height: 1;
158+
}
159+
#mainMenu #settings > li > a .username {
160+
line-height: 1;
161+
}
162+
#mainMenu #settings > li > a .icon:not(.photo) {
163+
margin: 0;
164+
width: 20px;
165+
height: 20px;
166+
line-height: 20px;
167+
display: inline-flex;
168+
align-items: center;
169+
justify-content: center;
170+
}
171+
#mainMenu #settings > li > a .icon:not(.photo) svg {
172+
width: 20px;
173+
height: 20px;
174+
display: block;
175+
}
176+
#mainMenu #nav > li > a .menu-item-text {
177+
line-height: 1;
117178
}
118179
#mainMenu #nav #bars {
119-
width: 3.5rem;
180+
width: 2.75rem;
120181
text-align: center;
121182
}
122183
#mainMenu #nav #bars a {
123184
padding: 0;
185+
justify-content: center;
124186
}
125187
#mainMenu #nav #bars .fa {
126188
display: inline-block;
127-
min-width: 0.25rem;
128-
width: 1.5rem;
189+
min-width: 20px;
190+
width: 20px;
129191
margin: 0;
130192
text-align: center;
131193
overflow: hidden;
132194
-webkit-transition-duration: 0.15s;
133195
transition-duration: 0.15s;
134196
}
135197
.sidebar-closed #mainMenu #nav #bars .fa {
136-
width: 0.25rem;
198+
width: 20px;
137199
}
200+
#mainMenu #nav #bars svg {
201+
display: inline-block;
202+
min-width: 20px;
203+
width: 20px;
204+
height: 20px;
205+
margin: 0;
206+
text-align: center;
207+
overflow: hidden;
208+
-webkit-transition-duration: 0.15s;
209+
transition-duration: 0.15s;
210+
}
211+
.sidebar-closed #mainMenu #nav #bars svg {
212+
width: 20px;
213+
height: 20px;
214+
}
215+
#mainMenu #nav #bars .icon-expand,
216+
#mainMenu #nav #bars .icon-collapse {
217+
display: inline-flex;
218+
align-items: center;
219+
justify-content: center;
220+
}
221+
body:not(.sidebar-closed) #bars .icon-expand { display: none !important; }
222+
body:not(.sidebar-closed) #bars .icon-collapse { display: inline-block !important; }
223+
body.sidebar-closed #bars .icon-expand { display: inline-block !important; }
224+
body.sidebar-closed #bars .icon-collapse { display: none !important; }
138225
#mainMenu #system > a > .fa {
139226
font-size: 1.1rem;
140227
}
@@ -222,10 +309,28 @@
222309
#mainMenu .nav > li > ul > li .fa {
223310
width: 1.3em;
224311
margin-right: 0.5em;
225-
font-size: 0.875rem;
226-
line-height: 0.8rem;
312+
font-size: 1rem;
313+
line-height: 1rem;
227314
text-align: center;
228-
vertical-align: baseline;
315+
vertical-align: middle;
316+
}
317+
#mainMenu .nav > li > ul > li > a > svg:first-child {
318+
margin-right: 0.5em;
319+
vertical-align: middle;
320+
}
321+
#mainMenu .nav > li > ul > li > a > svg {
322+
width: 1rem;
323+
height: 1rem;
324+
}
325+
#mainMenu .nav > li > ul > li .arrow svg,
326+
#mainMenu .nav > li > ul > li .toggle svg,
327+
#mainMenu .nav > li > ul > li > a .arrow svg,
328+
#mainMenu .nav > li > ul > li svg.toggle,
329+
#mainMenu .nav > li > ul > li svg.arrow,
330+
#mainMenu .nav > li > ul > li svg[class*="chevron"],
331+
#mainMenu .nav > li > ul > li svg[class*="angle"] {
332+
width: 0.7em;
333+
height: 0.7em;
229334
}
230335
#mainMenu .nav > li > ul > li.selected a:first-child::before,
231336
#main .evo-tab-row .tab.changed::before {
@@ -484,7 +589,7 @@
484589
top: 2.5rem;
485590
}
486591
#mainMenu #nav #site a {
487-
margin-left: 9.25rem;
592+
margin-left: 0;
488593
}
489594
body.lightness #mainMenu #nav #site::before {
490595
content: "";
@@ -535,7 +640,7 @@
535640
font-size: 0.875rem;
536641
}
537642
#mainMenu #nav > li > a {
538-
padding: 0 1.25rem;
643+
padding: 0 1rem;
539644
}
540645
#mainMenu #nav > li > a > .fa {
541646
display: none;
@@ -565,7 +670,7 @@
565670
}
566671
@media (max-width: 1020px) {
567672
#mainMenu #nav #bars {
568-
width: 3rem;
673+
width: 2.5rem;
569674
}
570675
.nav > li > a,
571676
#mainMenu .nav > li > ul > li > a,
@@ -579,7 +684,7 @@
579684
display: none;
580685
}
581686
#mainMenu #nav #bars {
582-
width: 2.5rem;
687+
width: 2.25rem;
583688
}
584689
#mainMenu .nav > li {
585690
position: static;
@@ -808,6 +913,9 @@
808913
.navbar-left #mainMenu #nav > li > a > .fa {
809914
display: inline-block;
810915
}
916+
.navbar-left #mainMenu #nav > li > a > svg {
917+
display: inline-block;
918+
}
811919
.navbar-left #mainMenu #nav > li > a > .fa,
812920
.navbar-left #mainMenu #searchform .fa,
813921
.navbar-left #mainMenu #preview .fa,
@@ -816,6 +924,15 @@
816924
.navbar-left #mainMenu #system > a > .fa {
817925
font-size: 0.875rem;
818926
}
927+
.navbar-left #mainMenu #nav > li > a > svg,
928+
.navbar-left #mainMenu #searchform svg,
929+
.navbar-left #mainMenu #preview svg,
930+
.navbar-left #mainMenu #nav > li > svg,
931+
.navbar-left #mainMenu #nav > li > a > svg,
932+
.navbar-left #mainMenu #system > a > svg {
933+
width: 0.875rem;
934+
height: 0.875rem;
935+
}
819936
.navbar-left #mainMenu .nav > li > ul,
820937
.navbar-left #mainMenu #settings.nav > li > ul {
821938
left: 3rem;
@@ -887,6 +1004,9 @@
8871004
.navbar-left #mainMenu #nav #site a i {
8881005
display: none;
8891006
}
1007+
.navbar-left #mainMenu #nav #site a svg {
1008+
display: none;
1009+
}
8901010
.navbar-left #mainMenu #searchform input,
8911011
.navbar-left #mainMenu #searchform .mask {
8921012
left: 0;

‎manager/media/style/default/css/tree.css‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
#treeloader .fa { font-size: 1em; }
55
#treeloader.visible { opacity: 0.7; visibility: visible; -webkit-transition-duration: 0s; transition-duration: 0s }
66
.treeframebody { height: 100%; min-height: calc(100% + 1px); background-color: #fafafa; border-right: 1px solid #cfd2d6; }
7-
#treeMenu { display: table; width: 100%; height: 1.875rem; table-layout: fixed; margin-top: -1px; background-color: #dfdfdf; border-bottom: 1px solid #cfd2d6 }
8-
#treeMenu .treeButton { display: table-cell; cursor: pointer; height: 1.875rem; white-space: nowrap; text-align: center; vertical-align: middle; -webkit-transition-duration: 0.15s; transition-duration: 0.15s }
7+
#treeMenu { display: flex; align-items: center; gap: 0.4rem; width: 100%; height: 1.875rem; margin-top: -1px; padding: 0 0.4rem; background-color: #dfdfdf; border-bottom: 1px solid #cfd2d6 }
8+
#treeMenu .treeButton { display: inline-flex; align-items: center; justify-content: flex-start; flex: 0 0 auto; cursor: pointer; height: 1.875rem; padding: 0 0.35rem; white-space: nowrap; text-align: left; vertical-align: middle; -webkit-transition-duration: 0.15s; transition-duration: 0.15s }
99
#treeMenu .treeButton:hover:not(.disabled) { background-color: rgba(255, 255, 255, .5); cursor: pointer; -webkit-transition-duration: 0s; transition-duration: 0s }
1010
#treeMenu .treeButton:not(.disabled):active { background-color: #d5d5d5 }
11-
#treeMenu .treeButton .fa { display: block; width: 1.2em; height: 1.2em; margin: auto; line-height: 1.3em; font-size: 1.1em; }
11+
#treeMenu .treeButton .fa { display: block; width: 1rem; height: 1rem; margin: 0; line-height: 1rem; font-size: 1rem; }
12+
#treeMenu .treeButton svg { display: block; width: 1rem; height: 1rem; }
1213
#treeMenu .treeButton.disabled { color: #777; opacity: 0.5 }
1314
#treeHolder { position: relative; z-index: 1; cursor: default; overflow: auto; height: 100%; max-height: calc(100% - 30px); white-space: nowrap; padding-bottom:10px; }
1415
#treeHolder .rootNode { position: relative; }

0 commit comments

Comments
 (0)