diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index 0cf4946406..01387f98d3 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -14,7 +14,7 @@ = " - OFN #{t(:administration)}" %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-style-v3', media: "screen, print" += stylesheet_pack_tag 'admin-style', media: "screen, print" = render "layouts/bugsnag_js" - if content_for? :minimal_js diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss index 24bd84b9b3..6f8c7c57ea 100644 --- a/app/webpacker/css/admin/all.scss +++ b/app/webpacker/css/admin/all.scss @@ -132,4 +132,4 @@ @import "terms_of_service_banner"; // admin_v3 @import "pages/product_preview"; // admin_v3 -@import "pages/dfc_product_imports"; // admin_v3 \ No newline at end of file +@import "pages/dfc_product_imports"; // admin_v3 diff --git a/app/webpacker/css/admin_legacy/change_type_form.scss b/app/webpacker/css/admin_legacy/change_type_form.scss deleted file mode 100644 index 1880f029eb..0000000000 --- a/app/webpacker/css/admin_legacy/change_type_form.scss +++ /dev/null @@ -1,110 +0,0 @@ -#change_type { - section { - margin: 2em 0 0 0; - - &, - & * { - color: $spree-blue; - } - } - - .description { - background-color: $spree-light-blue; - margin-top: -2em; - padding: 4em 2em 2em 1em; - - @media all and (max-width: 786px) { - margin-bottom: 2em; - } - } - - .admin-cta { - border: 1px solid $spree-blue; - - @include border-radius(3px); - - text-align: center; - padding: 1em; - } - - .error { - display: block; - color: #f57e80; - border: 1px solid #f57e80; - background-color: #fde6e7; - - @include border-radius(3px); - - margin-bottom: 1em; - padding: 0.5em; - } - - a.selector { - position: relative; - border: 2px solid black; - text-align: center; - width: 100%; - cursor: pointer; - - &, - & * { - color: white; - } - - &:after, - &:before { - top: 100%; - left: 50%; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - } - - &:after { - border-color: rgba(136, 183, 213, 0); - border-top-color: $spree-blue; - border-width: 12px; - margin-left: -12px; - } - - &:hover { - &:after { - border-top-color: $spree-green; - } - } - - &:before { - border-color: rgba(84, 152, 218, 0); - border-top-color: black; - border-width: 15px; - margin-left: -15px; - } - - .bottom { - background: repeating-linear-gradient( - 60deg, - rgba(84, 152, 218, 0), - rgba(84, 152, 218, 0) 5px, - rgba(255, 255, 255, 0.25) 5px, - rgba(255, 255, 255, 0.25) 10px - ); - margin-top: 1em; - margin-left: -15px; - margin-right: -15px; - padding: 5px; - text-transform: uppercase; - } - - &.selected { - background-color: black; - - &:after, - &:hover &:after { - border-top-color: black; - } - } - } -} diff --git a/app/webpacker/css/admin_legacy/dashboard-single-ent.scss b/app/webpacker/css/admin_legacy/dashboard-single-ent.scss deleted file mode 100644 index 93f242257b..0000000000 --- a/app/webpacker/css/admin_legacy/dashboard-single-ent.scss +++ /dev/null @@ -1,21 +0,0 @@ -.dashboard_item.single-ent { - .header { - padding: 0.77778em 1.33333em 0.77778em 0.77778em; - height: auto !important; - } - - .list { - .button.bottom { - width: 100%; - } - } -} - -.button.big { - width: 100%; - font-size: 1rem; - - @include border-radius(25px); - - padding: 15px; -} diff --git a/app/webpacker/css/admin_legacy/dashboard_item.scss b/app/webpacker/css/admin_legacy/dashboard_item.scss deleted file mode 100644 index 7522b91836..0000000000 --- a/app/webpacker/css/admin_legacy/dashboard_item.scss +++ /dev/null @@ -1,244 +0,0 @@ -div.dashboard_item { - margin-bottom: 30px; - - .centered { - text-align: center; - } - - .text-icon { - margin-top: 8px; - display: block; - font-size: 16px; - font-weight: bold; - color: #fff; - padding: 0px 6px; - border-radius: 10px; - - &.green { - background-color: $spree-green; - } - - &.warning { - background-color: $color-warning; - } - - &.orange { - background-color: $color-warning; - } - } - - div.header { - height: 50px; - border-radius: 6px 6px 0px 0px; - border: 1px solid $spree-blue; - position: relative; - - a[ofn-with-tip] { - position: absolute; - right: 5px; - bottom: 5px; - } - - &.warning { - border-color: $color-warning; - border-width: 3px; - - h3 { - color: $color-warning; - } - } - - &.orange { - border-color: $color-warning; - border-width: 3px; - - h3 { - color: $color-warning; - } - } - - h3.alpha { - height: 100%; - padding: 10px 5px 0px 3%; - } - - a { - border-radius: 0px 4px 0px 0px; - height: 100%; - padding: 15px 2px 0px 2px; - } - } - - .tabs { - height: 30px; - border: solid $spree-blue; - border-width: 0px 0px 1px 0px; - margin-top: 3px; - - div.dashboard_tab { - cursor: pointer; - height: 30px; - color: #fff; - background-color: $spree-blue; - padding: 5px 5px 0px 5px; - text-align: center; - font-weight: bold; - border: solid $spree-blue; - border-width: 1px 1px 0px 1px; - - &:hover { - background-color: $spree-green; - } - - &.selected { - color: $spree-blue; - background-color: #fff; - } - } - } - - .list { - max-height: 250px; - overflow-y: auto; - overflow-x: hidden; - - &:focus { - outline: none; - } - } - - .list-title { - border: solid $spree-blue; - border-width: 0px 1px 0px 1px; - - span { - font-size: 105%; - padding: 10px 0px; - font-weight: bold; - } - - span.alpha { - padding: 10px 2px 10px 5%; - } - } - - .list-item { - border: solid $spree-blue; - border-width: 0px 1px 0px 1px; - height: 41px; - - span.alpha { - font-weight: bold; - margin-left: -3px; - padding: 10px 2px 0px 5%; - } - - span.omega { - padding-right: 13px; - margin-right: -3px; - text-align: right; - } - - .icon-arrow-right { - padding-top: 6px; - font-size: 20px; - } - - .icon-warning-sign { - color: $color-warning; - font-size: 30px; - } - - .icon-remove-sign { - color: $color-warning; - font-size: 30px; - } - - .icon-ok-sign { - color: $spree-green; - font-size: 30px; - } - - &.orange { - color: $color-warning; - border: solid $color-warning; - } - - &.warning { - color: $color-warning; - border: solid $color-warning; - } - - &.orange, - &.warning { - border-width: 0px 3px 0px 3px; - } - - &.even { - background-color: #fff; - } - - &.odd { - background-color: $spree-light-blue; - } - - &.even, - &.odd { - &:hover { - color: #ffffff; - background-color: $spree-green; - - .icon-arrow-right { - color: #fff; - } - - .icon-remove-sign { - color: #fff; - } - - .icon-warning-sign { - color: #fff; - } - - .icon-ok-sign { - color: #fff; - } - - .text-icon { - &.green { - color: $spree-green; - background-color: #fff; - } - } - } - } - } - - a.button { - color: #fff; - font-size: 110%; - font-weight: bold; - text-align: center; - - &.orange { - background-color: $color-warning; - } - - &.blue { - background-color: $spree-blue; - } - - &.warning { - background-color: $color-warning; - } - - &:hover { - background-color: $spree-green; - } - - &.bottom { - border-radius: 0px 0px 6px 6px; - padding: 15px 15px; - } - } -} diff --git a/app/webpacker/css/admin_legacy/dropdown.scss b/app/webpacker/css/admin_legacy/dropdown.scss deleted file mode 100644 index ab3a61d5bb..0000000000 --- a/app/webpacker/css/admin_legacy/dropdown.scss +++ /dev/null @@ -1,271 +0,0 @@ -#content-header .ofn-drop-down { - border: none; - background-color: $spree-blue; - color: #fff; - float: none; - margin-left: 3px; -} - -.ofn-drop-down { - .dropdown-content { - display: none; - } - - .toggle-off { - display: none; - } - - &:active:not(.disabled), - &:focus:not(.disabled) { - .dropdown-content { - display: inline-block; - } - } -} - -.ofn-drop-down:hover, -.ofn-drop-down.expanded { - border: 1px solid #adadad; - color: #575757; -} - -@mixin ofn-drop-down-style { - padding: 7px 15px; - border-radius: 3px; - border: 1px solid #d4d4d4; - background-color: #f5f5f5; - display: block; - color: #828282; - cursor: pointer; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; - user-select: none; - text-align: center; - margin-right: 10px; - - &.disabled { - opacity: 0.5; - pointer-events: none; - - &:hover { - cursor: default; - border-color: #d4d4d4; - color: #828282; - } - } -} - -.ofn-drop-down-with-prepend { - display: flex; - - &.right { - float: right; - } - - .ofn-drop-down { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - .ofn-drop-down-prepend { - @include ofn-drop-down-style; - - border-right: none; - margin-left: 0; - margin-right: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - cursor: default; - } -} - -.ofn-drop-down { - @include ofn-drop-down-style; - - position: relative; - float: left; - - &.right { - float: right; - margin-right: 0px; - margin-left: 10px; - } - - &:hover, - &.expanded { - border: 1px solid #adadad; - color: #575757; - } - - > span { - width: auto; - text-transform: uppercase; - font-size: 85%; - font-weight: 600; - } - - .menu { - margin-top: 1px; - position: absolute; - float: none; - top: 100%; - left: 0px; - padding: 5px 0px; - border: 1px solid #adadad; - background-color: #ffffff; - box-shadow: 1px 3px 10px #888888; - z-index: 100; - white-space: nowrap; - - .filter { - padding-left: 5px; - padding-right: 5px; - position: relative; - - > input[type="text"] { - border: 1px solid rgba(18, 18, 18, 0.1); - width: 100%; - padding-left: 30px; - padding-top: 10px; - padding-bottom: 10px; - font-size: 13px; - color: #454545; - } - - &:after { - content: "\f002"; - font-family: FontAwesome; - position: absolute; - left: 15px; - top: 13px; - color: #454545; - } - } - - .menu_item { - margin: 0px; - padding: 2px 10px; - color: #454545; - text-align: left; - display: block; - - .check { - display: inline-block; - text-align: center; - width: 40px; - &:before { - content: "\00a0"; - } - } - - .name { - display: inline-block; - padding: 0px 15px 0px 0px; - } - - &.selected { - .check:before { - content: "\2713"; - } - } - - &.hidden { - display: none; - } - } - - .menu_item:hover { - background-color: #ededed; - } - } - - > details { - // Override padding on ofn-drop-down-style - margin: -7px -15px; - padding: 7px 15px; - } - - > details > summary { - display: inline-block; - list-style: none; - width: auto; - text-transform: uppercase; - font-size: 85%; - font-weight: 600; - // Override padding on ofn-drop-down-style to increase clickable area - margin: -8px -15px; - padding: 8px 15px; - } - - > details > summary:after { - content: "\f0d7"; - font-family: FontAwesome; - } - - > details[open] > summary:after { - content: "\f0d8"; - font-family: FontAwesome; - } -} - -.ofn-drop-down-v2 { - border: 1px solid $pale-blue; - background-color: white; - padding: 0px; - - &:hover { - border-color: $spree-blue; - } - - .ofn-drop-down-label { - color: $color-3; - padding: 10px; - width: 235px; - display: flex; - justify-content: space-between; - - &:hover { - color: $color-3; - } - - .label { - padding-right: 10px; - } - - .icon-caret-down, - .icon-caret-up { - padding-right: 0px; - } - } - - .menu { - width: 100%; - } - - .menu_items { - max-height: 200px; - overflow-y: scroll; - - .menu_item { - margin-bottom: 5px; - color: #454545; - font-weight: 400; - cursor: pointer; - padding-top: 4px; - padding-bottom: 5px; - text-transform: uppercase; - font-size: 85%; - } - } -} - -.ofn-drop-down.ofn-drop-down-v2 { - // Add very specific styling here for components that are in transition: - // ie. the ones using the two classes above - .ofn-drop-down-label { - padding-top: 7px; - padding-bottom: 7px; - } -} diff --git a/app/webpacker/css/admin_legacy/enterprise_index_panels.scss b/app/webpacker/css/admin_legacy/enterprise_index_panels.scss deleted file mode 100644 index 087f318042..0000000000 --- a/app/webpacker/css/admin_legacy/enterprise_index_panels.scss +++ /dev/null @@ -1,120 +0,0 @@ -.enterprise_package_panel, -.enterprise_producer_panel { - .info { - p { - font-size: 1rem; - margin: 10px 0px; - } - } - - a.selector { - display: block; - position: relative; - margin-bottom: 20px; - border: 2px solid black; - text-align: center; - // width: 100%; - cursor: pointer; - &, - & * { - color: white; - } - &:hover { - &:after { - border-top-color: $spree-green; - } - } - &.disabled { - background-color: #c1c1c1; - } - .bottom { - background: repeating-linear-gradient( - 60deg, - rgba(84, 152, 218, 0), - rgba(84, 152, 218, 0) 5px, - rgba(255, 255, 255, 0.25) 5px, - rgba(255, 255, 255, 0.25) 10px - ); - margin-top: 1em; - margin-left: -15px; - margin-right: -15px; - padding: 5px; - text-transform: uppercase; - } - &.selected { - background-color: #000000; - - &:after { - top: 50%; - left: 0; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - - border-top: 20px solid transparent; - border-bottom: 20px solid transparent; - border-right: 20px solid #000000; - margin-top: -20px; - margin-left: -20px; - } - } - } -} - -.enterprise_status_panel { - .status-ok { - margin: 30px 0px; - i.icon-ok-sign { - color: $spree-green; - font-size: 1.5rem; - } - } - - td.description { - font-size: 0.9rem; - } - - td.severity { - text-align: center; - - i { - font-size: 1.5rem; - - &.issue { - color: $color-warning; - } - - &.warning { - color: #ff9848; - } - } - } -} - -tags-input .tags li.tag-item { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - margin: 2px 0 2px 3px; - background-image: none; - background-color: #5fa5e8; - border: none; - box-shadow: none; - color: white !important; - font-size: 85%; - height: 25px; -} - -tags-input .tags .tag-item .remove-button { - color: white; -} - -table th.actions .no-text[class*="icon-"], -table td.actions .no-text[class*="icon-"] { - cursor: pointer; -} diff --git a/app/webpacker/css/admin_legacy/plugins/select2.scss b/app/webpacker/css/admin_legacy/plugins/select2.scss deleted file mode 100644 index 6ef2d5887b..0000000000 --- a/app/webpacker/css/admin_legacy/plugins/select2.scss +++ /dev/null @@ -1,189 +0,0 @@ -.select2-container { - &:hover .select2-choice, - &.select2-container-active .select2-choice { - background-color: $color-sel-hover-bg !important; - border-color: $color-sel-hover-bg !important; - } - .select2-choice { - background-image: none !important; - background-color: $color-sel-bg; - border: none !important; - box-shadow: none !important; - @include border-radius($border-radius); - color: $color-1 !important; - font-size: 90%; - height: 31px; - line-height: inherit !important; - padding: 5px 15px 7px; - - span { - display: block; - padding: 2px; - } - - .select2-search-choice-close { - background-image: none !important; - font-size: 100% !important; - @extend .icon-remove; - @extend [class^="icon-"], :before; - margin-top: 2px; - } - } - - &.select2-container-active { - .select2-choice { - box-shadow: none !important; - } - - &.select2-dropdown-open .select2-choice div b { - @extend .icon-caret-up; - } - } -} - -.select2-drop { - border-color: $color-sel-hover-bg; - box-shadow: none !important; - z-index: 1000000; - - &.select2-drop-above { - border-color: $color-sel-hover-bg; - } -} - -.select2-search { - @extend .icon-search; - - font-size: 100%; - color: darken($color-border, 15); - padding: 0 9px 0 0; - - &:before { - @extend [class^="icon-"], :before; - - position: absolute; - top: 13px; - left: 13px; - } - - input { - @extend input, [type="text"]; - - padding: 6px 0 6px 25px; - margin: 5px 0 0 5px; - font-family: $base-font-family; - font-size: 90%; - box-shadow: none; - background-image: none; - } -} - -.select2-container .select2-choice .select2-arrow { - background-image: none; - background: transparent; - border: 0; - - b { - padding-top: 7px; - display: block; - width: 100%; - height: 100%; - background: none; - font-family: FontAwesome; - font-weight: 200 !important; - - &:before { - content: "\f0d7"; - } - } -} - -.select2-results { - padding-left: 0 !important; - - li { - font-size: 85% !important; - - &.select2-highlighted { - .select2-result-label { - &, - h6 { - color: $color-1 !important; - } - } - } - - .select2-result-label { - color: $color-body-text; - min-height: 22px; - clear: both; - overflow: auto; - } - - &.select2-no-results, - &.select2-searching { - padding: 5px; - background-color: transparent; - color: $color-body-text; - text-align: center; - font-weight: $font-weight-bold; - text-transform: uppercase; - } - } - - .select2-highlighted { - background-color: $color-sel-bg; - } -} - -.select2-container-multi { - &.select2-container-active, - &.select2-dropdown-open { - .select2-choices { - border-color: $color-sel-hover-bg !important; - box-shadow: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - } - .select2-choices { - @extend input, [type="text"]; - padding: 6px 3px 3px 3px; - box-shadow: none; - background-image: none !important; - - .select2-search-choice { - @include border-radius($border-radius); - margin: 0 0 3px 3px; - background-image: none; - background-color: $color-sel-bg; - border: none; - box-shadow: none; - color: $color-1 !important; - font-size: 85%; - - &:hover { - background-color: $color-sel-hover-bg; - } - - .select2-search-choice-close { - background-image: none !important; - font-size: 85% !important; - @extend .icon-remove; - @extend [class^="icon-"], :before; - margin-left: 2px; - color: $color-1; - } - } - } -} - -label .select2-container { - margin-top: -6px; - .select2-choice { - span { - text-transform: none; - font-weight: normal; - } - } -} diff --git a/app/webpacker/css/admin_legacy/product_import.scss b/app/webpacker/css/admin_legacy/product_import.scss deleted file mode 100644 index 5c6ccc2276..0000000000 --- a/app/webpacker/css/admin_legacy/product_import.scss +++ /dev/null @@ -1,299 +0,0 @@ -$pi-red: $color-warning; -$pi-green: lighten($spree-green, 10%); -$pi-orange: $bright-orange; -$pi-blue: lighten($spree-blue, 10%); -$pi-light-yellow: #faffaf; - -// scss-lint:disable NestingDepth - -div.panel-section { - .error { - color: $pi-red; - } - .warning { - color: $bright-orange; - } - .success { - color: $pi-green; - } - .info { - color: #68b7c0; - } - - div.panel-header { - width: 100%; - clear: both; - float: left; - padding: 0.5em; - - div { - font-size: 1.25em; - float: left; - } - - div.header-caret { - width: 2em; - text-align: center; - min-height: 0.1em; //Empty div fix - } - - div.header-icon { - width: 2.5em; - text-align: center; - padding-top: 0.18em; - - i { - font-size: 1.5em; - line-height: 0.9em; - } - } - - div.header-count { - min-width: 2em; - text-align: right; - padding-right: 0.5em; - } - - div.header-description { - width: auto; - } - } - - div.panel-header:hover { - cursor: pointer; - background-color: #f7f7f7; - } - - div.panel-header.active { - background-color: #efefef; - text-shadow: 1px 1px 0px rgba(255, 255, 255, 0.75); - } - - div.panel-content { - width: 100%; - clear: both; - margin-bottom: 0.5em; - background-color: #f9f9f9; - padding: 1.5em; - - div.table-wrap { - width: 100%; - overflow: auto; - border-right: 1px solid #ceede3; - max-height: 23em; - } - - table { - background-color: white; - margin-bottom: 0; - td, - th { - white-space: nowrap; - } - - tr { - &.error { - color: #c84c4c; - } - - &:hover td.invalid { - background-color: darken(#f05c51, 5%); - } - - i { - display: block; - margin-bottom: -0.2em; - font-size: 1.4em !important; - } - } - - td { - &.invalid { - background-color: #f05c51; - box-shadow: inset 0px 0px 1px red; - color: white; - } - } - } - - div.import-errors { - margin-bottom: 0.85em; - - p.line { - font-size: 1.15em; - margin-bottom: 0.2em; - color: #577084; - } - p.error { - color: #cb1b1b; - margin-bottom: 0.2em; - } - } - } -} - -br.panels.clearfix { - clear: both; -} - -.panel-section.import-settings { - .header-description { - padding-left: 1em; - } - - span.header-error { - font-size: 0.85em; - color: $pi-red; - } - - .select2-search { - display: none; - } - - .select2-results { - margin: 0; - } -} - -.post-save-results { - p { - font-size: 1.25em; - margin-bottom: 0.5em; - - strong { - margin-right: 0.2em; - min-width: 1.8em; - display: inline-block; - text-align: right; - } - - i { - font-size: 1.4em; - vertical-align: middle; - position: relative; - } - - i.fa-check-circle { - color: $pi-green; - } - i.fa-info-circle { - color: $pi-blue; - } - } - - p.save-error { - color: #ee4728; - font-size: 1.05em; - margin-top: 0.4em; - } -} - -form.product-import, -div.post-save-results, -div.import-wrapper { - input[type="submit"] { - margin-right: 0.5em; - } - input[type="submit"], - button, - a.button { - min-width: 8em; - text-align: center; - } -} - -div.import-wrapper { - .alert-box { - margin: 0 0 1.75em; - } - - .ng-hide:not(.ng-hide-animate) { - // We have to use !important here to override angular's display properties - // scss-lint:disable ImportantRule - display: block !important; - position: absolute; - opacity: 0; - top: -9999px; - left: -9999px; - } - - .ng-hide-add, - .ng-hide-remove, - .ng-hide-animate { - transition: all 0.4s ease-in-out; - } - - form.product-import, - div.save-results { - transition: all 0.4s ease-in-out; - } - - div.progress-interface { - text-align: center; - transition: all 0.4s ease-in-out; - - button:disabled { - background: #ccc !important; - } - } - - .post-save-results { - a.button { - float: left; - margin-right: 0.5em; - } - } -} - -div.progress-bar { - height: 25px; - width: 30em; - max-width: 90%; - margin: 1em auto; - background: #f7f7f7; - padding: 3px; - border-radius: 0.3em; - border: 1px solid #eee; - - span.progress-track { - display: block; - background: lighten($pi-green, 10%); - height: 100%; - border-radius: 0.3em; - box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3); - transition: width 0.3s ease-in-out; - } -} - -#upload-sidebar { - float: right; - background-color: lighten($spree-light-blue, 2.5%); - border: 1px solid lighten($pale-blue, 2.5%); - width: 50%; - padding: 0 1.5em 1.5em; - - h4, - h5, - h6, - p { - margin: 1.25em 0 1em; - } - - a.download { - display: block; - font-size: 1.05em; - margin-bottom: 0.5em; - - i { - margin-right: 0.25em; - } - } - - span.category { - display: inline-block; - background-color: $pi-blue; - color: white; - padding: 0.3em 0.6em; - margin: 0 0.4em 0.5em 0; - } -} diff --git a/app/webpacker/css/admin_legacy/select2.scss b/app/webpacker/css/admin_legacy/select2.scss deleted file mode 100644 index f076e28335..0000000000 --- a/app/webpacker/css/admin_legacy/select2.scss +++ /dev/null @@ -1,63 +0,0 @@ -.select2-container { - .select2-choice { - .select2-search-choice-close { - display: none !important; - } - .select2-arrow { - width: 22px; - border: none; - background-image: none; - background-color: transparent; - } - } - - &.light { - .select2-choice { - background-color: #ffffff; - font-weight: normal; - color: $spree-blue !important; - border: 1px solid $color-border !important; - } - - &:hover, - &.select2-container-active { - .select2-choice { - background-color: #ffffff !important; - border: 1px solid $spree-green !important; - - .select2-arrow { - &:before { - color: $spree-blue; - } - } - } - } - } - - &.select2-container-multi { - .select2-search-field { - max-height: 20px; - input { - padding: 0 !important; - margin: 0 0 0 5px !important; - } - } - .select2-search-choice { - display: flex; - align-items: center; - justify-content: center; - padding-left: 7px; - - .select2-search-choice-close { - position: relative; - order: -1; - width: auto; - left: 0; - top: 0; - margin: 0; - padding: 0; - font-size: 100% !important; - } - } - } -} diff --git a/app/webpacker/css/admin_legacy/sidebar-item.scss b/app/webpacker/css/admin_legacy/sidebar-item.scss deleted file mode 100644 index 499c4e76e9..0000000000 --- a/app/webpacker/css/admin_legacy/sidebar-item.scss +++ /dev/null @@ -1,124 +0,0 @@ -div.sidebar_item { - margin-bottom: 30px; - - .centered { - text-align: center; - } - - div.header { - font-size: 105%; - color: #fff; - padding: 10px 0px; - position: relative; - - &.blue { - background-color: $spree-blue; - } - - &.red { - background-color: $color-warning; - } - } - - .list { - max-height: 400px; - overflow-y: auto; - overflow-x: hidden; - - &.red { - color: $color-warning; - - .list-item { - border: solid $color-warning; - border-width: 0px 3px 0px 3px; - - a.alpha, - span.alpha { - margin-left: -3px; - } - - &.odd { - background-color: #fcf6ef; - - &:hover { - background-color: $spree-green; - } - } - } - - a { - color: $color-warning; - } - } - } - - .list-item { - .icon-arrow-right { - padding-top: 6px; - font-size: 20px; - } - - border: solid $spree-blue; - border-width: 0px 1px 0px 1px; - - a.alpha, - span.alpha { - font-weight: bold; - margin-left: -1px; - padding: 10px 2px 10px 5%; - overflow: hidden; - text-overflow: ellipsis; - } - - span.omega { - padding: 8px 18px 8px 0px; - margin-right: -3px; - text-align: right; - } - - .icon-remove-sign { - color: $color-warning; - font-size: 18px; - } - - &.even { - background-color: #fff; - } - - &.odd { - background-color: $spree-light-blue; - } - - &.even, - &.odd { - &:hover { - color: #ffffff; - background-color: $spree-green; - - a { - color: #ffffff; - } - } - } - } - - a.button { - color: #fff; - padding: 15px 15px; - font-weight: bold; - text-align: center; - border-radius: 0px; - - &.blue { - background-color: $spree-blue; - } - - &.red { - background-color: $color-warning; - } - - &:hover { - background-color: $spree-green; - } - } -} diff --git a/app/webpacker/packs/admin-style-v3.scss b/app/webpacker/packs/admin-style.scss similarity index 100% rename from app/webpacker/packs/admin-style-v3.scss rename to app/webpacker/packs/admin-style.scss