diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index d328a39148..dea5ac04a9 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -15,8 +15,6 @@ //= require jquery.cookie //= require jquery.jstree/jquery.jstree //= require jquery.vAlign -//= require jquery.horizontalNav -//= require jquery.adaptivemenu //= require angular //= require angular-resource //= require angular-animate diff --git a/app/assets/javascripts/admin/spree/base.js.erb b/app/assets/javascripts/admin/spree/base.js.erb index 5c28559002..4b9bf8216f 100644 --- a/app/assets/javascripts/admin/spree/base.js.erb +++ b/app/assets/javascripts/admin/spree/base.js.erb @@ -8,27 +8,10 @@ Hopefully, this will evolve into a propper class. **/ jQuery(function($) { - // Make main menu use full width - mainMenu = $('.fullwidth-menu') - if (typeof mainMenu.horizontalNav === 'function' ) - mainMenu.horizontalNav({ - tableDisplay: false, - responsiveDelay: 0 - }); - // Vertical align of checkbox fields if (typeof $('.field.checkbox label').vAlign === 'function' ) $('.field.checkbox label').vAlign() - // We activate AdaptiveMenu only if not on webdriver - // Re-adjusting the admin menu during tests causes tests to fail. - if (!navigator.webdriver && typeof Spree !== 'undefined') { - $('.main-menu-wrapper ul').AdaptiveMenu({ - text: " " + Spree.translations.more + "", - klass: "dropdown" - }); - } - // Add some tips if (typeof $('.with-tip').powerTip === 'function' ) { $('.with-tip').powerTip({ diff --git a/app/assets/stylesheets/admin/components/navigation.scss b/app/assets/stylesheets/admin/components/navigation.scss index 6ad0eaeca2..4616cc3b4c 100644 --- a/app/assets/stylesheets/admin/components/navigation.scss +++ b/app/assets/stylesheets/admin/components/navigation.scss @@ -65,12 +65,17 @@ nav.menu { #admin-menu { background-color: $color-3; + ul { + display: flex; + } + li { min-width: 90px; + flex-grow: 1; a { display: block; - padding: 25px 20px; + padding: 25px 5px; color: $color-1 !important; text-transform: uppercase; position: relative; diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml index ab1e7f0a89..fc798d0fc3 100644 --- a/app/views/spree/layouts/_admin_body.html.haml +++ b/app/views/spree/layouts/_admin_body.html.haml @@ -21,7 +21,7 @@ %nav#admin-menu{ data: { hook: '' }} .container.no-gutter .sixteen.columns.main-menu-wrapper - %ul.inline-menu.fullwidth-menu{"data-hook" => "admin_tabs"} + %ul.inline-menu{"data-hook" => "admin_tabs"} = render :partial => 'spree/admin/shared/tabs' - if content_for?(:sub_menu) diff --git a/vendor/assets/javascripts/jquery.adaptivemenu.js b/vendor/assets/javascripts/jquery.adaptivemenu.js deleted file mode 100644 index b9a611a8fb..0000000000 --- a/vendor/assets/javascripts/jquery.adaptivemenu.js +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Original from spree/core/vendor/assets/javascripts/jquery.adaptivemenu.js - */ - -/* - * Used for the spree admin tab bar (Orders, Products, Reports etc.). - * Using parent's width instead of window width. - */ -jQuery.fn.AdaptiveMenu = function(options){ - - var options = jQuery.extend({ - text: "More...", - accuracy:0, // originally 70, but not needed anymore - 'class':null, - 'classLinckMore':null - },options); - - var menu = this; - var li = $(menu).find("li"); - - var width = 0; - var widthLi = []; - $.each( li , function(i, l){ - width += $(l).width(); - widthLi.push( width ); - }); - - var buildingMenu = function(){ - // Using parent width instead of given window width - var windowWidth = $(menu.parent()).width() - options.accuracy; - for(var i = 0; i windowWidth ) - $( li[i] ).hide(); - else - $( li[i] ).show(); - } - $(menu).find('#more').remove(); - var hideLi = $(li).filter(':not(:visible)'); - var lastLi = $(li).filter(':visible').last(); - if ( hideLi.length > 0 ){ - var more = $("
  • ") - .css({"display":"inline-block","white-space":"nowrap"}) - .addClass(options.classLinckMore) - .attr({"id":"more"}) - .html(options.text) - .click(function(){$(this).find('li').toggle()}); - - var ul = $("