Skip to content

Commit 2eb6e2d

Browse files
arhimedearhimede
authored
Merge pull request #213 from dotkernel/issue-208
Issue 208
2 parents 3ad1166 + 542c15b commit 2eb6e2d

10 files changed

Lines changed: 3150 additions & 99 deletions

File tree

‎public/css/app.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/fonts/fontawesome-webfont.svg‎

Lines changed: 2671 additions & 1 deletion
Loading

‎public/fonts/themify.svg‎

Lines changed: 362 additions & 1 deletion
Loading

‎public/images/app/min-logo.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎public/js/app.js‎

Lines changed: 25 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App/assets/images/logo-dark.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/App/assets/images/logo-light.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/App/assets/images/min-logo.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/App/assets/scss/components/sidebar.scss‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
list-style-type: none;
2727
}
2828

29+
#full-logo {
30+
display: block;
31+
width: 170px;
32+
}
33+
#min-logo {
34+
display: none;
35+
}
36+
2937
@include between($breakpoint-md, $breakpoint-xl) {
3038
width: $collapsed-size;
3139

@@ -140,8 +148,7 @@
140148
background-repeat: no-repeat;
141149
display: inline-block;
142150
min-height: calc(#{$header-height} - 1px);
143-
width: 100%;
144-
width: 70px;
151+
width: fit-content;
145152
}
146153

147154
.logo-text {
@@ -326,14 +333,22 @@
326333
// ---------------------------------------------------------
327334

328335
.is-collapsed {
336+
#full-logo {
337+
display: none;
338+
}
339+
#min-logo {
340+
display: block;
341+
height: 34.5px;
342+
margin: 0 auto;
343+
}
329344
.sidebar {
330345
@include from($breakpoint-xl) {
331346
width: $collapsed-size;
332347

333348
.sidebar-inner {
334349
.sidebar-logo {
335350
border-bottom: 1px solid transparent;
336-
padding: 0;
351+
padding: 0 0 0 20px;
337352
}
338353

339354
.sidebar-menu {

‎src/App/templates/partial/left-menu.html.twig‎

Lines changed: 71 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
1-
<div class="sidebar">
2-
<div class="sidebar-inner">
3-
<div class="sidebar-logo">
4-
<div class="peers ai-c fxw-nw">
5-
<div class="peer peer-greed">
6-
<a class="sidebar-link td-n" href="">
7-
<div class="peers ai-c fxw-nw">
8-
<div class="peer">
9-
<div class="logo d-flex align-items-center">
10-
<img src="{{ asset('images/app/logo.svg') }}" alt="DotKernel">
11-
</div>
12-
</div>
13-
<div class="peer peer-greed">
14-
<h5 class="lh-1 mB-0 logo-text"></h5>
15-
</div>
16-
</div>
17-
</a>
18-
</div>
19-
<div class="peer">
20-
<div class="mobile-toggle sidebar-toggle">
21-
<a href="" class="td-n">
22-
<i class="ti-arrow-circle-left"></i>
23-
</a>
24-
</div>
25-
</div>
26-
</div>
27-
</div>
28-
<ul class="sidebar-menu scrollable pos-r">
29-
<li class="nav-item mT-30 actived">
30-
<a class="sidebar-link" href="{{ path('dashboard') }}">
31-
<span class="icon-holder">
32-
<i class="c-blue-500 ti-home"></i>
33-
</span>
34-
<span class="title">Dashboard</span>
35-
</a>
36-
</li>
37-
<li class="nav-item dropdown">
38-
<a class="dropdown-toggle" href="javascript:void(0);">
39-
<span class="icon-holder">
40-
<i class="c-teal-500 ti-view-list-alt"></i>
41-
</span>
42-
<span class="title">Manage Admins</span>
43-
<span class="arrow">
44-
<i class="ti-angle-right"></i>
45-
</span>
46-
</a>
47-
<ul class="dropdown-menu">
48-
<li class="nav-item dropdown">
49-
<a href="{{ path('admin', { action : 'manage' }) }}">
50-
<span>List</span>
51-
</a>
52-
</li>
53-
<li class="nav-item dropdown">
54-
<a href="{{ path('admin', { action : 'logins' }) }}">
55-
<span>View logins</span>
56-
</a>
57-
</li>
58-
</ul>
59-
</li>
60-
<li class="nav-item dropdown">
61-
<a class="sidebar-link" href="{{ path('page', { action : 'components' }) }}">
62-
<span class="icon-holder">
63-
<i class="c-pink-500 ti-palette"></i>
64-
</span>
65-
<span class="title">Components</span>
66-
</a>
67-
</li>
68-
</ul>
69-
</div>
70-
</div>
1+
<div class="sidebar">
2+
<div class="sidebar-inner">
3+
<div class="sidebar-logo">
4+
<div class="peers ai-c fxw-nw">
5+
<div class="peer peer-greed">
6+
<a class="sidebar-link td-n" href="">
7+
<div class="peers ai-c fxw-nw">
8+
<div class="peer">
9+
<div class="logo d-flex align-items-center">
10+
<img id="min-logo" src="{{ asset('images/app/min-logo.svg') }}" alt="DotKernel">
11+
<img id="full-logo" src="{{ asset('images/app/logo.svg') }}" alt="DotKernel">
12+
</div>
13+
</div>
14+
<div class="peer peer-greed">
15+
<h5 class="lh-1 mB-0 logo-text"></h5>
16+
</div>
17+
</div>
18+
</a>
19+
</div>
20+
<div class="peer">
21+
<div class="mobile-toggle sidebar-toggle">
22+
<a href="" class="td-n">
23+
<i class="ti-arrow-circle-left"></i>
24+
</a>
25+
</div>
26+
</div>
27+
</div>
28+
</div>
29+
<ul class="sidebar-menu scrollable pos-r">
30+
<li class="nav-item mT-30 actived">
31+
<a class="sidebar-link" href="{{ path('dashboard') }}">
32+
<span class="icon-holder">
33+
<i class="c-blue-500 ti-home"></i>
34+
</span>
35+
<span class="title">Dashboard</span>
36+
</a>
37+
</li>
38+
<li class="nav-item dropdown">
39+
<a class="dropdown-toggle" href="javascript:void(0);">
40+
<span class="icon-holder">
41+
<i class="c-teal-500 ti-view-list-alt"></i>
42+
</span>
43+
<span class="title">Manage Admins</span>
44+
<span class="arrow">
45+
<i class="ti-angle-right"></i>
46+
</span>
47+
</a>
48+
<ul class="dropdown-menu">
49+
<li class="nav-item dropdown">
50+
<a href="{{ path('admin', { action : 'manage' }) }}">
51+
<span>List</span>
52+
</a>
53+
</li>
54+
<li class="nav-item dropdown">
55+
<a href="{{ path('admin', { action : 'logins' }) }}">
56+
<span>View logins</span>
57+
</a>
58+
</li>
59+
</ul>
60+
</li>
61+
<li class="nav-item dropdown">
62+
<a class="sidebar-link" href="{{ path('page', { action : 'components' }) }}">
63+
<span class="icon-holder">
64+
<i class="c-pink-500 ti-palette"></i>
65+
</span>
66+
<span class="title">Components</span>
67+
</a>
68+
</li>
69+
</ul>
70+
</div>
71+
</div>

0 commit comments

Comments
 (0)