darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor markup

Browse Source 
Strips it down to only what’s necessary

As a separate commit for easier diffing.
This commit is contained in:
Chris Hill-Scott
2016-01-11 16:20:32 +00:00
parent 934ce51f2c
commit 732efd25c7
2 changed files with 25 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/assets/stylesheets/components/switcher.scss
View File

@@ -1,67 +1,27 @@
.management-navigation {
#user-bar { @extend %site-width-container;
border-bottom: 1px solid #bfc1c3;
max-width: 960px;
margin: 0 15px;
@include core-19(); @include core-19();
padding: 10px 0 8px 0; border-bottom: 1px solid $border-colour;
padding: 10px 0 8px;
a:link, a:link,
a:visited { a:visited {
text-decoration: none; text-decoration: none;
} }
span a:hover { &-account {
color: $link-hover-colour;
} @include media(tablet) {
text-align: right;
a {
margin-left: 20px;
}
}
} }
@media (min-width: 641px) {
#user-bar {
margin: 0 30px;
line-height: 1.25; } }
@media (min-width: 1020px) {
#user-bar {
margin: 0 auto; } }
#service-switcher {
}
#user-name {
margin: 0 20px 0 0;
}
#user-admin {
}
@media (min-width: 641px) {
#user-admin {
display: block;
float: right;
} }
#service-nav {
// display: none;
@include core-19();
list-style: none;
ul li {
display: block;position: relative;float: left;
}
} }
#service-arrow-right {
display:none;
}

24
app/templates/admin_template.html
View File

@@ -48,22 +48,18 @@
{% block content %} {% block content %}
{% if current_user.is_authenticated() %} {% if current_user.is_authenticated() %}
<nav id="user-bar"> <nav class="management-navigation">
<span id="service-switcher"> <div class="grid-row">
<a id="toggle-service-switcher" href="#"> <div class="column-half">
<span id="service-arrow-right">&blacktriangleright;</span>
<span id="service-arrow-down">&blacktriangledown;</span>
Service name Service name
</a> <a href="#">Switch to A N Other service</a>
</span> <a href="#">Add a new service to Notify…</a>
<div id="user-admin"> </div>
<span id="user-name"><a href="{{ url_for('.userprofile') }}">{{ current_user.name }}</a></span> <div class="column-half management-navigation-account">
<span id="sign-out"><a href="{{ url_for('main.sign_out')}}">Sign out</a></span> <a href="{{ url_for('.userprofile') }}">{{ current_user.name }}</a>
<a href="{{ url_for('main.sign_out')}}">Sign out</a>
</div>
</div> </div>
<ul id="service-nav">
<li><a href="#">Switch to A N Other service</a></li>
<li><a href="#">Add a new service to Notify</a></li>
</ul>
</nav> </nav>
{% endif %} {% endif %}