summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/header.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-27 12:46:27 +0100
committerPhil Hughes <me@iamphill.com>2016-06-27 12:46:27 +0100
commite7aa8315af71339ecb6b01ae7da83f3c9b1e1957 (patch)
tree12995b24931ddddd49b6aba0351d8d7b08d2eed0 /app/assets/stylesheets/framework/header.scss
parenta9dbd394a60de76ffd9f5773560c8e9126751d91 (diff)
downloadgitlab-ce-e7aa8315af71339ecb6b01ae7da83f3c9b1e1957.tar.gz
Added user avatar to header
Closes #18543
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
-rw-r--r--app/assets/stylesheets/framework/header.scss21
1 files changed, 15 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c32ce5195c6..0c607071840 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -60,7 +60,7 @@ header {
margin: ($header-height - 28) / 2 0;
margin-left: 10px;
height: 28px;
- width: 28px;
+ min-width: 28px;
line-height: 28px;
text-align: center;
@@ -241,14 +241,23 @@ header {
.navbar-collapse {
padding-left: 5px;
- li {
+ .nav > li {
display: table-cell;
width: 1%;
-
- a {
- margin-left: 8px !important;
- }
}
}
}
}
+
+.header-user {
+ .dropdown-menu-nav {
+ width: 140px;
+ margin-top: -5px;
+ }
+}
+
+.header-user-avatar {
+ float: left;
+ margin-right: 5px;
+ border-radius: 50%;
+}