cm-admin 0.8.9 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/.stylelintrc.json +3 -0
  3. data/.github/workflows/linters.yml +31 -0
  4. data/Gemfile +5 -1
  5. data/Gemfile.lock +24 -11
  6. data/app/assets/stylesheets/cm_admin/base/auth.scss +1 -1
  7. data/app/assets/stylesheets/cm_admin/base/common.scss +3 -3
  8. data/app/assets/stylesheets/cm_admin/base/filters.scss +11 -17
  9. data/app/assets/stylesheets/cm_admin/base/form.scss +119 -50
  10. data/app/assets/stylesheets/cm_admin/base/main-nav.scss +3 -7
  11. data/app/assets/stylesheets/cm_admin/base/navbar.scss +3 -2
  12. data/app/assets/stylesheets/cm_admin/base/quicksearch.scss +4 -6
  13. data/app/assets/stylesheets/cm_admin/base/scaffold.scss +47 -2
  14. data/app/assets/stylesheets/cm_admin/base/show.scss +11 -9
  15. data/app/assets/stylesheets/cm_admin/base/sidebar.scss +9 -19
  16. data/app/assets/stylesheets/cm_admin/base/table.scss +258 -325
  17. data/app/assets/stylesheets/cm_admin/base/tabs.scss +1 -2
  18. data/app/assets/stylesheets/cm_admin/components/_buttons.scss +19 -6
  19. data/app/assets/stylesheets/cm_admin/components/_drawer.scss +4 -8
  20. data/app/assets/stylesheets/cm_admin/components/_dropdown-popup.scss +1 -2
  21. data/app/assets/stylesheets/cm_admin/components/_input.scss +1 -1
  22. data/app/assets/stylesheets/cm_admin/components/_status-tag.scss +3 -2
  23. data/app/assets/stylesheets/cm_admin/helpers/_variable.scss +4 -0
  24. data/app/assets/stylesheets/cm_admin/scaffold.scss +2 -2
  25. data/app/controllers/cm_admin/resource_controller.rb +4 -2
  26. data/app/javascript/packs/cm_admin/filters.js +1 -1
  27. data/app/javascript/packs/cm_admin/scaffolds.js +34 -1
  28. data/app/views/cm_admin/main/_actions_dropdown.html.slim +2 -2
  29. data/app/views/cm_admin/main/_associated_table.html.slim +20 -21
  30. data/app/views/cm_admin/main/_member_custom_action_modal.html.slim +1 -1
  31. data/app/views/cm_admin/main/_nested_fields.html.slim +26 -9
  32. data/app/views/cm_admin/main/_nested_table_form.html.slim +9 -10
  33. data/app/views/cm_admin/main/_table.html.slim +13 -14
  34. data/app/views/cm_admin/main/_tabs.html.slim +1 -1
  35. data/app/views/cm_admin/main/associated_index.html.slim +4 -5
  36. data/app/views/cm_admin/main/index.html.slim +13 -14
  37. data/app/views/cm_admin/main/show.html.slim +2 -2
  38. data/app/views/layouts/cm_admin.html.slim +5 -5
  39. data/lib/cm_admin/model.rb +6 -1
  40. data/lib/cm_admin/models/action.rb +1 -1
  41. data/lib/cm_admin/models/column.rb +16 -3
  42. data/lib/cm_admin/models/dsl_method.rb +17 -4
  43. data/lib/cm_admin/models/field.rb +7 -1
  44. data/lib/cm_admin/models/filter.rb +1 -1
  45. data/lib/cm_admin/models/utils/associations.rb +25 -0
  46. data/lib/cm_admin/version.rb +1 -1
  47. data/lib/cm_admin/view_helpers/field_display_helper.rb +21 -1
  48. data/lib/cm_admin/view_helpers/page_info_helper.rb +11 -3
  49. data/package-lock.json +2868 -229
  50. data/package.json +2 -0
  51. data/tmp/cache/webpacker/last-compilation-digest-development +1 -1
  52. data/yarn.lock +1656 -48
  53. metadata +5 -2
data/app/assets/stylesheets/cm_admin/base/show.scss CHANGED
@@ -5,28 +5,27 @@
5
5
 
6
6
  &__tabs {
7
7
  .cm-tabs-bar {
8
- background-color: #FFF;
8
+ background-color: $white;
9
9
  width: 100%;
10
10
  .nav-pills {
11
- margin-left: 20px;
11
+ margin-left: 10px;
12
12
  }
13
13
  .nav-link {
14
14
  position: static;
15
15
  left: 0%;
16
16
  right: 0%;
17
- font-size: 14px;
17
+ @include font($size: $t4-text, $color: $ink-lighter-clr);
18
18
  line-height: 22px;
19
19
  flex: none;
20
20
  order: 0;
21
21
  flex-grow: 0;
22
- color: #6B7586;
23
- background-color: #FFF;
22
+ background-color: $white;
24
23
  border-radius: 0px;
25
24
  }
26
25
  .nav-link.active {
27
- color: #6554E0;
28
- border-bottom: 3px #6554E0 solid;
29
- background-color: #FFF;
26
+ color: $brand-color;
27
+ border-bottom: 3px $brand-color solid;
28
+ background-color: $white;
30
29
  }
31
30
  }
32
31
  }
@@ -65,7 +64,7 @@
65
64
  &__rhs {
66
65
  width: 80%;
67
66
  p {
68
- @include font($size: $t4-text, $color: #172b4d);
67
+ @include font($size: $t4-text, $color: $primary-text-clr);
69
68
  line-height: 19px;
70
69
  margin: 0;
71
70
  }
@@ -73,4 +72,7 @@
73
72
  }
74
73
  }
75
74
  }
75
+ .filters-bar {
76
+ background-color: $grey-lightest-clr;
77
+ }
76
78
  }
data/app/assets/stylesheets/cm_admin/base/sidebar.scss CHANGED
@@ -41,8 +41,7 @@
41
41
  position: absolute;
42
42
  top: 14px;
43
43
  left: 24px;
44
- font-size: $t4-text;
45
- color: $ink-lightest-clr;
44
+ @include font($size: $t4-text, $color: $ink-lightest-clr);
46
45
  }
47
46
  }
48
47
 
@@ -51,8 +50,7 @@
51
50
  padding: 16px 0;
52
51
  overflow-y: auto;
53
52
  .menu-item {
54
- font-size: $t4-text;
55
- color: $ink-lightest-clr;
53
+ @include font($size: $t4-text, $color: $ink-lightest-clr);
56
54
  padding: 8px 24px;
57
55
  transition: all 0.2s linear;
58
56
  cursor: pointer;
@@ -72,8 +70,7 @@
72
70
 
73
71
  .menu-sub-list {
74
72
  .menu-sub-item {
75
- font-size: $t4-text;
76
- color: $ink-lightest-clr;
73
+ @include font($size: $t4-text, $color: $ink-lightest-clr);
77
74
  padding: 8px 8px 8px 45px;
78
75
  transition: all 0.2s linear;
79
76
  &:hover {
@@ -127,9 +124,8 @@
127
124
  display: inline-flex;
128
125
  align-items: center;
129
126
  position: relative;
130
- font-size: $t4-text;
127
+ @include font($size: $t4-text, $color: $ink-lightest-clr);
131
128
  line-height: 22px;
132
- color: $ink-lightest-clr;
133
129
  cursor: pointer;
134
130
  .profile-avatar {
135
131
  display: inline-flex;
@@ -138,9 +134,7 @@
138
134
  width: 22px;
139
135
  height: 22px;
140
136
  margin-right: 8px;
141
- color: $white;
142
- font-size: 10px;
143
- font-weight: 900;
137
+ @include font($size: 10px, $color: $white, $weight: 900);
144
138
  background-color: $brand-color;
145
139
  border-radius: $circle;
146
140
  vertical-align: middle;
@@ -164,15 +158,13 @@
164
158
  box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
165
159
  &__left {
166
160
  .name-text {
167
- font-size: $t4-text;
161
+ @include font($size: $t4-text, $color: $primary-text-clr);
168
162
  line-height: 22px;
169
- color: $primary-text-clr;
170
163
  margin: 0;
171
164
  }
172
165
  .email-text {
173
- font-size: $t4-text;
166
+ @include font($size: $t4-text, $color: $ink-lightest-clr);
174
167
  line-height: 22px;
175
- color: $ink-lightest-clr;
176
168
  margin: 0;
177
169
  }
178
170
  }
@@ -193,9 +185,8 @@
193
185
  box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
194
186
  .page-link {
195
187
  display: block;
196
- font-size: $t4-text;
188
+ @include font($size: $t4-text, $color: $primary-text-clr);
197
189
  line-height: 22px;
198
- color: $primary-text-clr;
199
190
  padding: 4px 16px;
200
191
  border: none;
201
192
  transition: all 0.2s linear;
@@ -208,9 +199,8 @@
208
199
  padding: 8px 0;
209
200
  .auth-link {
210
201
  display: block;
211
- font-size: $t4-text;
202
+ @include font($size: $t4-text, $color: $primary-text-clr);
212
203
  line-height: 22px;
213
- color: $primary-text-clr;
214
204
  padding: 4px 16px;
215
205
  transition: all 0.2s linear;
216
206
  &:hover {