Commit 3686b455 authored by Jacob Schatz's avatar Jacob Schatz

fixing conflict.

parents 265750c8 62aac539
...@@ -376,7 +376,7 @@ table { ...@@ -376,7 +376,7 @@ table {
.center-top-menu, .left-top-menu { .center-top-menu, .left-top-menu {
@include nav-menu; @include nav-menu;
text-align: center; text-align: left;
margin-top: 5px; margin-top: 5px;
margin-bottom: $gl-padding; margin-bottom: $gl-padding;
height: auto; height: auto;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment