beyond_canvas 0.19.2.pre → 0.23.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (83) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -45
  3. data/app/assets/images/icons/adblocker.svg +5 -0
  4. data/app/assets/images/icons/checkbox_checked.svg +1 -1
  5. data/app/assets/images/icons/checkbox_unchecked.svg +1 -1
  6. data/app/assets/images/icons/external_link.svg +1 -0
  7. data/app/assets/images/icons/toggle.svg +1 -0
  8. data/app/assets/images/icons/toggle_checked.svg +3 -0
  9. data/app/assets/images/icons/toggle_unchecked.svg +3 -0
  10. data/app/assets/javascripts/beyond_canvas/base.js +107 -44
  11. data/app/assets/stylesheets/beyond_canvas/base.scss +21 -18
  12. data/app/assets/stylesheets/beyond_canvas/components/_action_bar.scss +11 -6
  13. data/app/assets/stylesheets/beyond_canvas/components/_breadcrumbs.scss +8 -4
  14. data/app/assets/stylesheets/beyond_canvas/components/_buttons.scss +50 -56
  15. data/app/assets/stylesheets/beyond_canvas/components/_cards.scss +20 -12
  16. data/app/assets/stylesheets/beyond_canvas/components/_collapse.scss +33 -0
  17. data/app/assets/stylesheets/beyond_canvas/components/_flash.scss +13 -12
  18. data/app/assets/stylesheets/beyond_canvas/components/_forms.scss +2 -2
  19. data/app/assets/stylesheets/beyond_canvas/components/_inputs.scss +186 -38
  20. data/app/assets/stylesheets/beyond_canvas/components/_links.scss +80 -4
  21. data/app/assets/stylesheets/beyond_canvas/components/_main.scss +3 -3
  22. data/app/assets/stylesheets/beyond_canvas/components/_menu.scss +13 -0
  23. data/app/assets/stylesheets/beyond_canvas/components/_modals.scss +48 -18
  24. data/app/assets/stylesheets/beyond_canvas/components/_notices.scss +12 -13
  25. data/app/assets/stylesheets/beyond_canvas/components/_scrollbox.scss +5 -4
  26. data/app/assets/stylesheets/beyond_canvas/components/_select2.scss +70 -0
  27. data/app/assets/stylesheets/beyond_canvas/components/_statuses.scss +28 -0
  28. data/app/assets/stylesheets/beyond_canvas/components/_step_list.scss +67 -0
  29. data/app/assets/stylesheets/beyond_canvas/components/_tables.scss +10 -5
  30. data/app/assets/stylesheets/beyond_canvas/components/_titles.scss +1 -1
  31. data/app/assets/stylesheets/beyond_canvas/mailer.scss +2 -1
  32. data/app/assets/stylesheets/beyond_canvas/settings/_base_variables.scss +241 -0
  33. data/app/assets/stylesheets/beyond_canvas/settings/{_variables.scss → _constant_variables.scss} +60 -53
  34. data/app/assets/stylesheets/beyond_canvas/settings/_custom_variables.scss +233 -0
  35. data/app/assets/stylesheets/beyond_canvas/settings/_typography.scss +7 -3
  36. data/app/assets/stylesheets/beyond_canvas/utilities/_mixins.scss +39 -3
  37. data/app/controllers/beyond_canvas/authentications_controller.rb +18 -2
  38. data/app/controllers/beyond_canvas/system_controller.rb +3 -1
  39. data/app/controllers/beyond_canvas/webhooks_controller.rb +49 -0
  40. data/app/controllers/concerns/beyond_canvas/add_blocker_check.rb +17 -0
  41. data/app/controllers/concerns/beyond_canvas/custom_styles.rb +54 -0
  42. data/app/controllers/concerns/beyond_canvas/locale_management.rb +31 -8
  43. data/app/controllers/concerns/beyond_canvas/request_validation.rb +6 -0
  44. data/app/form_builders/beyond_canvas/form_builder.rb +62 -49
  45. data/app/helpers/beyond_canvas/application_helper.rb +48 -4
  46. data/app/helpers/beyond_canvas/form_tag_helper.rb +130 -0
  47. data/app/helpers/beyond_canvas/statuses_helper.rb +26 -0
  48. data/app/javascript/beyond_canvas/base.js +1 -1
  49. data/app/javascript/beyond_canvas/initializers/buttons.js +49 -29
  50. data/app/javascript/beyond_canvas/initializers/collapse.js +8 -0
  51. data/app/javascript/beyond_canvas/initializers/flash.js +33 -11
  52. data/app/javascript/beyond_canvas/initializers/inputs.js +9 -4
  53. data/app/javascript/beyond_canvas/initializers/modals.js +46 -10
  54. data/app/views/beyond_canvas/mailer/_header.html.erb +2 -2
  55. data/app/views/beyond_canvas/shared/_breadcrumbs.html.erb +5 -2
  56. data/app/views/beyond_canvas/shared/_flash.html.erb +14 -10
  57. data/app/views/beyond_canvas/shared/_head.html.erb +4 -0
  58. data/app/views/beyond_canvas/shared/_locales.html.erb +1 -1
  59. data/app/views/layouts/beyond_canvas/application.html.erb +1 -2
  60. data/app/views/layouts/beyond_canvas/public.html.erb +1 -1
  61. data/config/initializers/beyond_canvas/constants.rb +13 -0
  62. data/config/initializers/beyond_canvas/session_store.rb +8 -0
  63. data/lib/beyond_canvas/configuration.rb +9 -1
  64. data/lib/beyond_canvas/engine.rb +7 -0
  65. data/lib/beyond_canvas/rails/routes.rb +27 -7
  66. data/lib/beyond_canvas/version.rb +1 -1
  67. data/lib/beyond_canvas/webhook_event_registration.rb +19 -0
  68. data/lib/beyond_canvas.rb +6 -4
  69. data/lib/generators/beyond_canvas/custom_styles/templates/beyond_canvas_custom_styles.scss +33 -0
  70. data/lib/generators/beyond_canvas/install/install_generator.rb +6 -0
  71. data/lib/generators/beyond_canvas/install/templates/beyond_canvas.rb.erb +38 -1
  72. data/lib/generators/beyond_canvas/model/model_generator.rb +3 -0
  73. data/lib/generators/beyond_canvas/webhook/templates/webhooks_controller.rb +22 -0
  74. data/lib/generators/beyond_canvas/webhook/webhook_generator.rb +15 -0
  75. data/lib/models/concerns/authentication.rb +10 -3
  76. data/lib/models/concerns/utils.rb +6 -5
  77. data/lib/models/concerns/webhook.rb +123 -0
  78. data/lib/models/shop.rb +1 -0
  79. metadata +73 -40
  80. data/app/assets/stylesheets/beyond_canvas/components/_comments.scss +0 -6
  81. data/app/assets/stylesheets/beyond_canvas/components/_containers.scss +0 -37
  82. data/app/views/beyond_canvas/shared/_modal.html.erb +0 -6
  83. data/config/routes.rb +0 -12
@@ -1,8 +1,10 @@
1
1
  .table {
2
- width: 100%;
3
2
  border-collapse: collapse;
3
+ table-layout: fixed;
4
+ width: 100%;
4
5
 
5
6
  th, td {
7
+ box-sizing: border-box;
6
8
  padding: 15px;
7
9
  text-align: left;
8
10
  }
@@ -12,19 +14,22 @@
12
14
  font-weight: 700;
13
15
 
14
16
  &:first-child {
15
- background-color: $table-header-background;
17
+ background-color: var(--table-header-background);
16
18
  }
17
19
 
18
20
  &:nth-child(2) {
19
- border-bottom: 2px solid $table-border-color;
21
+ border-bottom: 2px solid var(--table-row-border);
20
22
  }
21
23
  }
22
24
  }
23
25
 
24
26
  tbody {
25
27
  tr {
26
- &:not(:last-child) {
27
- border-bottom: 1px solid $table-border-color;
28
+ background-color: var(--table-row-background);
29
+ border-bottom: var(--table-row-border);
30
+
31
+ &:hover {
32
+ background-color: var(--table-row-background-hover);
28
33
  }
29
34
  }
30
35
  }
@@ -3,5 +3,5 @@
3
3
  line-height: 1;
4
4
  font-weight: normal;
5
5
  font-size: 190%;
6
- color: $title-color;
6
+ color: var(--workspace-headline);
7
7
  }
@@ -1,5 +1,6 @@
1
1
  @import "bourbon";
2
2
 
3
- @import "settings/variables";
3
+ @import "settings/constant_variables";
4
+ @import "settings/base_variables";
4
5
 
5
6
  @import "components/markdown";
@@ -0,0 +1,241 @@
1
+ :root {
2
+ /*
3
+ /* ---------------------------------------------------
4
+ /* Brand
5
+ /* --------------------------------------------------- */
6
+ --primary-color: Orange;
7
+ --secondary-color: #383838;
8
+ --tertiary-color: DeepSkyBlue;
9
+ /*
10
+ /* ---------------------------------------------------
11
+ /* Global layout
12
+ /* --------------------------------------------------- */
13
+ --workspace-text: #3e3e3e;
14
+ --workspace-background: #e6e6e6;
15
+ --workspace-border: #d2d2d2;
16
+ --workspace-headline: #676767;
17
+ --padding: 40px;
18
+ --borderRadius: 3px;
19
+ --surfaceHover-color: #b3ecff;
20
+ /*
21
+ /* ---------------------------------------------------
22
+ /* Card
23
+ /* --------------------------------------------------- */
24
+ --card-headline: #a3a3a3;
25
+ --card-background: white;
26
+ --card-shadow: 0 2px 7px rgba(0, 0, 0, 0.2);
27
+ --card-divider-border: 1px solid #e6e6e6;
28
+ --card-borderRadius: 3px;
29
+ --card-padding: 40px;
30
+ /*
31
+ /* ---------------------------------------------------
32
+ /* Breadcrumb
33
+ /* --------------------------------------------------- */
34
+ --breadcrumb-text: #787878;
35
+ --breadcrumb-link: #787878;
36
+ --breadcrumb-link-hover: #525252;
37
+ --breadcrumb-icon: #787878;
38
+ /*
39
+ /* ---------------------------------------------------
40
+ /* Action bar
41
+ /* --------------------------------------------------- */
42
+ --workspace-toolbar-background: white;
43
+ --workspace-toolbar-border: 1px solid rgba(0, 0, 0, 0.2);
44
+ --header-bar-height: 73px;
45
+ /*
46
+ /* ---------------------------------------------------
47
+ /* Notification and Toast messages
48
+ /* --------------------------------------------------- */
49
+ --notification-background: white;
50
+ --notification-text: gray;
51
+ --notification-borderRadius: 4px;
52
+ --notification-boxShadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
53
+ --notification-success: #97c344;
54
+ --notification-info: #999999;
55
+ --notification-warning: #f3b547;
56
+ --notification-danger: #da3c3c;
57
+ /*
58
+ /* ---------------------------------------------------
59
+ /* Modal
60
+ /* --------------------------------------------------- */
61
+ --modal-overlay-background: rgba(0, 0, 0, 0.75);
62
+ --modal-container-background: white;
63
+ --modal-container-borderRadius: 3px;
64
+ --modal-closeButton-icon: #8b8b8b;
65
+ --modal-closeButton-icon-hover: #717171;
66
+ --modal-container-padding: 40px;
67
+ /*
68
+ /* ---------------------------------------------------
69
+ /* Empty states
70
+ /* --------------------------------------------------- */
71
+ --emptyState-surface: #e3e3e3;
72
+ --emptyState-bubbles: #dedede;
73
+ --emptyState-outline: #575757;
74
+ --emptyState-headline: #676767;
75
+ --emptyState-help-text: gray;
76
+ /*
77
+ /* ---------------------------------------------------
78
+ /* Loading spinner
79
+ /* --------------------------------------------------- */
80
+ --spinner-border: #c0c0c0;
81
+ --spinner-border-highlighting: #676767;
82
+ /*
83
+ /* ---------------------------------------------------
84
+ /* States
85
+ /* --------------------------------------------------- */
86
+ --danger-color: #da3c3c;
87
+ --success-color: #97c344;
88
+ --warning-color: #f3b547;
89
+ --disabled-color: #d0d0d0;
90
+ --default-color: #999999;
91
+ /*
92
+ /* ---------------------------------------------------
93
+ /* Status bubbles
94
+ /* --------------------------------------------------- */
95
+ --todo-status-background: #f9dca7;
96
+ --todo-status-text: #af740b;
97
+ --active-status-background: #cde2a5;
98
+ --active-status-text: #4e6721;
99
+ --danger-status-background: #eeb3a7;
100
+ --danger-status-text: #c72626;
101
+ --outline-status-background: transparent;
102
+ --outline-status-border: #b3b3b3;
103
+ --outline-status-text: #808080;
104
+ /*
105
+ /* ---------------------------------------------------
106
+ /* Link
107
+ /* --------------------------------------------------- */
108
+ --primaryLink-color: DeepSkyBlue;
109
+ --primaryLink-hover-color: #0099cc;
110
+ --defaultLink-color: #787878;
111
+ --defaultLink-hover-color: #5e5e5e;
112
+ /*
113
+ /* ---------------------------------------------------
114
+ /* Buttons
115
+ /* --------------------------------------------------- */
116
+ --button-text: white;
117
+ --button-borderRadius: 4px;
118
+ --button-borderBottom-width: 2px;
119
+ --button-horizontal-padding: calc(8px - 2px / 2);
120
+ --button-default-background: #999999;
121
+ --button-default-background-hover: #7f7f7f;
122
+ --button-default-borderBottom-color: #7f7f7f;
123
+ --button-primary-background: Orange;
124
+ --button-primary-background-hover: #cc8400;
125
+ --button-primary-borderBottom-color: #cc8400;
126
+ --button-danger-background: #da3c3c;
127
+ --button-danger-background-hover: #ae3535;
128
+ --button-danger-borderBottom-color: #ae3535;
129
+ --button-disabled-background: #d0d0d0;
130
+ --button-disabled-text: #909090;
131
+ --button-disabled-textShadow: 1px 1px 0 #ffffff;
132
+ --button-outline-border-color: Orange;
133
+ --button-outline-border-width: 1px;
134
+ --button-outline-background: transparent;
135
+ --button-outline-background-hover: #ffedcc;
136
+ --button-outline-text: #eb9800;
137
+ --button-link-default-text: #787878;
138
+ --button-link-primary-text: DeepSkyBlue;
139
+ /*
140
+ /* ---------------------------------------------------
141
+ /* RichTextEditor
142
+ /* --------------------------------------------------- */
143
+ --textEditor-text: #3e3e3e;
144
+ --textEditor-background: white;
145
+ --textEditor-border-color: #d2d2d2;
146
+ --textEditor-border-radius: 3px;
147
+ --textEditor-toolbar-background: #f3f3f3;
148
+ --textEditor-toolbar-border-color: #d2d2d2;
149
+ --textEditor-button-background: #f3f3f3;
150
+ --textEditor-button-background-hover: #e6e6e6;
151
+ --textEditor-button-active-background: #d4d4d4;
152
+ --textEditor-button-icon: #676767;
153
+ --textEditor-button-icon-disabled: #b3b3b3;
154
+ /*
155
+ /* ---------------------------------------------------
156
+ /* Table
157
+ /* --------------------------------------------------- */
158
+ --table-row-border: 1px solid #e6e6e6;
159
+ --table-row-background: white;
160
+ --table-row-background-hover: #b3ecff;
161
+ --table-header-background: #ebebeb;
162
+ --table-header-link: #3e3e3e;
163
+ --table-header-link-hover: #252525;
164
+ --table-header-sort-icon-default: #b3b3b3;
165
+ --table-header-sort-icon: currentColor;
166
+ /*
167
+ /* ---------------------------------------------------
168
+ /* Media queries
169
+ /* --------------------------------------------------- */
170
+ --screen-xs-max: 47.9375em;
171
+ --screen-sm: 48em;
172
+ --screen-sm-max: 61.9375em;
173
+ --screen-md: 62em;
174
+ --screen-md-max: 74.9375em;
175
+ --screen-lg: 75em;
176
+ --screen-lg-max: 112.4375em;
177
+ --screen-xl: 112.5em;
178
+ /*
179
+ /* ---------------------------------------------------
180
+ /* Form elements
181
+ /* --------------------------------------------------- */
182
+ --formGroup-label: gray;
183
+ --formGroup-validation-error: #da3c3c;
184
+ --formGroup-validation-text: white;
185
+ --formGroup-validation-borderRadius: 3px;
186
+ --inputField-borderRadius: 3px;
187
+ --inputField-border: #d2d2d2;
188
+ --inputField-border-focus: Orange;
189
+ --inputField-text: #3e3e3e;
190
+ --inputField-background: white;
191
+ --inputField-background-focus: white;
192
+ --inputField-background-disabled: #f5f5f5;
193
+ --inputField-text-disabled: #9a9a9a;
194
+ --inputField-placeholder-text: #a4a4a4;
195
+ --inputField-hint-text: gray;
196
+ --smartInputField-suggestion-active: #b3ecff;
197
+ --smartInputField-value-background: #d9d9d9;
198
+ --smartInputField-value-text: #666666;
199
+ --smartInputField-value-icon: currentColor;
200
+ --smartInputField-value-icon-hover: #4d4d4d;
201
+ --smartInputField-value-borderRadius: 3px;
202
+ /*
203
+ /* ---------------------------------------------------
204
+ /* Checkboxes and Radio buttons
205
+ /* --------------------------------------------------- */
206
+ --check-color: #97c344;
207
+ --uncheck-color: #b3b3b3;
208
+ --check-disabled-text: #c5c5c5;
209
+ --check-disabled-icon: #d9d9d9;
210
+ /*
211
+ /* ---------------------------------------------------
212
+ /* FlipSwitch
213
+ /* --------------------------------------------------- */
214
+ --flipSwitch-unchecked-background: #b3b3b3;
215
+ --flipSwitch-checked-background: #97c344;
216
+ --flipSwitch-border: #c0c0c0;
217
+ --flipSwitch-label: gray;
218
+ --flipSwitch-text: silver;
219
+ /*
220
+ /* ---------------------------------------------------
221
+ /* Step list
222
+ /* --------------------------------------------------- */
223
+ --stepList-background: #f0f0f0;
224
+ --stepList-headline: #747474;
225
+ --stepList-bubble-line: #808080;
226
+ --stepList-bubble-background: #808080;
227
+ --stepList-bubble-text: white;
228
+ /*
229
+ /* ---------------------------------------------------
230
+ /* Reseller logo
231
+ /* --------------------------------------------------- */
232
+ --logo-width: 238px;
233
+ --logo-height: 76px;
234
+ /*
235
+ /* ---------------------------------------------------
236
+ /* Gray scale colors
237
+ /* --------------------------------------------------- */
238
+ --white: white;
239
+ --gray: gray;
240
+ --silver: silver;
241
+ }
@@ -1,3 +1,16 @@
1
+ :root {
2
+ // ************************************************************
3
+ // Menu
4
+ // ************************************************************
5
+ --menu-height: 60px;
6
+ }
7
+
8
+
9
+
10
+
11
+
12
+
13
+
1
14
  // ************************************************************
2
15
  // Colors
3
16
  // ************************************************************
@@ -13,16 +26,14 @@ $palette-danger: rgb(218, 60, 60) !default;
13
26
  // General styles
14
27
  // ************************************************************
15
28
 
16
- $main-background-public: rgb(233, 232, 220) !default;
17
- $main-background-application: rgb(233, 232, 220) !default;
18
29
  $main-transition: 0.125s ease-in;
30
+ $main-color: red;
19
31
 
20
32
  // ************************************************************
21
33
  // Typography
22
34
  // ************************************************************
23
35
 
24
36
  $main-font-family: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif';
25
- $main-color: rgb(62, 62, 62) !default;
26
37
  $main-line-height: 1.5;
27
38
  $main-font-size: 14px;
28
39
 
@@ -30,7 +41,6 @@ $main-font-size: 14px;
30
41
  // Headlines
31
42
  // ************************************************************
32
43
 
33
- $headline-color: rgb(122, 118, 76) !default;
34
44
  $headline-line-height: 1;
35
45
 
36
46
  // ************************************************************
@@ -40,6 +50,7 @@ $headline-line-height: 1;
40
50
  $link-primary-color: darken($palette-primary, 10%) !default;
41
51
  $link-secondary-color: darken($palette-cancel, 10%) !default;
42
52
  $link-danger-color: darken($palette-danger, 10%) !default;
53
+ $link-disabled-color: rgb(208,208,208) !default;
43
54
 
44
55
  // ************************************************************
45
56
  // Buttons
@@ -54,6 +65,10 @@ $button-secondary-color: $white !default;
54
65
  $button-danger-background: $palette-danger !default;
55
66
  $button-danger-color: $white !default;
56
67
 
68
+ $button-disabled-background: rgb(208,208,208) !default;
69
+ $button-disabled-color: rgb(144,144,144) !default;
70
+ $button-disabled-text-shadow: 1px 1px 0 $white !default;
71
+
57
72
  $button-border-radius: 3px !default;
58
73
  $button-box-shadow: true !default;
59
74
  $button-font-weight: 700;
@@ -63,13 +78,9 @@ $button-padding: 6px 12px 7px;
63
78
  // Cards
64
79
  // ************************************************************
65
80
 
66
- $card-border-radius: 3px !default;
67
- $card-box-shadow: 0 2px 7px rgba($black, 0.2) !default;
68
81
  $card-padding: 40px;
69
82
  $card-margin: 30px;
70
- $card-separator-color: rgb(222, 222, 222) !default;
71
- $card-separator-spacing: 50px;
72
- $card-title-color: rgb(247, 133, 96) !default;
83
+ $card-separator-spacing: 40px;
73
84
 
74
85
  // ************************************************************
75
86
  // Containers
@@ -77,12 +88,6 @@ $card-title-color: rgb(247, 133, 96) !default;
77
88
 
78
89
  $container-spacing: 30px;
79
90
 
80
- // ************************************************************
81
- // Labels
82
- // ************************************************************
83
-
84
- $label-color: rgb(128, 128, 128) !default;
85
-
86
91
  // ************************************************************
87
92
  // Inputs
88
93
  // ************************************************************
@@ -90,6 +95,8 @@ $label-color: rgb(128, 128, 128) !default;
90
95
  $input-border-color: rgb(217, 216, 195) !default;
91
96
  $input-border-color-focus: $palette-primary !default;
92
97
  $input-errors-color: $palette-danger !default;
98
+ $input-disabled-background: rgb(245,244,239) !default;
99
+ $input-disabled-color: rgb(163,161,137) !default;
93
100
 
94
101
  // ************************************************************
95
102
  // Checkboxes
@@ -100,6 +107,17 @@ $checkbox-checked-background: #ffffff !default; // This value MUST be HEX
100
107
  $checkbox-unchecked-color: #C2BF9D !default; // This value MUST be HEX
101
108
  $checkbox-unchecked-background: #ffffff !default; // This value MUST be HEX
102
109
 
110
+ // ************************************************************
111
+ // Toggles
112
+ // ************************************************************
113
+
114
+ $toggle-border-color: #cbc9ad !default;
115
+ $toggle-disabled-background: #f5f4ef !default;
116
+ $toggle-checked-background: #97c344 !default; // This value MUST be HEX
117
+ $toggle-checked-color: #ffffff !default; // This value MUST be HEX
118
+ $toggle-unchecked-background: #c2bf9d !default; // This value MUST be HEX
119
+ $toggle-unchecked-color: #ffffff !default; // This value MUST be HEX
120
+
103
121
  // ************************************************************
104
122
  // Radiobuttons
105
123
  // ************************************************************
@@ -119,28 +137,8 @@ $hint-color: rgb(158, 158, 158) !default;
119
137
  // Logo
120
138
  // ************************************************************
121
139
 
122
- $logo-margin-top-public: 0 !default;
123
- $logo-margin-bottom-public: 34px !default;
124
-
125
- // ************************************************************
126
- // Flash
127
- // ************************************************************
128
-
129
- $flash-success: rgb(123, 170, 81) !default;
130
- $flash-notice: rgb(123, 170, 81) !default;
131
- $flash-info: rgb(153, 153, 153) !default;
132
- $flash-warning: rgb(243, 181, 71) !default;
133
- $flash-error: rgb(218, 60, 60) !default;
134
- $flash-border-radius: 4px !default;
135
- $flash-box-shadow: 0 1px 2px 0 rgba($black, 0.2) !default;
136
- $flash-color: rgb(128, 128, 128) !default;
137
-
138
- // ************************************************************
139
- // Tables
140
- // ************************************************************
141
-
142
- $table-header-background: rgb(243, 242, 236) !default;
143
- $table-border-color: rgb(233, 232, 220) !default;
140
+ $logo-margin-top-public: 0;
141
+ $logo-margin-bottom-public: 34px;
144
142
 
145
143
  // ************************************************************
146
144
  // Comments
@@ -149,24 +147,13 @@ $table-border-color: rgb(233, 232, 220) !default;
149
147
  $comment-background: rgb(246, 246, 243) !default;
150
148
  $comment-color: rgb(170, 169, 156) !default;
151
149
 
152
- // ************************************************************
153
- // Notices
154
- // ************************************************************
155
-
156
- $notice-success-background: rgb(123, 170, 81) !default;
157
- $notice-notice-background: rgb(123, 170, 81) !default;
158
- $notice-info-background: rgb(153, 153, 153) !default;
159
- $notice-warning-background: rgb(243, 181, 71) !default;
160
- $notice-error-background: rgb(218, 60, 60) !default;
161
- $notice-border-radius: 4px !default;
162
- $notice-color: rgb(153, 153, 153) !default;
163
-
164
150
  // ************************************************************
165
151
  // Breadcrums
166
152
  // ************************************************************
167
153
 
168
- $breadcrum-color: rgb(122, 118, 76) !default;
169
- $breadcrum-color-current: rgb(61, 149, 137) !default;
154
+ $breadcrum-color: rgb(112, 110, 77) !default;
155
+ $breadcrum-color-hover: rgb(67, 65, 46) !default;
156
+ $breadcrum-color-current: rgb(112, 110, 77) !default;
170
157
 
171
158
  // ************************************************************
172
159
  // Titles
@@ -220,7 +207,27 @@ $sidebar-item-selected-background: #4eb7a8;
220
207
  // Modals
221
208
  // ************************************************************
222
209
 
223
- $modal-padding: 10px;
210
+ $modal-padding: 20px;
224
211
  $modal-width: 650px;
225
212
  $modal-close-icon-color: #8b8b8b !default;
226
- $modal-background-color: rgba(0, 0, 0, 0.5) !default;
213
+ $modal-background-color: rgba(0, 0, 0, 0.75) !default;
214
+
215
+ // ************************************************************
216
+ // Select2
217
+ // ************************************************************
218
+
219
+ $select2-border-color: $input-border-color !default;
220
+ $select2-border-color-focus: $input-border-color-focus !default;
221
+ $select2-close-icon-color: #79764b !default;
222
+ $select2-close-icon-color-hover: darken($select2-close-icon-color, 15%) !default;
223
+ $select2-tag-background: rgb(223, 222, 204) !default;
224
+ $select2-tag-color: rgb(122, 118, 76) !default;
225
+ $select2-disabled-background: rgb(245, 244, 239) !default;
226
+ $select2-option-hover-background: rgb(229, 241, 240) !default;
227
+ $select2-option-hover-color: rgb(62, 62, 62) !default;
228
+
229
+ // ************************************************************
230
+ // Collapsibles
231
+ // ************************************************************
232
+
233
+ $collapsible-color: $palette-primary !default;