projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e2368a7
d270305
)
Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
author
Marcel Werk
<burntime@woltlab.com>
Mon, 11 Jan 2016 22:14:32 +0000
(23:14 +0100)
committer
Marcel Werk
<burntime@woltlab.com>
Mon, 11 Jan 2016 22:14:32 +0000
(23:14 +0100)
1
2
com.woltlab.wcf/templates/pageHeaderUser.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/style/layout/navigation.scss
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/style/ui/message.scss
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/templates/pageHeaderUser.tpl
Simple merge
diff --cc
wcfsetup/install/files/style/layout/navigation.scss
index d8f4b5ca084db1347cb1d5ec88dad193db1fc03d,7461a7d4c557f5c98845d722cdb0e7e06816a09a..38a2a475f9dd945c135b243594b7c3b4c06378eb
---
1
/
wcfsetup/install/files/style/layout/navigation.scss
---
2
/
wcfsetup/install/files/style/layout/navigation.scss
+++ b/
wcfsetup/install/files/style/layout/navigation.scss
@@@
-49,8
-49,11
+49,11
@@@
align-items: center;
display: flex;
+ // align <nav> to the right side
+ justify-content: flex-end;
+
&:not(:first-child) {
- margin-top:
2
0px;
+ margin-top:
3
0px;
}
&:not(:last-child) {
diff --cc
wcfsetup/install/files/style/ui/message.scss
Simple merge