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