diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index d34de3fd0af..7b0e15176ba 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -188,6 +188,7 @@ flex: 1 1 25%; margin: 0 0 5px 10px; border: 1px solid $primary-medium; + background: $secondary; @media all and (max-width: 900px) { margin: 0; flex: 1 1 100%; diff --git a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss index a807af8cd0e..234ee0cc4e9 100644 --- a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss +++ b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss @@ -51,9 +51,6 @@ } } -.select2-container-multi .select2-choices { - background-color: $secondary; -} .select2-container-multi .select2-choices .select2-search-field input.select2-active { background: $secondary image-url("select2-spinner.gif") no-repeat 100% !important; } diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss index 543489f48ea..cdbc306d7c0 100644 --- a/app/assets/stylesheets/common/select-kit/multi-select.scss +++ b/app/assets/stylesheets/common/select-kit/multi-select.scss @@ -21,7 +21,7 @@ .multi-select-header { background: $secondary; - border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + border: 1px solid $primary-medium; &.is-focused { box-shadow: $tertiary 0px 0px 6px 0px; diff --git a/app/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss index f66f81740fd..2d8cc87788c 100644 --- a/app/assets/stylesheets/vendor/select2.scss +++ b/app/assets/stylesheets/vendor/select2.scss @@ -406,12 +406,9 @@ disabled look for disabled choices in the results dropdown margin: 0; padding: 0 5px 0 0; position: relative; - border: 1px solid #aaa; cursor: text; overflow: hidden; - - background-color: #fff; } .select2-locked {