summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Albo <gabriel@albo.com.br>2015-02-19 16:21:44 -0200
committerAlexandre Pretto Nunes <anunes@thoughtworks.com>2015-02-19 16:41:25 -0200
commit80ad3d158cb4dfe9c4ea8a28a563f8e95c1fba50 (patch)
treea852b185c5e7fc6eb090945ff7846faffa3660ed
parent22dde085dd14e7755f8bd6b16859edac191e2943 (diff)
#239 Fixing logout style and removing duplicated styling
-rw-r--r--web-ui/app/scss/styles.scss31
-rw-r--r--web-ui/app/templates/page/logout.hbs8
2 files changed, 19 insertions, 20 deletions
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index ece48319..952f63cf 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -249,10 +249,9 @@ section {
&#left-pane {
background-color: $secondary;
color: white;
- nav {
- padding-bottom: 25px;
+ nav, nav#logout {
border-right: 1px solid lighten($secondary, 10%);
- ul#default-tag-list, #custom-tag-list, #logout {
+ ul#default-tag-list, #custom-tag-list {
li {
transition: background-color 150ms ease-out;
padding: 2px 10px;
@@ -327,7 +326,6 @@ section {
}
ul#custom-tag-list {
- padding-bottom: 30px;
li {
white-space: nowrap;
overflow: hidden;
@@ -340,21 +338,22 @@ section {
}
}
- ul#logout {
- a {
- color: #000000;
- }
- li {
- color: #000000;
- background-color: $action_buttons;
- padding: 5px 10px;
- position: relative;
- @include searching(4px, 19px, #333, 0.7em);
-
+ ul#logout li {
+ color: $action_buttons;
+ background-color: $secondary;
+ padding: 5px 10px;
+ position: relative;
+ @include searching(4px, 19px, #333, 0.7em);
+
+ div {
+ padding-left: 7px;
&:before {
+ font-size: 1.5em;
font-family: "FontAwesome";
- margin-right: 10px;
+ margin-right: 13px;
font-weight: normal;
+ position: relative;
+ top: 2px;
}
}
}
diff --git a/web-ui/app/templates/page/logout.hbs b/web-ui/app/templates/page/logout.hbs
index a17b3b7e..dd931274 100644
--- a/web-ui/app/templates/page/logout.hbs
+++ b/web-ui/app/templates/page/logout.hbs
@@ -1,8 +1,8 @@
<ul id="logout">
- <li>
- <a title="logout" href={{logout_url}}>
+ <a title="logout" href={{logout_url}}>
+ <li>
<div class="fa fa-sign-out"></div>
<i class="shortcut-label"></i> Logout
- </a>
- </li>
+ </li>
+ </a>
</ul>