cm-admin 1.1.4 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/app/assets/config/cm_admin_manifest.js +2 -1
  4. data/app/assets/fonts/fa-brands-400.ttf +0 -0
  5. data/app/assets/fonts/fa-brands-400.woff2 +0 -0
  6. data/app/assets/fonts/fa-regular-400.ttf +0 -0
  7. data/app/assets/fonts/fa-regular-400.woff2 +0 -0
  8. data/app/assets/fonts/fa-solid-900.ttf +0 -0
  9. data/app/assets/fonts/fa-solid-900.woff2 +0 -0
  10. data/app/assets/fonts/fa-v4compatibility.ttf +0 -0
  11. data/app/assets/fonts/fa-v4compatibility.woff2 +0 -0
  12. data/app/assets/javascripts/cm_admin/scaffolds.js +2 -0
  13. data/app/assets/stylesheets/cm_admin/base/auth.scss +5 -0
  14. data/app/assets/stylesheets/cm_admin/base/show.scss +8 -14
  15. data/app/assets/stylesheets/cm_admin/base/sidebar.scss +5 -0
  16. data/app/assets/stylesheets/cm_admin/cm_admin.css.scss +2 -1
  17. data/app/assets/stylesheets/cm_admin/components/_input.scss +6 -6
  18. data/app/assets/stylesheets/cm_admin/dependency/fontawesome.all.css +7831 -0
  19. data/app/javascript/stylesheets/cm_admin/application.scss +1 -1
  20. data/app/views/cm_admin/main/_associated_table.html.slim +10 -8
  21. data/app/views/cm_admin/main/_table.html.slim +2 -2
  22. data/app/views/cm_admin/main/_top_navbar.html.slim +2 -2
  23. data/app/views/cm_admin/main/edit.html.slim +1 -4
  24. data/app/views/layouts/_left_sidebar_nav.html.slim +1 -1
  25. data/lib/cm_admin/models/column.rb +4 -3
  26. data/lib/cm_admin/models/export.rb +22 -21
  27. data/lib/cm_admin/version.rb +1 -1
  28. data/lib/cm_admin/view_helpers/form_field_helper.rb +2 -2
  29. data/lib/cm_admin/view_helpers.rb +5 -5
  30. data/package-lock.json +21 -21
  31. data/yarn.lock +12 -19
  32. metadata +11 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 83a83ffbffcaca0ce298a3e4c2289ce3ef7bdef0e89eb1e821ced475af51a07c
4
- data.tar.gz: 2283aabc7bb87f551c08c930b46a8b7bae3b6eefb3b914bc02536744a6209479
3
+ metadata.gz: 01cfdef16d888507aaaa1969921502f28a3f5f7af5c80f29ef4cde88975805f9
4
+ data.tar.gz: 6d257af43f68b2d5ab7b57162724a91b1494946d02e2fe1536531d5d0363bb6b
5
5
  SHA512:
6
- metadata.gz: c3ac960fa37e0e6dde3835f430a4eb569604d5cb364dfbbe02129063145e7c22509d17ca91be39bdb234751b6fb29a7a453fbb577d9ff758b0e026467077de90
7
- data.tar.gz: 4fb78962250c9b5e76a67b9aebcf0e0b3e7141750fa07893ba0d0f7a7cb0c42a1ab0cbceaf2712ce8e0b097d0b2c8571902f886b20680f3778266a7c8e6a1a07
6
+ metadata.gz: 3cb0fb31de297ecf1bb914e891188a72f6c2fd95d4b0ef05adaa99c36a9c15d3b8f2ad167e35c6ba65e5bd515951ee0474f2027df64aa95a31a4d7dd03fd29d9
7
+ data.tar.gz: 97119da3716c2be594af5cf3207eb830e13b32d79c15e3286a3abda3616c863a1a5439b94553ac9bfe1c56452d76cd9c9993893d6d1359541c9f366cf02ca8b2
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cm-admin (1.1.4)
4
+ cm-admin (1.1.6)
5
5
  caxlsx_rails
6
6
  cocoon (~> 1.2.15)
7
7
  csv-importer (~> 0.8.2)
@@ -1 +1,2 @@
1
- //= link_tree ../javascripts/cm_admin
1
+ //= link_tree ../javascripts/cm_admin
2
+ //= link_tree ../fonts
Binary file
Binary file
Binary file
Binary file
@@ -42,3 +42,5 @@ document.addEventListener("turbo:load", function () {
42
42
  $(document).on('click', '.menu-item', function(e) {
43
43
  $('.profile-popup').toggleClass('hidden');
44
44
  });
45
+
46
+ window.addEventListener('popstate', e => window.location.reload() );
@@ -172,6 +172,11 @@
172
172
  .auth-option {
173
173
  padding: 8px 0;
174
174
  .auth-link {
175
+ background: none;
176
+ border: none;
177
+ width: 100%;
178
+ text-align: left;
179
+ padding: 0;
175
180
  display: block;
176
181
  @include font($size: $t4-text);
177
182
  line-height: 22px;
@@ -2,7 +2,7 @@
2
2
 
3
3
  .show-page {
4
4
  overflow: auto;
5
-
5
+
6
6
  &__tabs {
7
7
  .cm-tabs-bar {
8
8
  background-color: $white;
@@ -48,26 +48,20 @@
48
48
  border-radius: $radius-4;
49
49
  }
50
50
  .info-split {
51
- display: flex;
51
+ display: grid;
52
+ grid-template-columns: 140px 1fr;
53
+ grid-column-gap: 24px;
52
54
  margin-bottom: 24px;
53
55
  &:nth-last-child(1) {
54
56
  margin-bottom: 0;
55
57
  }
56
58
  &__lhs {
57
- width: 20%;
58
- p {
59
- @include font($size: $t4-text, $color: $ink-lighter-clr);
60
- line-height: 22px;
61
- margin: 0;
62
- }
59
+ @include font($size: $t4-text, $color: $ink-lighter-clr);
60
+ line-height: 22px;
63
61
  }
64
62
  &__rhs {
65
- width: 80%;
66
- p {
67
- @include font($size: $t4-text, $color: $primary-text-clr);
68
- line-height: 19px;
69
- margin: 0;
70
- }
63
+ @include font($size: $t4-text, $color: $primary-text-clr);
64
+ line-height: 19px;
71
65
  }
72
66
  }
73
67
  }
@@ -198,6 +198,11 @@
198
198
  .auth-option {
199
199
  padding: 8px 0;
200
200
  .auth-link {
201
+ background: none;
202
+ border: none;
203
+ width: 100%;
204
+ text-align: left;
205
+ padding: 0;
201
206
  display: block;
202
207
  @include font($size: $t4-text, $color: $primary-text-clr);
203
208
  line-height: 22px;
@@ -25,6 +25,7 @@
25
25
  *= require 'cm_admin/components/index'
26
26
  *= require 'cm_admin/dependency/bootstrap.min'
27
27
  *= require 'cm_admin/dependency/flatpickr.min'
28
+ *= require 'cm_admin/dependency/fontawesome.all'
28
29
  *= require 'cm_admin/scaffold'
29
30
  *= require_self
30
- */
31
+ */
@@ -117,8 +117,8 @@
117
117
  cursor: pointer;
118
118
  }
119
119
  }
120
-
121
- .upload-placeholder-1 {
120
+
121
+ .upload-placeholder-1 {
122
122
  @include font($size: $t4-text, $color: $ink-lighter-clr, $weight: 600);
123
123
  }
124
124
  .upload-placeholder-2 {
@@ -161,7 +161,7 @@ input.cm-checkbox[type="checkbox"] {
161
161
  }
162
162
  &:checked:after {
163
163
  background: $brand-color;
164
- content: "\2713";
164
+ content: "\f00c";
165
165
  font-family: FontAwesome !important;
166
166
  color: $white;
167
167
  border: none;
@@ -173,7 +173,7 @@ input.cm-checkbox[type="checkbox"] {
173
173
  }
174
174
  &:checked:after {
175
175
  background: $grey-light-clr;
176
- content: "\2713";
176
+ content: "\f00c";
177
177
  font-family: FontAwesome !important;
178
178
  color: $white;
179
179
  border: none;
@@ -262,7 +262,7 @@ input.cm-radio[type="radio"] {
262
262
  right: 0;
263
263
  bottom: 0;
264
264
  background: $grey-light-clr;
265
- transition: all .2s linear;
265
+ transition: all 0.2s linear;
266
266
  }
267
267
 
268
268
  .slider:before {
@@ -273,7 +273,7 @@ input.cm-radio[type="radio"] {
273
273
  left: 2px;
274
274
  bottom: 2px;
275
275
  background-color: $white;
276
- transition: all .2s linear;
276
+ transition: all 0.2s linear;
277
277
  }
278
278
 
279
279
  input:checked + .slider {