solidus_backend 2.7.4 → 2.9.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_backend might be problematic. Click here for more details.

Files changed (214) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +12 -8
  3. data/app/assets/images/favicon.ico +0 -0
  4. data/app/assets/javascripts/spree/backend.js +0 -2
  5. data/app/assets/javascripts/spree/backend/adjustments.js +1 -1
  6. data/app/assets/javascripts/spree/backend/components/sortable_table.js +1 -0
  7. data/app/assets/javascripts/spree/backend/components/tabs.js +1 -0
  8. data/app/assets/javascripts/spree/backend/components/tooltips.js +21 -17
  9. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +1 -1
  10. data/app/assets/javascripts/spree/backend/product_picker.js +1 -1
  11. data/app/assets/javascripts/spree/backend/shipments.js +7 -1
  12. data/app/assets/javascripts/spree/backend/stock_management.js +18 -0
  13. data/app/assets/javascripts/spree/backend/store_credits.js +18 -2
  14. data/app/assets/javascripts/spree/backend/taxons.js +1 -1
  15. data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +1 -1
  16. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +24 -25
  17. data/app/assets/javascripts/spree/backend/user_picker.js +1 -1
  18. data/app/assets/javascripts/spree/backend/variant_autocomplete.js +1 -1
  19. data/app/assets/javascripts/spree/backend/views/order/customer_select.js +1 -1
  20. data/app/assets/javascripts/spree/backend/views/order/summary.js +2 -2
  21. data/app/assets/javascripts/spree/backend/views/stock/add_stock_item.js +15 -4
  22. data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +46 -10
  23. data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +24 -16
  24. data/app/assets/stylesheets/spree/backend/components/_breadcrumb.scss +12 -0
  25. data/app/assets/stylesheets/spree/backend/components/_buttons.scss +18 -0
  26. data/app/assets/stylesheets/spree/backend/components/_image_placeholder.scss +2 -2
  27. data/app/assets/stylesheets/spree/backend/components/_list_group.scss +2 -2
  28. data/app/assets/stylesheets/spree/backend/components/_messages.scss +20 -12
  29. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +45 -11
  30. data/app/assets/stylesheets/spree/backend/components/_progress.scss +3 -3
  31. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +1 -2
  32. data/app/assets/stylesheets/spree/backend/components/_tabs.scss +14 -13
  33. data/app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss +24 -0
  34. data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss +10 -1
  35. data/app/assets/stylesheets/spree/backend/globals/_functions.scss +2 -0
  36. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +88 -57
  37. data/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +1 -0
  38. data/app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss +1 -1
  39. data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss +1 -1
  40. data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +8 -2
  41. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +25 -6
  42. data/app/assets/stylesheets/spree/backend/sections/_products.scss +3 -1
  43. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +5 -5
  44. data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss +77 -2
  45. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +4 -4
  46. data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +1 -1
  47. data/app/assets/stylesheets/spree/backend/shared/_fonts.scss +15 -0
  48. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +27 -7
  49. data/app/assets/stylesheets/spree/backend/shared/_header.scss +2 -2
  50. data/app/assets/stylesheets/spree/backend/shared/_icons.scss +5 -1
  51. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +5 -4
  52. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +11 -6
  53. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +10 -6
  54. data/app/assets/stylesheets/spree/backend/spree_admin.scss +3 -1
  55. data/app/controllers/spree/admin/cancellations_controller.rb +2 -2
  56. data/app/controllers/spree/admin/customer_returns_controller.rb +8 -1
  57. data/app/controllers/spree/admin/locale_controller.rb +1 -1
  58. data/app/controllers/spree/admin/log_entries_controller.rb +3 -0
  59. data/app/controllers/spree/admin/orders/customer_details_controller.rb +8 -1
  60. data/app/controllers/spree/admin/orders_controller.rb +1 -12
  61. data/app/controllers/spree/admin/products_controller.rb +10 -6
  62. data/app/controllers/spree/admin/promotion_codes_controller.rb +19 -1
  63. data/app/controllers/spree/admin/promotions_controller.rb +1 -1
  64. data/app/controllers/spree/admin/reimbursements_controller.rb +7 -2
  65. data/app/controllers/spree/admin/resource_controller.rb +1 -0
  66. data/app/controllers/spree/admin/store_credit_reasons_controller.rb +8 -0
  67. data/app/controllers/spree/admin/store_credits_controller.rb +11 -11
  68. data/app/controllers/spree/admin/users_controller.rb +4 -2
  69. data/app/helpers/spree/admin/base_helper.rb +9 -3
  70. data/app/helpers/spree/admin/navigation_helper.rb +1 -1
  71. data/app/helpers/spree/admin/promotions_helper.rb +15 -0
  72. data/app/models/spree/backend_configuration.rb +38 -21
  73. data/app/views/spree/admin/cancellations/index.html.erb +3 -1
  74. data/app/views/spree/admin/images/_image_row.html.erb +1 -1
  75. data/app/views/spree/admin/images/edit.html.erb +3 -3
  76. data/app/views/spree/admin/images/index.html.erb +3 -3
  77. data/app/views/spree/admin/log_entries/index.html.erb +1 -19
  78. data/app/views/spree/admin/option_types/edit.html.erb +1 -1
  79. data/app/views/spree/admin/orders/_carton_manifest.html.erb +3 -1
  80. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +1 -1
  81. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +3 -1
  82. data/app/views/spree/admin/orders/confirm/_line_items.html.erb +3 -2
  83. data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +3 -1
  84. data/app/views/spree/admin/orders/index.html.erb +1 -1
  85. data/app/views/spree/admin/payments/_capture_events.html.erb +15 -18
  86. data/app/views/spree/admin/payments/_list.html.erb +1 -1
  87. data/app/views/spree/admin/payments/_log_entries.html.erb +29 -0
  88. data/app/views/spree/admin/payments/show.html.erb +13 -6
  89. data/app/views/spree/admin/payments/source_forms/{_storecredit.html.erb → _store_credit.html.erb} +0 -0
  90. data/app/views/spree/admin/payments/source_views/{_storecredit.html.erb → _store_credit.html.erb} +0 -0
  91. data/app/views/spree/admin/prices/_form.html.erb +1 -1
  92. data/app/views/spree/admin/product_properties/index.html.erb +1 -1
  93. data/app/views/spree/admin/products/_form.html.erb +23 -12
  94. data/app/views/spree/admin/products/edit.html.erb +5 -0
  95. data/app/views/spree/admin/products/index.html.erb +3 -1
  96. data/app/views/spree/admin/promotion_categories/index.html.erb +1 -1
  97. data/app/views/spree/admin/promotion_code_batches/index.html.erb +1 -1
  98. data/app/views/spree/admin/promotion_codes/index.html.erb +5 -1
  99. data/app/views/spree/admin/promotion_codes/new.html.erb +31 -0
  100. data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
  101. data/app/views/spree/admin/promotions/_activations_edit.html.erb +1 -1
  102. data/app/views/spree/admin/promotions/_form.html.erb +6 -5
  103. data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
  104. data/app/views/spree/admin/promotions/edit.html.erb +3 -1
  105. data/app/views/spree/admin/promotions/index.html.erb +4 -4
  106. data/app/views/spree/admin/refunds/new.html.erb +1 -1
  107. data/app/views/spree/admin/reimbursements/edit.html.erb +2 -2
  108. data/app/views/spree/admin/shared/_address_form.html.erb +10 -3
  109. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +1 -1
  110. data/app/views/spree/admin/shared/_head.html.erb +1 -3
  111. data/app/views/spree/admin/shared/_image.html.erb +2 -2
  112. data/app/views/spree/admin/shared/_modal.html.erb +1 -1
  113. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +1 -1
  114. data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb +4 -0
  115. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +3 -3
  116. data/app/views/spree/admin/shared/_tabs.html.erb +3 -2
  117. data/app/views/spree/admin/shared/_variant_search.html.erb +1 -1
  118. data/app/views/spree/admin/shipping_methods/_form.html.erb +10 -10
  119. data/app/views/spree/admin/stock_items/_stock_management.html.erb +56 -38
  120. data/app/views/spree/admin/stock_locations/_form.html.erb +133 -121
  121. data/app/views/spree/admin/stock_locations/edit.html.erb +4 -2
  122. data/app/views/spree/admin/store_credit_reasons/edit.html.erb +15 -0
  123. data/app/views/spree/admin/store_credit_reasons/index.html.erb +56 -0
  124. data/app/views/spree/admin/store_credit_reasons/new.html.erb +18 -0
  125. data/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb +15 -0
  126. data/app/views/spree/admin/store_credits/_store_credit_reason_field.html.erb +7 -0
  127. data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -1
  128. data/app/views/spree/admin/store_credits/edit_validity.html.erb +2 -2
  129. data/app/views/spree/admin/store_credits/index.html.erb +1 -1
  130. data/app/views/spree/admin/store_credits/show.html.erb +3 -3
  131. data/app/views/spree/admin/stores/_form.html.erb +1 -0
  132. data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +30 -20
  133. data/app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb +1 -1
  134. data/app/views/spree/admin/taxonomies/edit.html.erb +1 -1
  135. data/app/views/spree/admin/taxons/_form.html.erb +1 -1
  136. data/app/views/spree/admin/taxons/edit.html.erb +2 -2
  137. data/app/views/spree/admin/users/edit.html.erb +2 -2
  138. data/app/views/spree/admin/users/index.html.erb +2 -2
  139. data/app/views/spree/admin/users/items.html.erb +3 -1
  140. data/app/views/spree/admin/users/orders.html.erb +1 -1
  141. data/app/views/spree/admin/variants/_form.html.erb +1 -1
  142. data/app/views/spree/admin/variants/index.html.erb +1 -1
  143. data/app/views/spree/admin/zones/_state_members.html.erb +1 -1
  144. data/config/routes.rb +2 -8
  145. data/lib/spree/backend.rb +1 -1
  146. data/solidus_backend.gemspec +3 -4
  147. data/spec/controllers/spree/admin/base_controller_spec.rb +1 -1
  148. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +7 -3
  149. data/spec/controllers/spree/admin/locale_controller_spec.rb +45 -0
  150. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +50 -2
  151. data/spec/controllers/spree/admin/orders_controller_spec.rb +25 -13
  152. data/spec/controllers/spree/admin/payments_controller_spec.rb +1 -1
  153. data/spec/controllers/spree/admin/products_controller_spec.rb +72 -0
  154. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +13 -1
  155. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +11 -0
  156. data/spec/controllers/spree/admin/resource_controller_spec.rb +22 -0
  157. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +1 -1
  158. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +1 -1
  159. data/spec/controllers/spree/admin/store_credits_controller_spec.rb +7 -7
  160. data/spec/features/admin/configuration/payment_methods_spec.rb +2 -2
  161. data/spec/features/admin/configuration/shipping_methods_spec.rb +2 -2
  162. data/spec/features/admin/homepage_spec.rb +1 -6
  163. data/spec/features/admin/locale_spec.rb +1 -2
  164. data/spec/features/admin/orders/adjustments_spec.rb +1 -1
  165. data/spec/features/admin/orders/customer_details_spec.rb +5 -7
  166. data/spec/features/admin/orders/customer_returns_spec.rb +28 -0
  167. data/spec/features/admin/orders/listing_spec.rb +2 -7
  168. data/spec/features/admin/orders/log_entries_spec.rb +2 -2
  169. data/spec/features/admin/orders/new_order_spec.rb +117 -0
  170. data/spec/features/admin/orders/new_refund_spec.rb +35 -0
  171. data/spec/features/admin/orders/order_details_spec.rb +10 -5
  172. data/spec/features/admin/orders/payments_spec.rb +82 -41
  173. data/spec/features/admin/orders/return_payment_state_spec.rb +3 -0
  174. data/spec/features/admin/orders/shipments_spec.rb +28 -0
  175. data/spec/features/admin/products/edit/products_spec.rb +25 -0
  176. data/spec/features/admin/products/edit/taxons_spec.rb +4 -0
  177. data/spec/features/admin/products/pricing_spec.rb +24 -6
  178. data/spec/features/admin/products/products_spec.rb +5 -5
  179. data/spec/features/admin/products/stock_management_spec.rb +27 -13
  180. data/spec/features/admin/products/variant_spec.rb +1 -1
  181. data/spec/features/admin/promotion_adjustments_spec.rb +12 -12
  182. data/spec/features/admin/promotions/option_value_rule_spec.rb +2 -2
  183. data/spec/features/admin/promotions/product_rule_spec.rb +1 -1
  184. data/spec/features/admin/promotions/promotion_spec.rb +52 -0
  185. data/spec/features/admin/promotions/tiered_calculator_spec.rb +1 -1
  186. data/spec/features/admin/promotions/user_rule_spec.rb +2 -2
  187. data/spec/features/admin/reimbursements_spec.rb +1 -1
  188. data/spec/features/admin/store_credits_spec.rb +51 -2
  189. data/spec/features/admin/taxons_spec.rb +35 -0
  190. data/spec/features/admin/users_spec.rb +44 -11
  191. data/spec/helpers/admin/navigation_helper_spec.rb +4 -2
  192. data/spec/helpers/admin/store_credit_events_helper_spec.rb +2 -2
  193. data/spec/javascripts/spec_helper.js +2 -0
  194. data/spec/models/spree/backend_configuration/menu_item_spec.rb +17 -0
  195. data/spec/models/spree/backend_configuration_spec.rb +22 -0
  196. data/spec/spec_helper.rb +2 -2
  197. data/spec/support/appear_before_matcher.rb +1 -1
  198. data/spec/support/feature/order_feature_helper.rb +1 -1
  199. data/spec/views/spree/admin/shared/navigation_footer_spec.rb +1 -1
  200. data/vendor/assets/fonts/inter/Inter-Regular.woff +0 -0
  201. data/vendor/assets/fonts/inter/Inter-Regular.woff2 +0 -0
  202. data/vendor/assets/fonts/inter/Inter-SemiBold.woff +0 -0
  203. data/vendor/assets/fonts/inter/Inter-SemiBold.woff2 +0 -0
  204. data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js +10 -0
  205. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +4 -0
  206. metadata +38 -36
  207. data/.eslintrc +0 -21
  208. data/app/controllers/spree/admin/reports_controller.rb +0 -82
  209. data/app/views/spree/admin/reports/index.html.erb +0 -19
  210. data/app/views/spree/admin/reports/sales_total.html.erb +0 -35
  211. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +0 -19
  212. data/app/views/spree/admin/store_credits/_update_reason_field.html.erb +0 -7
  213. data/spec/controllers/spree/admin/reports_controller_spec.rb +0 -133
  214. data/spec/features/admin/reports_spec.rb +0 -63
@@ -7,24 +7,27 @@
7
7
  //
8
8
  // Grayscale and brand colors for use across Bootstrap.
9
9
 
10
- $blue: $color-3 !default;
11
- $red: $color-5 !default;
12
- $orange: $color-6 !default;
13
- $green: $color-2 !default;
10
+ $primary: $color-primary !default;
11
+ $secondary: $color-dark-accent !default;
12
+
13
+ $blue: $color-primary !default;
14
+ $red: $color-red !default;
15
+ $orange: $color-yellow !default;
16
+ $green: $color-success !default;
14
17
 
15
18
  // Body
16
19
  //
17
20
  // Settings for the `<body>` element.
18
21
 
19
- $body-bg: $color-1 !default;
20
- $body-color: $color-4 !default;
22
+ $body-bg: $color-white !default;
23
+ $body-color: $color-dark !default;
21
24
 
22
25
  // Links
23
26
  //
24
27
  // Style anchor elements.
25
28
 
26
29
  $link-decoration: none !default;
27
- $link-hover-color: $color-2 !default;
30
+ $link-hover-color: $color-primary !default;
28
31
  $link-hover-decoration: none !default;
29
32
 
30
33
  // Grid columns
@@ -37,9 +40,9 @@ $grid-gutter-width-base: 1.875rem !default;
37
40
  //
38
41
  // Font, line-height, and color for body text, headings, and more.
39
42
 
40
- $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
43
+ $font-family-sans-serif: "Inter", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
41
44
  $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
42
- $font-family-base: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
45
+ $font-family-base: "Inter", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
43
46
 
44
47
  $font-size-root: 13px !default;
45
48
 
@@ -54,7 +57,7 @@ $h5-font-size: $font-size-root + 4 !default;
54
57
  $h6-font-size: $font-size-root + 2 !default;
55
58
 
56
59
  $headings-font-weight: $font-weight-bold !default;
57
- $headings-color: $color-4 !default;
60
+ $headings-color: $color-dark !default;
58
61
 
59
62
  // Components
60
63
  //
@@ -64,9 +67,10 @@ $border-radius: 3px !default;
64
67
 
65
68
  // Forms
66
69
 
67
- $input-color: $color-3 !default;
68
- $input-border-color: $color-border !default;
69
- $input-focus-border-color: $color-2 !default;
70
+ $input-color: $color-dark !default;
71
+ $input-placeholder-color: $color-dark-light !default;
72
+ $input-border-color: $color-light-accent !default;
73
+ $input-focus-border-color: $color-primary !default;
70
74
 
71
75
  $custom-select-focus-border-color: $input-focus-border-color !default;
72
76
 
@@ -74,10 +78,14 @@ $custom-select-focus-border-color: $input-focus-border-color !default;
74
78
  //
75
79
  // Dropdown menu container and contents.
76
80
 
77
- $dropdown-link-hover-color: #fff !default;
78
- $dropdown-link-hover-bg: $color-3 !default;
81
+ $dropdown-link-hover-color: $color-white !default;
82
+ $dropdown-link-hover-bg: $color-primary !default;
79
83
 
80
84
  // Breadcrumbs
81
85
 
82
86
  $breadcrumb-bg: transparent !default;
83
- $breadcrumb-active-color: $color-4 !default;
87
+ $breadcrumb-active-color: $color-primary !default;
88
+
89
+ // Popover
90
+
91
+ $popover-header-bg: $color-primary-light !default;
@@ -1,4 +1,16 @@
1
1
  .breadcrumb {
2
2
  font-size: 16px;
3
3
  margin-bottom: 0;
4
+
5
+ a {
6
+ color: $breadcrumb-color;
7
+
8
+ &:hover {
9
+ color: $breadcrumb-active-color;
10
+ }
11
+ }
12
+
13
+ .active {
14
+ font-weight: $font-weight-bold;
15
+ }
4
16
  }
@@ -0,0 +1,18 @@
1
+ .btn-default {
2
+ background: linear-gradient($color-white, lighten($color-light-dark, 2%));
3
+ color: $color-dark;
4
+ border-color: $color-dark-accent;
5
+
6
+ &:hover {
7
+ background: linear-gradient($color-white, $color-light-dark);
8
+ }
9
+
10
+ &.disabled,
11
+ &:disabled {
12
+ color: $color-disabled;
13
+ }
14
+ }
15
+
16
+ .btn-primary {
17
+ border-color: darken($color-primary, 6%);
18
+ }
@@ -14,8 +14,8 @@
14
14
  display: inline-block;
15
15
  margin: auto;
16
16
  text-align: center;
17
- border: 1px solid #ddd;
18
- color: #aaa;
17
+ border: 1px solid $color-light-dark;
18
+ color: $color-light-accent;
19
19
 
20
20
  &:before {
21
21
  font: normal normal normal 14px/1 FontAwesome;
@@ -8,7 +8,7 @@
8
8
  padding: 10px 15px;
9
9
  // Place the border on the list items and negative margin up for better styling
10
10
  margin-bottom: -1px;
11
- border: 1px solid #cee1f4;
11
+ border: 1px solid $color-border;
12
12
 
13
13
  // Round the first and last items
14
14
  &:first-child {
@@ -22,5 +22,5 @@
22
22
 
23
23
  a.list-group-item:focus {
24
24
  text-decoration: none;
25
- background-color: #eff5fc;
25
+ background-color: $color-light;
26
26
  }
@@ -1,14 +1,13 @@
1
1
  .errorExplanation {
2
- padding: 5px;
3
- border: 1px solid very-light(theme-color("danger"), 12);
4
- background-color: very-light(theme-color("danger"), 6);
5
- border-radius: 3px;
6
- color: very-light(theme-color("danger"), 30);
2
+ padding: 10px 15px;
3
+ border-top: 3px solid theme-color("danger");
4
+ background-color: lighten(theme-color("danger"), 40);
5
+ border-radius: 0 0 $border-radius $border-radius;
6
+ color: $body-color;
7
7
  margin-bottom: 15px;
8
8
 
9
9
  h2 {
10
10
  font-size: 140%;
11
- color: very-light(theme-color("danger"), 30);
12
11
  margin-bottom: 5px;
13
12
  }
14
13
 
@@ -34,15 +33,24 @@
34
33
  }
35
34
 
36
35
  .flash {
36
+ border-top: 3px solid;
37
37
  padding: 16px;
38
38
  text-align: center;
39
39
  font-size: 120%;
40
- color: $color-1;
41
- font-weight: $font-weight-bold;
40
+ color: $body-color;
42
41
 
43
- &.notice { background-color: rgba(theme-color("warning"), 0.8) }
44
- &.success { background-color: rgba(theme-color("success"), 0.8) }
45
- &.error { background-color: rgba(theme-color("danger"), 0.8) }
42
+ &.notice {
43
+ background-color: rgba(lighten($color-notice, 15), .95);
44
+ border-top-color: $color-notice;
45
+ }
46
+ &.success {
47
+ background-color: rgba(lighten($color-success, 30), .95);
48
+ border-top-color: $color-success;
49
+ }
50
+ &.error {
51
+ background-color: rgba(lighten($color-error, 30), .95);
52
+ border-top-color: $color-error;
53
+ }
46
54
  }
47
55
 
48
56
  .alert {
@@ -53,5 +61,5 @@
53
61
  text-decoration: underline;
54
62
  }
55
63
 
56
- &.error a { color: very-light(theme-color("danger"), 10) }
64
+ &.error a { color: lighten(theme-color("danger"), 8); }
57
65
  }
@@ -17,9 +17,9 @@ nav.menu {
17
17
  }
18
18
 
19
19
  &.active a {
20
- color: $color-2;
20
+ color: $color-primary;
21
21
  border-left-width: 0;
22
- border-bottom-color: $color-2;
22
+ border-bottom-color: $color-primary;
23
23
  }
24
24
  }
25
25
  }
@@ -32,9 +32,10 @@ nav.menu {
32
32
  }
33
33
 
34
34
  .admin-nav-header {
35
- background-color: $color-1;
35
+ background-color: $color-white;
36
36
  border-bottom: 1px solid $color-border;
37
37
  text-align: center;
38
+ padding: 0 1.25em;
38
39
  // Using line height for proper vertical centering.
39
40
  // As line height does not take the border width into account we need to subtract it.
40
41
  line-height: $main-header-height - 1px;
@@ -42,7 +43,6 @@ nav.menu {
42
43
 
43
44
  .admin-nav-menu {
44
45
  ul {
45
- margin: 0;
46
46
  padding: 0;
47
47
  list-style: none;
48
48
  }
@@ -53,7 +53,8 @@ nav.menu {
53
53
  &:hover {
54
54
  background: $color-navbar-active-bg;
55
55
 
56
- > a {
56
+ > a,
57
+ > a:before {
57
58
  color: $color-navbar-active;
58
59
  }
59
60
  }
@@ -61,7 +62,8 @@ nav.menu {
61
62
  &.selected {
62
63
  background: $color-navbar-active-bg;
63
64
 
64
- > a {
65
+ > a,
66
+ > a:before {
65
67
  color: $color-navbar-active;
66
68
  }
67
69
  }
@@ -84,15 +86,37 @@ nav.menu {
84
86
  left: 100%;
85
87
  width: $width-sidebar-flyout;
86
88
  margin-left: 0;
87
- border: $border-sidebar;
88
- background: $color-navbar-submenu-bg;
89
- box-shadow: $box-shadow;
90
- @include caret($direction: left, $color-caret: $color-navbar-submenu-bg);
89
+ background: $color-white;
90
+ box-shadow: 1px 0 4px 0 rgba(0, 0, 0, 0.1);
91
+ border-radius: 0 4px 4px 4px;
92
+ border: 1px solid $color-border;
93
+ @include caret($direction: left, $color-caret: $color-white);
91
94
 
92
95
  &:before {
93
96
  z-index: 1;
94
97
  top: 1.5em;
95
98
  }
99
+
100
+ &:after {
101
+ content: '';
102
+ display: block;
103
+ position: absolute;
104
+ border-width: 1em 1em;
105
+ border-style: solid;
106
+ border-color: transparent;
107
+ border-right-color: $color-border;
108
+ left: -2.1em;
109
+ top: 1.5em;
110
+ margin-top: -1em;
111
+ }
112
+
113
+ > li {
114
+ background: $color-white;
115
+
116
+ a {
117
+ font-weight: $font-weight-bold;
118
+ }
119
+ }
96
120
  }
97
121
  }
98
122
  }
@@ -101,13 +125,15 @@ nav.menu {
101
125
  display: block;
102
126
  padding: $padding-y-navbar $padding-x-navbar;
103
127
  color: $color-navbar;
104
- font-weight: normal;
128
+ font-weight: $font-weight-bold;
105
129
  }
106
130
 
107
131
  .icon_link {
108
132
  text-indent: 2em;
109
133
 
110
134
  &:before {
135
+ color: $color-icon-navbar;
136
+ font-weight: $font-weight-normal;
111
137
  position: absolute;
112
138
  left: 1em;
113
139
  transform: translateX(-50%);
@@ -123,6 +149,7 @@ nav.menu {
123
149
 
124
150
  .admin-subnav {
125
151
  background: $color-navbar-submenu-bg;
152
+ margin: 0;
126
153
  padding-top: $padding-y-navbar - $padding-y-navbar-submenu;
127
154
  padding-bottom: $padding-y-navbar - $padding-y-navbar-submenu;
128
155
 
@@ -132,6 +159,7 @@ nav.menu {
132
159
 
133
160
  a {
134
161
  color: $color-navbar-submenu;
162
+ font-weight: $font-weight-normal;
135
163
  padding-top: $padding-y-navbar-submenu;
136
164
  padding-bottom: $padding-y-navbar-submenu;
137
165
 
@@ -143,6 +171,7 @@ nav.menu {
143
171
  .selected {
144
172
  a {
145
173
  color: $color-navbar-submenu-active;
174
+ font-weight: $font-weight-bold;
146
175
  }
147
176
  }
148
177
  }
@@ -183,6 +212,7 @@ nav.menu {
183
212
 
184
213
  a {
185
214
  display: inline-block;
215
+ font-weight: $font-weight-bold;
186
216
  max-width: 100%;
187
217
  overflow: hidden;
188
218
  text-overflow: ellipsis;
@@ -193,3 +223,7 @@ nav.menu {
193
223
  margin-right: 0.5rem;
194
224
  }
195
225
  }
226
+
227
+ .brand-link {
228
+ display: block;
229
+ }
@@ -1,5 +1,5 @@
1
1
  .turbolinks-progress-bar {
2
- background-color: $color-3;
2
+ background-color: $color-dark-light;
3
3
  }
4
4
 
5
5
  #progress {
@@ -22,8 +22,8 @@
22
22
  margin-left: -100px;
23
23
  margin-top: -50px;
24
24
  padding: 11px 0;
25
- background-color: $color-3;
26
- color: $color-1;
25
+ background-color: $color-dark-light;
26
+ color: $color-white;
27
27
  text-align: center;
28
28
  }
29
29
 
@@ -12,7 +12,6 @@
12
12
 
13
13
  .sidebar-title {
14
14
  @include line-through($color: $color-border);
15
- color: $color-2;
15
+ color: $color-dark;
16
16
  font-size: 14px;
17
- font-weight: $font-weight-normal;
18
17
  }
@@ -1,7 +1,7 @@
1
1
  .tabs {
2
2
  display: flex;
3
3
  margin: 1em 0;
4
- border-bottom: 1px solid $color-border;
4
+ border-bottom: 1px solid $color-tab-border;
5
5
  white-space: nowrap;
6
6
 
7
7
  &,
@@ -23,12 +23,13 @@
23
23
 
24
24
  // Move down one pixel to sit on top of the ul's border-bottom
25
25
  position: relative;
26
- top: 1px;
26
+ top: 2px;
27
27
 
28
28
  > a {
29
+ color: $color-tab;
29
30
  display: block;
30
- border: 1px solid $color-border;
31
- border-radius: 2px 2px 0 0;
31
+ border: 1px solid $color-tab-border;
32
+ border-radius: 4px 4px 0 0;
32
33
  line-height: 1;
33
34
  }
34
35
 
@@ -37,19 +38,19 @@
37
38
  }
38
39
 
39
40
  &:not(.active) > a {
40
- background: $color-tbl-thead;
41
+ background: $color-tab-bg;
41
42
  }
42
43
 
43
44
  &.active > a,
44
45
  &.active:hover {
45
- background: white;
46
- border-bottom-color: white;
47
- color: $body-color;
46
+ background: $color-tab-active-bg;
47
+ border-bottom-color: $color-tab-active-border;
48
+ color: $color-tab-active;
49
+ font-weight: $font-weight-bold;
48
50
  }
49
51
 
50
52
  &:not(.active):hover > a {
51
- background: darken($color-tbl-thead, 5%);
52
- color: $link-color;
53
+ color: $color-tab-active;
53
54
  }
54
55
  }
55
56
 
@@ -69,7 +70,7 @@
69
70
 
70
71
  > a {
71
72
  position: relative;
72
- background: white;
73
+ background: $color-tab-active-bg;
73
74
  z-index: 1;
74
75
 
75
76
  &:before {
@@ -80,7 +81,7 @@
80
81
  }
81
82
 
82
83
  &:hover > a {
83
- background: white;
84
+ background: $color-tab-active-bg;
84
85
  }
85
86
 
86
87
  &:not(:hover) ul {
@@ -98,7 +99,7 @@
98
99
  .tabs li.in-dropdown {
99
100
  a {
100
101
  display: block;
101
- border: 1px solid $color-border;
102
+ border: 1px solid $color-tab-border;
102
103
  background: white;
103
104
  }
104
105