summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Hammerl <fhammerl@thoughtworks.com>2016-04-13 17:55:05 +0200
committerFelix Hammerl <fhammerl@thoughtworks.com>2016-04-13 17:55:05 +0200
commit596f817d452a10da889fbfbbd7a2c74522a80a3e (patch)
tree4a215e3829aca44e371f6cfe37e81999f0579464
parentbf521f95e9149d8a0bd840f1c43b7a093dbaa31b (diff)
Re-apply changes from 373c9e0
-rw-r--r--web-ui/app/scss/views/_navigation.scss46
1 files changed, 29 insertions, 17 deletions
diff --git a/web-ui/app/scss/views/_navigation.scss b/web-ui/app/scss/views/_navigation.scss
index 49600c05..9d98d9e8 100644
--- a/web-ui/app/scss/views/_navigation.scss
+++ b/web-ui/app/scss/views/_navigation.scss
@@ -24,6 +24,11 @@
bottom: 33px;
}
+ header {
+ border-bottom: 1px solid white;
+ margin-bottom: 10px;
+ }
+
#user-settings-close {
float: right;
}
@@ -34,6 +39,14 @@
line-height: 1.2em;
}
+ h2 {
+ font-size: 1.1em;
+ color: white;
+ line-height: 1.1em;
+ display: inline;
+ margin-left: 5px;
+ }
+
i.fa-user {
margin-right: 10px;
float: left;
@@ -46,7 +59,7 @@
}
p {
- font-size: 1.2em;
+ font-size: 1.1em;
color: $light_orange;
}
}
@@ -366,19 +379,19 @@ div.side-nav-bottom {
}
ul#default-tag-list {
-// .unread-count, .total-count {
-// font-size: 0.5em;
-// padding: 1px 5px 0;
-// top: 1px;
-// left: 0;
-// border: 1px solid $white;
-// position: absolute;
-// opacity: 0.95;
-// }
-//
-// .total-count {
-// background: $medium_light_grey;
-// }
+ // .unread-count, .total-count {
+ // font-size: 0.5em;
+ // padding: 1px 5px 0;
+ // top: 1px;
+ // left: 0;
+ // border: 1px solid $white;
+ // position: absolute;
+ // opacity: 0.95;
+ // }
+ //
+ // .total-count {
+ // background: $medium_light_grey;
+ // }
.unread-count, .total-count {
font-size: 0.7em;
@@ -578,10 +591,9 @@ div.side-nav-bottom {
}
.unread-count {
- @include mail-count($secondary_callout);
+ @include mail-count($secondary_callout);
}
.total-count {
- @include mail-count($medium_light_grey);
+ @include mail-count($medium_light_grey);
}
-