tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

css/menu.less: resolve merge conflict

This commit is contained in:
Thomas Gelf 2014-11-13 21:28:51 +01:00
parent 903219b302
commit 2a27b6ce25
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/css/icinga/menu.less
View File

@ -25,11 +25,7 @@
} }
#menu li { #menu li {
<<<<<<< HEAD margin-left: 0.0em;
margin-left: 0.0em;
=======
margin-left: 0.5em;
>>>>>>> master
} }
#menu > ul > li > ul { #menu > ul > li > ul {
@ -159,12 +155,8 @@
} }
#menu li.hover > a { #menu li.hover > a {
<<<<<<< HEAD
color: black; color: black;
=======
color: white;
overflow: visible; overflow: visible;
>>>>>>> master
} }
#menu li.hover > ul a { #menu li.hover > ul a {