Skip to content
This repository has been archived by the owner on May 30, 2019. It is now read-only.

Commit

Permalink
Improvements and bug fixing on admin menu look & feel
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonipinel @rogergros
tonipinel authored and rogergros committed Jun 13, 2015
1 parent 14186ed commit b475146
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/Elcodi/Admin/CoreBundle/Resources/public/css/main.css
View file

Large diffs are not rendered by default.

Binary file modified src/Elcodi/Admin/CoreBundle/Resources/public/images/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 25 additions & 2 deletions src/Elcodi/Admin/CoreBundle/Resources/scss/objects/sidebar/_sidebar.scss
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
.sidebar {
&{
& {
background: map-get($object-navigation-vars, background-color);
overflow: hidden;
z-index: 150;
}
.active {
& > a {
& {
overflow: hidden;
}
&:after {
content: "";
background: $color-body;
height: $spacing*2;
width: $spacing*1.3;
right: -$spacing;
top: 0;
position: absolute;
@include transform(rotate(-45deg));
}
}
}
}

.navigation-vertical {
& {
@include text-shadow(1px 1px 0 rgba($color-foreground,.2));
z-index: 100;
background: map-get($object-navigation-vars, background-color);
}
hr {
border-width: 1px 0 0 0;
Expand Down
78 changes: 39 additions & 39 deletions src/Elcodi/Admin/CoreBundle/Resources/views/Navs/side.html.twig
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,11 @@
{% import "AdminCoreBundle::Navs/side_elements.html.twig" as side_elements %}
{% import "AdminCoreBundle::Navs/side_elements_mobile.html.twig" as side_elements_mobile %}

<div class="sidebar-user desktop">
<div class="ta-c">
<a href="#sidebar-user-dropdown" data-fc-modules="toggle" class="c-foreground-light">
<span class=" tablet va-m">
<img src="{{ gravatar(app.user.email, 40) }}" alt="Avatar" class="image-circle">
</span>
<span class="sidebar-user-info desktop">
<img src="{{ gravatar(app.user.email, 20) }}" alt="Avatar" class="image-circle va-m">
{{ app.user.username }} <i class="icon-caret-down"></i>
</span>
</a>
</div>
<nav id="sidebar-user-dropdown" class="navigation navigation-vertical sidebar-user-dropdown hidden">
<ul>
<li data-test="menu-profile">
<a href="{{ url('admin_admin_user_edit', {id: app.user.id }) }}">
<span class="mobile tablet">
<i class="icon-user fz-xl"></i> {{ 'admin.profile.single'|trans }}
</span>
<span class="desktop">
<i class="icon-user"></i> {{ 'admin.profile.single'|trans }}
</span>
</a>
</li>
<li data-test="menu-logout">
<a href="{{ url('admin_logout') }}">
<span class="mobile tablet">
<i class="icon-sign-out fz-xl"></i> {{ 'admin.login.action.logout'|trans }}
</span>
<span class="desktop">
<i class="icon-sign-out"></i> {{ 'admin.login.action.logout'|trans }}
</span>
</a>
</li>
</ul>
</nav>
</div>
<p class="pa-m mb-n">
<img src="{{ asset('bundles/admincore/images/logo.png') }}" width="130" />
</p>
<nav id="menu" class="navigation navigation-vertical desktop">
<ul>
<hr class="mb-n" />
{{ side_elements.showNodes(menu, 'dashboard', route) }}
{{ side_elements.separator() }}
{{ side_elements.showNodes(menu, 'order', route) }}
Expand All @@ -53,6 +19,40 @@
{{ side_elements.showNodes(menu, 'settings', route) }}
{{ side_elements.separator() }}
{{ side_elements.showNodes(menu, 'extra', route) }}
<li>
<a href="#sidebar-user-dropdown" data-fc-modules="toggle" class="c-background">
<span class=" tablet va-m">
<img src="{{ gravatar(app.user.email, 40) }}" alt="Avatar" class="image-circle">
</span>
<span class="sidebar-user-info desktop">
<i class="icon-caret-down fl-r"></i>
<img src="{{ gravatar(app.user.email, 15) }}" alt="Avatar" class="image-circle va-m">
{{ app.user.username }}
</span>
</a>
<ul id="sidebar-user-dropdown" class="sidebar-user-dropdown hidden">
<li data-test="menu-profile">
<a href="{{ url('admin_admin_user_edit', {id: app.user.id }) }}">
<span class="mobile tablet">
<i class="icon-user fz-xl"></i> {{ 'admin.profile.single'|trans }}
</span>
<span class="desktop">
<i class="icon-angle-right"></i> {{ 'admin.profile.single'|trans }}
</span>
</a>
</li>
<li data-test="menu-logout">
<a href="{{ url('admin_logout') }}">
<span class="mobile tablet">
<i class="icon-sign-out fz-xl"></i> {{ 'admin.login.action.logout'|trans }}
</span>
<span class="desktop">
<i class="icon-angle-right"></i> {{ 'admin.login.action.logout'|trans }}
</span>
</a>
</li>
</ul>
</li>
</ul>
</nav>
<div class="d-n">
Expand Down Expand Up @@ -97,4 +97,4 @@
</li>
</ul>
</nav>
</div>
</div>
2 changes: 1 addition & 1 deletion src/Elcodi/Admin/CoreBundle/Resources/views/Navs/side_elements.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% if node.warnings is not null %}<span class="badge{% if node.warnings > 0 %} badge-alert{% endif %}">{{ node.warnings }}</span>{% endif %}
<span class="mobile tablet">
<i class="icon-{{ node.code|default("folder") }} fz-xl va-m mr-s"></i>
<span class="c-foreground-light">{{ node.name|trans }}</span>
<span>{{ node.name|trans }}</span>
</span>
<span class="desktop">
<i class="icon-{{ node.code|default("folder") }} mr-m"></i>
Expand Down
2 changes: 1 addition & 1 deletion src/Elcodi/Admin/CoreBundle/Resources/views/Navs/side_elements_mobile.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% if node.warnings is not null %}<span class="badge{% if node.warnings > 0 %} badge-alert{% endif %}">{{ node.warnings }}</span>{% endif %}
<span class="mobile tablet">
<i class="icon-{{ node.code|default("folder") }} fz-xl va-m mr-s"></i>
<span class="c-foreground-light">{{ node.name|trans }}</span>
<span>{{ node.name|trans }}</span>
</span>
<span class="desktop">
<i class="icon-{{ node.code|default("folder") }} mr-m"></i>
Expand Down

0 comments on commit b475146

Please sign in to comment.