cm-admin 1.1.8 → 1.1.9

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 (29) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.vscode/settings.json +3 -0
  4. data/Gemfile.lock +1 -1
  5. data/app/assets/stylesheets/cm_admin/base/navbar.scss +11 -38
  6. data/app/assets/stylesheets/cm_admin/base/quicksearch.scss +3 -4
  7. data/app/assets/stylesheets/cm_admin/base/show.scss +4 -15
  8. data/app/assets/stylesheets/cm_admin/base/table.scss +2 -14
  9. data/app/assets/stylesheets/cm_admin/components/_buttons.scss +28 -140
  10. data/app/assets/stylesheets/cm_admin/dependency/bootstrap.min.css +4 -5
  11. data/app/assets/stylesheets/cm_admin/pages/import_page.scss +3 -10
  12. data/app/views/cm_admin/main/_actions_dropdown.html.slim +1 -3
  13. data/app/views/cm_admin/main/_associated_table.html.slim +1 -1
  14. data/app/views/cm_admin/main/_nested_fields.html.slim +2 -1
  15. data/app/views/cm_admin/main/_nested_table_form.html.slim +1 -1
  16. data/app/views/cm_admin/main/_tabs.html.slim +1 -1
  17. data/app/views/cm_admin/main/_top_navbar.html.slim +11 -17
  18. data/app/views/cm_admin/main/history.html.slim +3 -4
  19. data/app/views/cm_admin/main/import_form.html.slim +2 -2
  20. data/app/views/cm_admin/main/new.html.slim +1 -1
  21. data/app/views/cm_admin/main/show.html.slim +3 -4
  22. data/app/views/layouts/_quick_links.html.slim +2 -2
  23. data/app/views/layouts/cm_admin.html.slim +10 -12
  24. data/lib/cm_admin/version.rb +1 -1
  25. data/lib/cm_admin/view_helpers/form_helper.rb +2 -1
  26. data/lib/cm_admin/view_helpers/manage_column_popup_helper.rb +2 -2
  27. data/lib/cm_admin/view_helpers/page_info_helper.rb +4 -4
  28. data/lib/cm_admin/view_helpers.rb +2 -1
  29. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ba81abd1bda39ffb9374cd1c93320c6459ffb106ac105fc9b6dabca27c941b2b
4
- data.tar.gz: c43d2423a3aed2e123eb058874d0bcf1b8df3c8b09597715a25720514177a93d
3
+ metadata.gz: e07101649ddc2392e7d61139cbbd68d863b22703ec2537cd9e6d3195cc53f5c9
4
+ data.tar.gz: a11705aaa45d84749296de25055339207b33f202a467eac3b38d2c60aa667f59
5
5
  SHA512:
6
- metadata.gz: 3b24b0d099f5557d2f6c0cf08ece3efc79129d0bbbcff25b115244cd04eb2ad8e4059bb563e1e63af201c46529a2e15902f8331a8988bec0d62bd3db84655852
7
- data.tar.gz: 91b506a984661154df8536ace4bbea58cf67eb22fe13c99f02be6e5e3cd99e1f5565a3f363de974d3c9adf8e7a616912519cdd6155e9a861df42d490e56e9a11
6
+ metadata.gz: da131f09f37cabf79ef6ce2c23604cb412053be927ea9c79666f3f356d7618ddfdc6faed36c657821e2c60757c67aa5fc1bfddf838705d861f76898ae0c235f8
7
+ data.tar.gz: 6f0354f7eac71e8f691152e23f0653a228fff5e9b2407d51cff6320cf07cf8de01a46a08835717c6e7d7ececf5655f2942a870b73ea48321f3797b4bc82dbced
data/.gitignore CHANGED
@@ -11,3 +11,4 @@ public/cm-admin-packs/
11
11
  # rspec failure tracking
12
12
  .rspec_status
13
13
  .rubocop-*
14
+ .DS_Store
@@ -0,0 +1,3 @@
1
+ {
2
+ "cSpell.words": ["cmad"]
3
+ }
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cm-admin (1.1.8)
4
+ cm-admin (1.1.9)
5
5
  caxlsx_rails
6
6
  cocoon (~> 1.2.15)
7
7
  csv-importer (~> 0.8.2)
@@ -1,46 +1,19 @@
1
1
  @import "../helpers/index.scss";
2
+ @import "bootstrap/scss/bootstrap";
2
3
 
3
- .cm-navbar {
4
- top: 0;
5
- right: 0;
6
- left: 225px;
7
- display: flex;
8
- justify-content: space-between;
9
- align-items: flex-start;
10
- min-height: 102px;
11
- padding: 24px;
12
- background-color: $white;
13
- z-index: 2;
14
- gap: 16px;
15
- &__lhs {
16
- .bread-crumb-area {
17
- .breadcrumb-text {
18
- @include font($size: $t4-text, $color: $ink-lighter-clr);
19
- line-height: 22px;
20
- margin: 0 0 16px;
21
- a {
22
- color: inherit;
23
- }
24
- }
25
- }
26
- .nav-title-area {
27
- .title-text {
28
- @include font($size: 24px, $color: $primary-text-clr, $weight: 600);
29
- line-height: 32px;
30
- margin: 0 0 8px;
31
- }
32
- .title-sub-text {
33
- @include font($size: $t4-text, $color: $primary-text-clr);
34
- line-height: 22px;
35
- margin: 0;
36
- }
4
+ .entity-header {
5
+ @extend .d-flex.justify-content-between.align-items-start.p-4;
6
+ min-height: 109px; // Height needs to be removed once all the layouts are revamped
7
+ background-color: var(--bs-white);
8
+ &__info {
9
+ .breadcrumb {
10
+ @include font($size: $t4-text, $color: var(--bs-tertiary-color));
11
+ line-height: 22px;
37
12
  }
38
13
  }
39
14
 
40
- &__rhs {
41
- display: flex;
42
- align-items: center;
43
-
15
+ &__actions {
16
+ @extend .d-flex.align-items-start;
44
17
  .export-container {
45
18
  position: relative;
46
19
  .export-popup {
@@ -52,16 +52,15 @@
52
52
  }
53
53
  }
54
54
  }
55
- .enter-btn {
55
+ .enter-text {
56
56
  @include font($size: $t6-text, $color: $ink-lightest-clr, $weight: 600);
57
57
  line-height: 16px;
58
58
  margin: 0 8px 0 24px;
59
- padding: 0;
60
59
  }
61
- .open-btn {
60
+ .open-text {
62
61
  @include font($size: $t6-text, $color: $ink-lightest-clr);
63
62
  line-height: 16px;
64
- padding: 0;
63
+ margin: 0;
65
64
  }
66
65
  }
67
66
  .active-item {
@@ -1,25 +1,14 @@
1
1
  @import "../helpers/index.scss";
2
+ @import "bootstrap/scss/bootstrap";
2
3
 
3
4
  .show-page {
4
5
  overflow: auto;
5
6
 
6
- &__tabs {
7
- .cm-tabs-bar {
8
- background-color: $white;
9
- width: 100%;
10
- .nav-pills {
11
- margin-left: 10px;
12
- }
7
+ &__header {
8
+ .tabs {
9
+ @extend .nav.nav-pills.ml-2;
13
10
  .nav-link {
14
- position: static;
15
- left: 0%;
16
- right: 0%;
17
11
  @include font($size: $t4-text, $color: $ink-lighter-clr);
18
- line-height: 22px;
19
- flex: none;
20
- order: 0;
21
- flex-grow: 0;
22
- background-color: $white;
23
12
  border-radius: 0px;
24
13
  }
25
14
  .nav-link.active {
@@ -34,21 +34,13 @@
34
34
  line-height: 22px;
35
35
  margin: 0;
36
36
  }
37
- &__column-action {
38
- .column-btn {
39
- padding: 4px 8px;
40
- span:nth-child(2) {
41
- margin: 0 0 0 4px;
42
- }
43
- }
44
- }
45
37
  }
46
38
 
47
39
  //Table UI styles
48
40
  .new-admin-table {
49
41
  min-width: 720px;
50
42
  max-width: fit-content;
51
- // max-height: calc(100vh - 240px); Height is dynamic
43
+ // max-height: calc(100vh - 240px); Height is dynamic
52
44
  overflow: auto;
53
45
  .cm-table {
54
46
  table-layout: fixed;
@@ -170,10 +162,6 @@
170
162
  padding: 0px;
171
163
  }
172
164
  }
173
- .tool-btn {
174
- background-color: transparent;
175
- border: none;
176
- }
177
165
  }
178
166
  }
179
167
  }
@@ -236,7 +224,7 @@
236
224
  &__name {
237
225
  @include font($size: $t4-text, $color: $primary-text-clr);
238
226
  line-height: 22px;
239
- margin-left: 4px;
227
+ margin-left: 4px;
240
228
  p {
241
229
  margin: 0;
242
230
  }
@@ -1,154 +1,42 @@
1
1
  @import "../helpers/index.scss";
2
+ @import "bootstrap/scss/bootstrap";
2
3
 
3
- .cta-btn {
4
- padding: 5px 10px;
5
- @include font($size: $t4-text, $color: $white, $weight: bold);
6
- background-color: $brand-color;
7
- border: none;
8
- border-radius: $radius-4;
9
- transition: all 0.2s linear;
10
- white-space: nowrap;
11
- &:hover {
12
- color: $white;
13
- background: $cta-hover-gradient;
14
- transform: scale(1.05);
15
- }
16
- &:focus {
17
- outline: 3px auto rgba(47, 128, 237, 0.3);
18
- outline-offset: 1px;
19
- }
20
- &.disabled {
21
- color: $disabled-clr;
22
- background: $grey-lighter-clr;
23
- cursor: not-allowed !important;
24
- &:hover {
25
- background-color: $grey-lighter-clr;
26
- }
4
+ // Custom style for icon btn
5
+ .btn-icon {
6
+ i {
7
+ margin-right: 4px;
27
8
  }
28
9
  }
29
10
 
30
- .primary-btn {
31
- padding: 5px 10px;
32
- @include font($size: $t4-text, $color: $brand-color, $weight: bold);
33
- background-color: $white;
34
- border: 1px solid $brand-color;
35
- border-radius: $radius-4;
36
- transition: all 0.2s linear;
37
- white-space: nowrap;
38
- &:hover {
39
- color: $brand-color;
40
- background-color: $brand-hover-color;
41
- transform: scale(1.05);
42
- }
43
- &:focus {
44
- outline: 3px auto rgba(47, 128, 237, 0.3);
45
- outline-offset: 2px;
46
- }
47
- &.disabled {
48
- color: $disabled-clr;
49
- background: $white;
50
- border: 1px solid $grey-regular-clr;
51
- cursor: not-allowed !important;
52
- &:hover {
53
- background-color: $white;
54
- }
55
- }
11
+ // New buttons with bootstrap button styles
12
+ .cm-admin .btn-cta {
13
+ @include button-variant($primary, $primary);
14
+ @extend .btn.btn-sm.btn-icon;
56
15
  }
57
16
 
58
- .secondary-btn {
59
- padding: 5px 10px;
60
- @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
61
- background-color: $white;
62
- border: 1px solid $ink-regular-clr;
63
- border-radius: $radius-4;
64
- transition: all 0.2s linear;
65
- white-space: nowrap;
66
- &:hover {
67
- color: $primary-text-clr;
68
- background-color: $grey-light-clr;
69
- transform: scale(1.05);
70
- }
71
- &:focus {
72
- outline: 3px auto rgba(47, 128, 237, 0.3);
73
- outline-offset: 2px;
74
- }
75
- &.disabled {
76
- color: $disabled-clr;
77
- background: $white;
78
- border: 1px solid $grey-regular-clr;
79
- cursor: not-allowed !important;
80
- &:hover {
81
- background-color: $white;
82
- }
83
- }
84
- span:nth-child(2) {
85
- margin: 0 4px 0 8px;
86
- }
87
- span:nth-child(3) {
88
- @include font($size: 10px, $color: $ink-lighter-clr, $weight: bold);
89
- }
17
+ .cm-admin .btn-primary {
18
+ @extend .btn.btn-outline-primary.btn-sm.btn-icon;
90
19
  }
91
20
 
92
- .gray-border-btn {
93
- padding: 5px 10px;
94
- @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
95
- background-color: $white;
96
- border: 1px solid $ink-regular-clr;
97
- border-radius: $radius-4;
98
- transition: all 0.2s linear;
99
- white-space: nowrap;
100
- &:hover {
101
- color: $primary-text-clr;
102
- background-color: $grey-light-clr;
103
- transform: scale(1.05);
104
- }
105
- &:focus {
106
- outline: 3px auto rgba(47, 128, 237, 0.3);
107
- outline-offset: 2px;
108
- }
109
- &.disabled {
110
- color: $disabled-clr;
111
- background: $white;
112
- border: 1px solid $grey-regular-clr;
113
- cursor: not-allowed !important;
114
- &:hover {
115
- background-color: $white;
116
- }
117
- }
21
+ .cm-admin .btn-secondary {
22
+ @extend .btn.btn-outline-secondary.btn-sm.btn-icon;
118
23
  }
119
24
 
120
- .ghost-btn {
121
- padding: 5px 10px;
122
- @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
123
- background-color: transparent;
124
- border: none;
125
- border-radius: $radius-4;
126
- transition: all 0.2s linear;
127
- white-space: nowrap;
128
- &:hover {
129
- color: $primary-text-clr;
130
- background: $grey-light-clr;
131
- transform: scale(1.05);
132
- }
133
- &:focus {
134
- outline: 3px auto rgba(47, 128, 237, 0.3);
135
- }
136
- &.disabled {
137
- color: $disabled-clr;
138
- background: $grey-light-clr;
139
- border: none;
140
- cursor: not-allowed !important;
141
- &:hover {
142
- background-color: $grey-light-clr;
143
- }
144
- }
25
+ .cm-admin .btn-ghost {
26
+ @extend .btn.btn-light.btn-sm.btn-icon;
145
27
  }
146
28
 
147
- .text-btn {
148
- border: none;
149
- background-color: transparent;
150
- white-space: nowrap;
151
- &:focus {
152
- outline: none;
153
- }
29
+ .cm-admin .btn-danger {
30
+ @extend .btn.btn-outline-danger.btn-sm.btn-icon;
31
+ }
32
+
33
+ .cm-admin .btn-link {
34
+ @extend .btn.btn-link.btn-sm.btn-icon;
35
+ text-decoration: underline;
154
36
  }
37
+
38
+ // button mixin - We can use if needed
39
+ // @include button-variant($background: #6554e0, $border: #6554e0);
40
+
41
+ //Outline button mixin - We can use if needed
42
+ // @include button-outline-variant($color: #6554e0);