diff options
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 03f31e0fe..260eb87f4 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -109,8 +109,12 @@ // Topbar Nav // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity +<<<<<<< HEAD .topbar > ul, // For backwards compatability .nav { +======= +.topbar > ul, .nav { +>>>>>>> 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261 display: block; float: left; margin: 0 10px 0 0; |