diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb index 9e8bb6e97f..56fc759660 100644 --- a/app/helpers/spree/admin/navigation_helper.rb +++ b/app/helpers/spree/admin/navigation_helper.rb @@ -34,7 +34,6 @@ module Spree link = link_to_with_icon(options[:icon], titleized_label, destination_url) css_classes << 'tab-with-icon' else - titleized_label = raw("#{titleized_label}") link = link_to(titleized_label, destination_url) end diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index 254e893bfc..238052154e 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -12,7 +12,7 @@ = t(controller.controller_name, :default => controller.controller_name.titleize) = " - OFN #{t(:administration)}" -%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600,700&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"} +%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"} = stylesheet_pack_tag 'admin-styles', media: "screen, print" = render "layouts/bugsnag_js" diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml index 6fd5aacd15..ad070e473c 100644 --- a/app/views/spree/layouts/admin.html.haml +++ b/app/views/spree/layouts/admin.html.haml @@ -3,7 +3,7 @@ %head = render :partial => 'spree/admin/shared/head' - %body.admin{ "class": ("admin-v2" if feature?(:admin_style_v2, spree_current_user)) } + %body.admin - if content_for?(:main_ng_app_name) - if content_for?(:main_ng_ctrl_name) %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe } diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss index ba7978e51a..d4251c1627 100644 --- a/app/webpacker/css/admin/all.scss +++ b/app/webpacker/css/admin/all.scss @@ -130,4 +130,3 @@ @import "app/components/search_input_component/search_input_component"; @import "app/components/confirm_modal_component/confirm_modal_component"; -@import "v2/main.scss"; diff --git a/app/webpacker/css/admin/components/navigation.scss b/app/webpacker/css/admin/components/navigation.scss index 7aeda38cbe..b6fb372546 100644 --- a/app/webpacker/css/admin/components/navigation.scss +++ b/app/webpacker/css/admin/components/navigation.scss @@ -78,6 +78,7 @@ nav.menu { text-transform: uppercase; position: relative; text-align: center; + font-weight: 600; i { display: inline; diff --git a/app/webpacker/css/admin/v2/main.scss b/app/webpacker/css/admin/v2/main.scss deleted file mode 100644 index 16c8b4370e..0000000000 --- a/app/webpacker/css/admin/v2/main.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "variables.scss"; - -body.admin.admin-v2 { - @import "navigation.scss"; -} diff --git a/app/webpacker/css/admin/v2/navigation.scss b/app/webpacker/css/admin/v2/navigation.scss deleted file mode 100644 index 714a4560a6..0000000000 --- a/app/webpacker/css/admin/v2/navigation.scss +++ /dev/null @@ -1,69 +0,0 @@ -#header { - #login-nav { - li { - color: $v2-medium-dark-grey; - - &:hover { - a, i { - color: $v2-orange; - } - } - - a { - color: $v2-medium-dark-grey; - } - } - } -} - -#admin-menu { - background-color: $v2-orange; - - li a span.text { - font-weight: 700; - } - - li.tab-with-icon a:before { - display: none; - } - - li a:hover, li.selected a { - background-color: $v2-orange-light; - - span { - text-shadow: 1px 1px 9px $v2-orange; - } - - &:after { - display: none; - } - } -} - - -#sub-menu { - background-color: $v2-orange-light; - - li a { - font-size: 100%; - } - - li a:hover, li.selected a { - text-shadow: 1px 1px 9px $v2-orange; - background-color: lighten($v2-orange-light, 7%); - - &:after { - display: none; - } - } -} - -.admin__section-header { - background-color: transparent; - border-bottom: none; - - h1.js-admin-page-title { - color: $v2-medium-dark-grey; - } -} - diff --git a/app/webpacker/css/admin/v2/variables.scss b/app/webpacker/css/admin/v2/variables.scss deleted file mode 100644 index 1eba6e0a5c..0000000000 --- a/app/webpacker/css/admin/v2/variables.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Should finally replace (or at least complete) the file /admin/globale/variables.scss - -$v2-orange: #F27052; -$v2-orange-light: #F5947D; -$v2-orange-lighter: #F8B7A8; -$v2-orange-lightest: #FCDBD4; - -$v2-dark-grey: #333333; -$v2-medium-dark-grey: #444444;