diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs index c5ab7182b59..65d5debbe3a 100644 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -1,6 +1,6 @@ {{#menu-panel visible=visible}} {{#if currentUser.staff}} - -
+ {{/menu-links}} {{/if}} - -
+ {{/menu-links}} {{#if categories}} {{/if}} -
- + {{/menu-links}} {{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/menu-links.hbs b/app/assets/javascripts/discourse/templates/components/menu-links.hbs new file mode 100644 index 00000000000..fe9b872fcb3 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/menu-links.hbs @@ -0,0 +1,7 @@ + +{{#unless omitRule}} +
+{{/unless}} diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index 8a599647f18..ce8219a4825 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -46,6 +46,13 @@ } +.menu-links.columned { + li { + width: 50%; + float: left; + } +} + .menu-panel { ul.menu-links li, ul li.heading { a { @@ -278,6 +285,3 @@ div.menu-links-header { margin-right: 0.2em; } } - - -