diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-11-29 11:29:43 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-11-29 11:29:43 +0200 |
commit | 5d8462ca11abcbfd19bef6c1a46d9eb6266990df (patch) | |
tree | 3b4aa2354e46c2a15dacabffc39769511b69ef00 /client/components/main/header.styl | |
parent | 7e4b42e9b3482460cac77a603809a8b5d4016477 (diff) | |
parent | c31d7455f7b7de4198ee46c59fe0886c54bf457c (diff) | |
download | wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.tar.gz wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.tar.bz2 wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.zip |
Merge branch 'conflict-resolution-458' of https://github.com/nztqa/wekan into nztqa-conflict-resolution-458
Diffstat (limited to 'client/components/main/header.styl')
-rw-r--r-- | client/components/main/header.styl | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 191e8893..4abc1d55 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -191,11 +191,33 @@ bottom: 0px ul - width: calc(100% - 150px) + width: calc(100% - 60px) overflow: ellipsis + padding: 10px + margin: -10px li - height: 28px + height: 100% + padding: 12px 0px + margin: -10px 0px + + a + height: 100% + padding: 12px 10px + margin: -10px 0px + + .fa-home + font-size: 26px + margin-top: -2px + + #header-new-board-icon + display: none + + #header-user-bar + position: absolute + right: 0px + padding: 10px + margin: -10px .announcement, .offline-warning |