solidus_backend 2.8.6 → 2.9.0.rc.1

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 (105) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/components/sortable_table.js +1 -0
  3. data/app/assets/javascripts/spree/backend/components/tabs.js +1 -0
  4. data/app/assets/javascripts/spree/backend/shipments.js +1 -0
  5. data/app/assets/javascripts/spree/backend/stock_management.js +9 -0
  6. data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +1 -1
  7. data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +24 -16
  8. data/app/assets/stylesheets/spree/backend/components/_breadcrumb.scss +12 -0
  9. data/app/assets/stylesheets/spree/backend/components/_buttons.scss +18 -0
  10. data/app/assets/stylesheets/spree/backend/components/_image_placeholder.scss +2 -2
  11. data/app/assets/stylesheets/spree/backend/components/_list_group.scss +2 -2
  12. data/app/assets/stylesheets/spree/backend/components/_messages.scss +20 -12
  13. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +46 -10
  14. data/app/assets/stylesheets/spree/backend/components/_progress.scss +3 -3
  15. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +1 -2
  16. data/app/assets/stylesheets/spree/backend/components/_tabs.scss +6 -5
  17. data/app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss +24 -0
  18. data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss +10 -1
  19. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +62 -39
  20. data/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +1 -0
  21. data/app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss +1 -1
  22. data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss +1 -1
  23. data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +8 -2
  24. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +17 -6
  25. data/app/assets/stylesheets/spree/backend/sections/_products.scss +3 -1
  26. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +5 -5
  27. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +4 -4
  28. data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +1 -1
  29. data/app/assets/stylesheets/spree/backend/shared/_fonts.scss +15 -0
  30. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +27 -7
  31. data/app/assets/stylesheets/spree/backend/shared/_header.scss +3 -2
  32. data/app/assets/stylesheets/spree/backend/shared/_icons.scss +5 -1
  33. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +5 -4
  34. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +9 -4
  35. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +10 -6
  36. data/app/assets/stylesheets/spree/backend/spree_admin.scss +3 -0
  37. data/app/controllers/spree/admin/customer_returns_controller.rb +8 -1
  38. data/app/controllers/spree/admin/log_entries_controller.rb +3 -0
  39. data/app/controllers/spree/admin/orders_controller.rb +0 -1
  40. data/app/controllers/spree/admin/users_controller.rb +4 -2
  41. data/app/helpers/spree/admin/base_helper.rb +9 -3
  42. data/app/helpers/spree/admin/promotions_helper.rb +15 -0
  43. data/app/views/spree/admin/images/index.html.erb +1 -1
  44. data/app/views/spree/admin/log_entries/index.html.erb +1 -19
  45. data/app/views/spree/admin/option_types/edit.html.erb +1 -1
  46. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +1 -1
  47. data/app/views/spree/admin/payments/_capture_events.html.erb +15 -18
  48. data/app/views/spree/admin/payments/_list.html.erb +1 -1
  49. data/app/views/spree/admin/payments/_log_entries.html.erb +29 -0
  50. data/app/views/spree/admin/payments/show.html.erb +13 -6
  51. data/app/views/spree/admin/payments/source_forms/{_storecredit.html.erb → _store_credit.html.erb} +0 -0
  52. data/app/views/spree/admin/payments/source_views/{_storecredit.html.erb → _store_credit.html.erb} +0 -0
  53. data/app/views/spree/admin/prices/_form.html.erb +1 -1
  54. data/app/views/spree/admin/products/_form.html.erb +16 -5
  55. data/app/views/spree/admin/products/edit.html.erb +1 -1
  56. data/app/views/spree/admin/promotions/_form.html.erb +2 -2
  57. data/app/views/spree/admin/promotions/index.html.erb +4 -4
  58. data/app/views/spree/admin/reimbursements/edit.html.erb +2 -2
  59. data/app/views/spree/admin/shared/_head.html.erb +0 -3
  60. data/app/views/spree/admin/shared/_modal.html.erb +1 -1
  61. data/app/views/spree/admin/shipping_methods/_form.html.erb +10 -10
  62. data/app/views/spree/admin/stock_items/_stock_management.html.erb +1 -1
  63. data/app/views/spree/admin/store_credits/edit_validity.html.erb +1 -1
  64. data/app/views/spree/admin/store_credits/index.html.erb +1 -1
  65. data/app/views/spree/admin/store_credits/show.html.erb +1 -1
  66. data/app/views/spree/admin/stores/_form.html.erb +1 -0
  67. data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +30 -20
  68. data/app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb +1 -1
  69. data/app/views/spree/admin/taxonomies/edit.html.erb +1 -1
  70. data/app/views/spree/admin/taxons/_form.html.erb +1 -1
  71. data/app/views/spree/admin/taxons/edit.html.erb +2 -2
  72. data/app/views/spree/admin/users/edit.html.erb +2 -2
  73. data/app/views/spree/admin/users/index.html.erb +2 -2
  74. data/app/views/spree/admin/variants/_form.html.erb +1 -1
  75. data/app/views/spree/admin/zones/_state_members.html.erb +1 -1
  76. data/spec/controllers/spree/admin/locale_controller_spec.rb +45 -0
  77. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +3 -3
  78. data/spec/controllers/spree/admin/orders_controller_spec.rb +2 -2
  79. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +1 -1
  80. data/spec/features/admin/orders/adjustments_spec.rb +1 -1
  81. data/spec/features/admin/orders/customer_details_spec.rb +5 -7
  82. data/spec/features/admin/orders/customer_returns_spec.rb +28 -0
  83. data/spec/features/admin/orders/listing_spec.rb +1 -6
  84. data/spec/features/admin/orders/log_entries_spec.rb +2 -2
  85. data/spec/features/admin/orders/new_order_spec.rb +3 -3
  86. data/spec/features/admin/orders/order_details_spec.rb +8 -3
  87. data/spec/features/admin/orders/payments_spec.rb +80 -39
  88. data/spec/features/admin/products/edit/products_spec.rb +25 -0
  89. data/spec/features/admin/products/edit/taxons_spec.rb +2 -8
  90. data/spec/features/admin/products/pricing_spec.rb +24 -6
  91. data/spec/features/admin/products/products_spec.rb +4 -4
  92. data/spec/features/admin/products/variant_spec.rb +1 -1
  93. data/spec/features/admin/promotions/promotion_spec.rb +52 -0
  94. data/spec/features/admin/store_credits_spec.rb +3 -3
  95. data/spec/features/admin/users_spec.rb +22 -0
  96. data/spec/spec_helper.rb +1 -2
  97. data/spec/support/appear_before_matcher.rb +1 -1
  98. data/spec/teaspoon_env.rb +23 -8
  99. data/vendor/assets/fonts/inter/Inter-Regular.woff +0 -0
  100. data/vendor/assets/fonts/inter/Inter-Regular.woff2 +0 -0
  101. data/vendor/assets/fonts/inter/Inter-SemiBold.woff +0 -0
  102. data/vendor/assets/fonts/inter/Inter-SemiBold.woff2 +0 -0
  103. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +4 -0
  104. metadata +22 -10
  105. data/.eslintrc +0 -21
@@ -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-navbar-submenu;
29
30
  display: block;
30
31
  border: 1px solid $color-border;
31
- border-radius: 2px 2px 0 0;
32
+ border-radius: 4px 4px 0 0;
32
33
  line-height: 1;
33
34
  }
34
35
 
@@ -44,12 +45,12 @@
44
45
  &.active:hover {
45
46
  background: white;
46
47
  border-bottom-color: white;
47
- color: $body-color;
48
+ color: $color-navbar-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-navbar-active;
53
54
  }
54
55
  }
55
56
 
@@ -0,0 +1,24 @@
1
+ // Numbered colors variables are deprecated and will be removed in Solidus v3.0
2
+ @include solidus-deprecated-variable("color-1", "color-white");
3
+ $color-1: $color-white !default;
4
+
5
+ @include solidus-deprecated-variable("color-2", "color-primary");
6
+ $color-2: $color-primary !default;
7
+
8
+ @include solidus-deprecated-variable("color-3", "color-dark-light");
9
+ $color-3: $color-dark-light !default;
10
+
11
+ @include solidus-deprecated-variable("color-4", "color-dark");
12
+ $color-4: $color-dark !default;
13
+
14
+ @include solidus-deprecated-variable("color-5", "color-red");
15
+ $color-5: $color-red !default;
16
+
17
+ @include solidus-deprecated-variable("color-6", "color-yellow");
18
+ $color-6: $color-yellow !default;
19
+
20
+ @include solidus-deprecated-variable("color-7", "color-light");
21
+ $color-7: $color-light !default;
22
+
23
+ @include solidus-deprecated-variable("color-8", "color-dark-light");
24
+ $color-8: $color-dark-light !default;
@@ -7,7 +7,7 @@
7
7
 
8
8
  $output-solidus-deprecation-warnings: true !default;
9
9
 
10
- @mixin solidus-deprecated-variable($variable, $replacement) {
10
+ @mixin bs-deprecated-variable($variable, $replacement) {
11
11
  @if $output-solidus-deprecation-warnings == true {
12
12
  @if global-variable-exists($variable) {
13
13
  @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
@@ -15,3 +15,12 @@ $output-solidus-deprecation-warnings: true !default;
15
15
  }
16
16
  }
17
17
  }
18
+
19
+ @mixin solidus-deprecated-variable($variable, $replacement) {
20
+ @if $output-solidus-deprecation-warnings == true {
21
+ @if global-variable-exists($variable) {
22
+ @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
23
+ "removed in Solidus 3.0. Please use `$#{$replacement}` instead";
24
+ }
25
+ }
26
+ }
@@ -4,65 +4,85 @@
4
4
 
5
5
  // Fonts
6
6
  //--------------------------------------------------------------
7
- $font-size-pill: 11px;
7
+ $font-size-pill: 11px;
8
+ $label-font-size: 12px;
8
9
 
9
10
  // Colors
10
11
  //--------------------------------------------------------------
11
12
 
12
13
  // Basic color palette for admin
13
- $color-1: #FFFFFF !default; // White
14
- $color-2: #9FC820 !default; // Green
15
- $color-3: #5498DA !default; // Light Blue
16
- $color-4: #6788A2 !default; // Dark Blue
17
- $color-5: #C60F13 !default; // Red
18
- $color-6: #FF9300 !default; // Yellow
19
- $color-7: #F4F4F4 !default; // Light Gray
14
+
15
+ $color-dark: #24282F !default;
16
+ $color-dark-dark: #5B6778 !default;
17
+ $color-dark-light: #808C9E !default;
18
+ $color-dark-accent: #C7CDD5 !default;
19
+
20
+ $color-primary: #3D76F1 !default;
21
+ $color-primary-light: #E3EBFD !default;
22
+
23
+ $color-light: #F9FAFB !default;
24
+ $color-light-dark: #E5E7EB !default;
25
+ $color-light-accent: #D7DAE0 !default;
26
+
27
+ $color-white: #FFFFFF !default;
28
+
29
+ $color-red: #CE452A !default;
30
+ $color-yellow: #FFDD59 !default;
31
+ $color-green: #52B73B !default;
20
32
 
21
33
  // Basic accents for admin
22
- $box-shadow: 0px 3px 3px -2px hsla(0, 0%, 0%, 0.2) !default;
34
+ $box-shadow: 0 0 4px 0 rgba(0, 0, 0, .12) !default;
23
35
 
24
36
  // Body base colors
25
- $color-border: very-light($color-3, 12) !default;
37
+ $color-border: $color-light-dark !default;
38
+ $color-disabled: $color-dark-light !default;
26
39
 
27
40
  // Basic navigation colors
28
- $color-sidebar-bg: $color-1 !default;
41
+ $color-header-bg: $color-light !default;
42
+ $color-sidebar-bg: $color-light !default;
29
43
  $color-sidebar-border: $color-border !default;
30
- $color-navbar: $color-1 !default;
31
- $color-navbar-bg: $color-3 !default;
32
- $color-navbar-active: $color-1 !default;
33
- $color-navbar-active-bg: $color-2 !default;
34
- $color-navbar-submenu: $color-3 !default;
35
- $color-navbar-submenu-bg: very-light($color-navbar-bg, 4) !default;
36
- $color-navbar-submenu-active: $color-2 !default;
37
- $color-navbar-footer: $color-3 !default;
38
- $color-navbar-footer-bg: $color-sidebar-bg !default;
39
- $color-navbar-footer-active: $color-2 !default;
44
+ $color-navbar: $color-dark !default;
45
+ $color-navbar-bg: $color-light !default;
46
+ $color-navbar-active: $color-primary !default;
47
+ $color-navbar-active-bg: $color-light !default;
48
+ $color-navbar-submenu: $color-dark-light !default;
49
+ $color-navbar-submenu-bg: $color-light !default;
50
+ $color-navbar-submenu-active: $color-primary !default;
51
+ $color-navbar-footer: $color-dark !default;
52
+ $color-navbar-footer-bg: $color-light !default;
53
+ $color-navbar-footer-active: $color-primary !default;
54
+ $color-icon-navbar: $color-dark-light !default;
40
55
 
41
56
  // Basic flash colors
42
- @include solidus-deprecated-variable("color-success", "brand-success");
43
- $color-success: $color-2 !default;
44
- @include solidus-deprecated-variable("color-notice", "brand-warning");
45
- $color-notice: $color-6 !default;
46
- @include solidus-deprecated-variable("color-error", "brand-danger");
47
- $color-error: $color-5 !default;
57
+ @include bs-deprecated-variable("color-success", "brand-success");
58
+ $color-success: $color-green !default;
59
+ @include bs-deprecated-variable("color-notice", "brand-warning");
60
+ $color-notice: $color-yellow !default;
61
+ @include bs-deprecated-variable("color-error", "brand-danger");
62
+ $color-error: $color-red !default;
63
+
64
+ // Breadcrumb custom variable
65
+
66
+ $breadcrumb-color: $color-dark-light;
48
67
 
49
68
  // Color for spinner
50
- $color-spinner: #fff;
69
+ $color-spinner: $color-white;
51
70
 
52
71
  // Style Guide
53
- $color-style-guide-code: darken($color-7, 10%);
54
- $color-style-guide-link: darken($color-7, 65%);
55
- $color-style-guide-nav: $color-7;
56
- $color-style-guide-nav-border: darken($color-7, 5%);
57
- $color-style-guide-nav-link: darken($color-7, 65%);
58
- $color-style-guide-nav-link-hover: darken($color-7, 5%);
59
- $color-style-guide-section-border: darken($color-7, 10%);
60
- $color-style-guide-swatch-border: darken($color-7, 10%);
72
+ $color-style-guide-code: darken($color-light, 10%);
73
+ $color-style-guide-link: darken($color-light, 65%);
74
+ $color-style-guide-nav: $color-light;
75
+ $color-style-guide-nav-border: darken($color-light, 5%);
76
+ $color-style-guide-nav-link: darken($color-light, 65%);
77
+ $color-style-guide-nav-link-hover: darken($color-light, 5%);
78
+ $color-style-guide-section-border: darken($color-light, 10%);
79
+ $color-style-guide-swatch-border: darken($color-light, 10%);
80
+ $color-style-guide-table-border: #CEE1F4;
61
81
 
62
82
  // Table colors
63
- $color-tbl-odd: $color-1 !default;
64
- $color-tbl-even: very-light($color-3, 4) !default;
65
- $color-tbl-thead: very-light($color-3, 4) !default;
83
+ $color-tbl-odd: $color-white !default;
84
+ $color-tbl-even: very-light($color-dark-light, 4) !default;
85
+ $color-tbl-thead: very-light($color-dark-light, 4) !default;
66
86
 
67
87
  // Pill colors
68
88
  //
@@ -146,3 +166,6 @@ $border-sidebar: 1px solid $color-sidebar-border !default;
146
166
  // Main
147
167
  //--------------------------------------------------------------
148
168
  $main-header-height: 75px !default;
169
+
170
+ $content-wrapper-bg: $color-white;
171
+ $admin-body-bg: $color-white;
@@ -5,3 +5,4 @@
5
5
  file in your application and set variables according to
6
6
  globals/_variables.scss file.
7
7
  --------------------------------------------------------- */
8
+
@@ -1,4 +1,4 @@
1
- @mixin caret($width: 1em, $height: 1em, $direction: up, $color-caret: $color-3) {
1
+ @mixin caret($width: 1em, $height: 1em, $direction: up, $color-caret: $color-dark-light) {
2
2
  &:before {
3
3
  content: '';
4
4
  display: block;
@@ -1,4 +1,4 @@
1
- @mixin line-through($color: $color-2, $background: $body-bg) {
1
+ @mixin line-through($color: $color-primary, $background: $body-bg) {
2
2
  position: relative;
3
3
  text-align: center;
4
4
 
@@ -1,17 +1,23 @@
1
1
  .log_entry {
2
2
  &.success {
3
- background: lighten($color-2, 15);
3
+ background: lighten($color-primary, 15);
4
4
 
5
5
  td h4 {
6
6
  color: darken($body-color, 25);
7
+ i {
8
+ color: $color-primary;
9
+ }
7
10
  }
8
11
  }
9
12
 
10
13
  &.fail {
11
- background: lighten($color-5, 25);
14
+ background: lighten($color-red, 25);
12
15
 
13
16
  td h4 {
14
17
  color: lighten($body-color, 50);
18
+ i {
19
+ color: $color-red;
20
+ }
15
21
  }
16
22
  }
17
23
  }
@@ -17,7 +17,9 @@
17
17
  .order-total {
18
18
  font-size: 35px;
19
19
  font-weight: $font-weight-bold;
20
- color: theme-color("success");
20
+ background: $color-primary-light;
21
+ padding: .1em .3em;
22
+ border-radius: 3px;
21
23
  }
22
24
  }
23
25
 
@@ -28,7 +30,9 @@
28
30
  .customer {
29
31
  font-size: 20px;
30
32
  font-weight: $font-weight-bold;
31
- color: theme-color("success");
33
+ background: $color-primary-light;
34
+ padding: .1em .3em;
35
+ border-radius: 3px;
32
36
  }
33
37
  }
34
38
 
@@ -37,10 +41,17 @@
37
41
  color: $body-color;
38
42
 
39
43
  .shipment-number {
40
- color: theme-color("success");
44
+ color: $color-dark-dark;
45
+ background: $color-primary-light;
46
+ padding: .1em .3em;
47
+ border-radius: 3px;
41
48
  }
42
49
  .stock-location-name {
43
- color: theme-color("success");
50
+ color: $color-dark-dark;
51
+ background: $color-primary-light;
52
+ padding: .1em .3em;
53
+ border-radius: 3px;
54
+ word-break: break-word;
44
55
  }
45
56
  }
46
57
  }
@@ -58,8 +69,8 @@ label[for="order_bill_address_attributes_firstname"] {
58
69
  }
59
70
 
60
71
  #risk_analysis legend {
61
- background-color: #c00;
62
- color: #FFF;
72
+ background-color: $color-red;
73
+ color: $color-white;
63
74
  font-size: 2em;
64
75
  }
65
76
 
@@ -31,7 +31,9 @@ div[data-hook="admin_products_index_search_buttons"] {
31
31
  margin-bottom: 15px;
32
32
 
33
33
  strong {
34
- color: $color-2;
34
+ background: $color-primary-light;
35
+ padding: .1em .3em;
36
+ border-radius: 3px;
35
37
  }
36
38
  }
37
39
 
@@ -51,7 +51,7 @@
51
51
  top: 10px;
52
52
 
53
53
  &:hover {
54
- color: #c60f13;
54
+ color: $color-red;
55
55
  }
56
56
  }
57
57
  }
@@ -71,7 +71,7 @@
71
71
  top: 10px;
72
72
 
73
73
  &:hover {
74
- color: #c60f13;
74
+ color: $color-red;
75
75
  }
76
76
  }
77
77
  }
@@ -97,13 +97,13 @@
97
97
  }
98
98
 
99
99
  &.action-remove {
100
- background-color: lighten($color-5, 50);
101
- border-color: lighten($color-5, 45);
100
+ background-color: lighten($color-red, 50);
101
+ border-color: lighten($color-red, 45);
102
102
  text-decoration: line-through;
103
103
 
104
104
  .promotion-title, input[type="text"], input[type="number"],
105
105
  .token-input-list {
106
- border-color: lighten($color-5, 45);
106
+ border-color: lighten($color-red, 45);
107
107
  }
108
108
  }
109
109
 
@@ -48,7 +48,7 @@
48
48
 
49
49
  > a {
50
50
  font-size: 1.2rem;
51
- font-weight: 300;
51
+ font-weight: $font-weight-normal;
52
52
  }
53
53
  }
54
54
 
@@ -64,7 +64,7 @@
64
64
  }
65
65
 
66
66
  &-intro,
67
- &-section:not(:last-child) {
67
+ &-section {
68
68
  margin: 4rem 0;
69
69
  }
70
70
 
@@ -112,8 +112,8 @@
112
112
  table.with-actions-borders {
113
113
  th, td {
114
114
  &.actions {
115
- border-right: 1px solid #cee1f4 !important;
116
- border-bottom: 1px solid #cee1f4 !important;
115
+ border-right: 1px solid $color-style-guide-table-border !important;
116
+ border-bottom: 1px solid $color-style-guide-table-border !important;
117
117
  }
118
118
  }
119
119
  }
@@ -12,7 +12,7 @@
12
12
  }
13
13
 
14
14
  .taxon {
15
- background-color: very-light($color-3);
15
+ background-color: very-light($color-dark-light);
16
16
  border: 1px solid $color-border;
17
17
  border-radius: $border-radius;
18
18
  color: $body-color;
@@ -0,0 +1,15 @@
1
+ @font-face {
2
+ font-family: 'Inter';
3
+ font-style: normal;
4
+ font-weight: $font-weight-normal;
5
+ src: font-url("inter/Inter-Regular.woff2") format("woff2"),
6
+ font-url("inter/Inter-Regular.woff") format("woff");
7
+ }
8
+
9
+ @font-face {
10
+ font-family: 'Inter';
11
+ font-style: normal;
12
+ font-weight: $font-weight-bold;
13
+ src: font-url("inter/Inter-SemiBold.woff2") format("woff2"),
14
+ font-url("inter/Inter-SemiBold.woff") format("woff");
15
+ }
@@ -41,6 +41,8 @@ textarea {
41
41
  }
42
42
 
43
43
  label {
44
+ font-size: inherit;
45
+
44
46
  &.required:after {
45
47
  content: " *";
46
48
  }
@@ -64,7 +66,19 @@ button,
64
66
  // In order to avoid the clashing between using `:not(.btn)` and
65
67
  // `@extend .btn` we need to use an attribute selector of `[class*="btn"]`.
66
68
  @extend .btn;
67
- @include button-variant(theme-color("primary"), theme-color("primary"));
69
+ background: linear-gradient($color-white, lighten($color-light-dark, 2%));
70
+ color: $color-dark;
71
+ border-color: $color-dark-accent;
72
+
73
+ &:hover {
74
+ background: linear-gradient($color-white, $color-light-dark);
75
+ color: $color-primary;
76
+ }
77
+
78
+ &.disabled,
79
+ &:disabled {
80
+ color: $color-disabled;
81
+ }
68
82
  }
69
83
 
70
84
  &:before {
@@ -106,6 +120,10 @@ span.info {
106
120
  margin-top: 2.25rem;
107
121
  }
108
122
  }
123
+
124
+ label {
125
+ font-size: $label-font-size;
126
+ }
109
127
 
110
128
  ul {
111
129
  list-style: none;
@@ -131,21 +149,21 @@ span.info {
131
149
  &.withError {
132
150
  .field_with_errors {
133
151
  label {
134
- color: very-light(theme-color("danger"), 30);
152
+ color: theme-color("danger");
135
153
  }
136
154
 
137
155
  input {
138
- border-color: very-light(theme-color("danger"), 15);
156
+ border-color: theme-color("danger");
139
157
  }
140
158
  }
141
159
  .formError {
142
- color: very-light(theme-color("danger"), 30);
160
+ color: lighten(theme-color("danger"), 15);
143
161
  font-style: italic;
144
162
  font-size: 85%;
145
163
  }
146
164
  .select2-container {
147
165
  border-radius: 4px;
148
- border: 1px solid very-light(theme-color("danger"), 15);
166
+ border: 1px solid theme-color("danger");
149
167
  }
150
168
  }
151
169
  }
@@ -172,12 +190,14 @@ fieldset {
172
190
  }
173
191
 
174
192
  legend {
175
- color: $color-2;
176
- font-size: 16px;
193
+ color: $color-dark;
194
+ font-size: 14px;
177
195
  font-weight: $font-weight-bold;
178
196
  text-align: center;
179
197
  padding: 8px 15px;
180
198
  width: auto;
199
+ margin-left: auto;
200
+ margin-right: auto;
181
201
 
182
202
  -webkit-font-smoothing: antialiased;
183
203
  -moz-osx-font-smoothing: grayscale;