cm-admin 0.8.9 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) 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 +23 -10
  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 +6 -12
  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 +45 -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 +4 -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/_table.html.slim +13 -14
  32. data/app/views/cm_admin/main/associated_index.html.slim +4 -5
  33. data/app/views/cm_admin/main/index.html.slim +13 -14
  34. data/app/views/cm_admin/main/show.html.slim +2 -2
  35. data/app/views/layouts/cm_admin.html.slim +5 -5
  36. data/lib/cm_admin/model.rb +6 -1
  37. data/lib/cm_admin/models/action.rb +1 -1
  38. data/lib/cm_admin/models/column.rb +16 -3
  39. data/lib/cm_admin/models/dsl_method.rb +17 -4
  40. data/lib/cm_admin/models/field.rb +7 -1
  41. data/lib/cm_admin/models/utils/associations.rb +25 -0
  42. data/lib/cm_admin/version.rb +1 -1
  43. data/lib/cm_admin/view_helpers/field_display_helper.rb +21 -1
  44. data/lib/cm_admin/view_helpers/page_info_helper.rb +7 -3
  45. data/package-lock.json +2801 -158
  46. data/package.json +2 -0
  47. data/tmp/cache/webpacker/last-compilation-digest-development +1 -1
  48. data/yarn.lock +6949 -5133
  49. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 51174128fc2fd12fde48837a9271d8e51bb84d847379c6052080cf3de2c8745f
4
- data.tar.gz: 9b2381f05a97106e9b3a1d8e117d71721a8d55ff080dcee96a38d77d819f0bf4
3
+ metadata.gz: 385e0f3031f66ab986a7c7e66837810ed8d49bca259cca0fb92bdc2e6bf4efc6
4
+ data.tar.gz: 909a15a2ee902c0241295cc26749f6d7715b938131cb8d9c42cadd6625813730
5
5
  SHA512:
6
- metadata.gz: 4ecc29569a31a996554a0360d3bbc52942f30b90692c5de67afdb7f1e6c79ebfab25736892a0093e9ef209821ee3950fad8df69934b36626151ca4af6d7dde10
7
- data.tar.gz: 28018ef669025bb8b62d5127036efca2bfb32e944761089f74b17c9eccbed9f5f3db932ac9fe94fb50b120b2b5c8c3829e78b2b1cecf1478809577d8651c3dc8
6
+ metadata.gz: 9ce3b5afcec601a5713f518d77733fd99bc0d4eb19736c1160aa5ee72b4699ca1d87ec5af1363ef4e039c1a26509ec8e444ab9b412117d396485da186cd2cdaf
7
+ data.tar.gz: 5cf1e60e56910ce4326cffe4f7aabebcc488821ec82bba2ee0e4b8b4d45293599d8e6a45dbbd81e1f74ed7ad84a9a166afa7d72e71fe13943653db0a8ddd9a46
@@ -0,0 +1,3 @@
1
+ {
2
+ "extends": "stylelint-config-standard"
3
+ }
@@ -0,0 +1,31 @@
1
+ # .github/workflows/linters.yml
2
+ name: linters
3
+ on: [pull_request]
4
+
5
+ jobs:
6
+ linters:
7
+ name: runner / linters
8
+ runs-on: ubuntu-latest
9
+ steps:
10
+ - name: Check out code
11
+ uses: actions/checkout@v1
12
+ - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
13
+ with:
14
+ ruby-version: 3.0.0
15
+ - name: rubocop
16
+ uses: reviewdog/action-rubocop@v1
17
+ with:
18
+ rubocop_version: 1.30.0
19
+ rubocop_extensions: rubocop-rails:2.14.2
20
+ github_token: ${{ secrets.GITHUB_TOKEN }}
21
+ reporter: github-pr-check # Possible values are github-pr-check, github-pr-review
22
+ - name: reek
23
+ uses: reviewdog/action-reek@v1
24
+ with:
25
+ reek_version: 6.1.1
26
+ - name: runner / stylelint
27
+ run: npx stylelint **/*.scss
28
+ - name: coffeelint
29
+ uses: reviewdog/action-coffeelint@v1
30
+ with:
31
+ reporter: github-pr-review
data/Gemfile CHANGED
@@ -5,8 +5,12 @@ gem 'pagy', '~> 4.11.0'
5
5
  gem 'pundit'
6
6
  gem 'rake', '~> 12.0'
7
7
  gem 'rspec', '~> 3.0'
8
- gem 'rubocop'
9
8
  gem 'slim'
10
9
 
10
+ group :development do
11
+ gem 'rubocop', '~> 1.35.1', require: false
12
+ gem 'rubocop-rails', '~> 2.15.2', require: false
13
+ gem 'rubocop-performance', '~> 1.14.3', require: false
14
+ end
11
15
  # Specify your gem's dependencies in cm_admin.gemspec
12
16
  gemspec
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cm-admin (0.8.9)
4
+ cm-admin (0.9.0)
5
5
  caxlsx_rails
6
6
  cocoon (~> 1.2.15)
7
7
  csv-importer (~> 0.8.2)
@@ -61,18 +61,21 @@ GEM
61
61
  i18n (1.11.0)
62
62
  concurrent-ruby (~> 1.0)
63
63
  ice_nine (0.11.2)
64
+ json (2.6.2)
64
65
  local_time (2.1.0)
65
66
  loofah (2.19.0)
66
67
  crass (~> 1.0.2)
67
68
  nokogiri (>= 1.5.9)
68
69
  marcel (1.0.2)
69
70
  method_source (1.0.0)
71
+ mini_portile2 (2.8.0)
70
72
  minitest (5.16.2)
71
- nokogiri (1.13.9-arm64-darwin)
73
+ nokogiri (1.13.9)
74
+ mini_portile2 (~> 2.8.0)
72
75
  racc (~> 1.4)
73
76
  pagy (4.11.0)
74
77
  parallel (1.22.1)
75
- parser (3.1.2.0)
78
+ parser (3.1.2.1)
76
79
  ast (~> 2.4.1)
77
80
  pundit (2.2.0)
78
81
  activesupport (>= 3.0.0)
@@ -96,7 +99,7 @@ GEM
96
99
  zeitwerk (~> 2.5)
97
100
  rainbow (3.1.1)
98
101
  rake (12.3.3)
99
- regexp_parser (2.5.0)
102
+ regexp_parser (2.6.1)
100
103
  rexml (3.2.5)
101
104
  rspec (3.10.0)
102
105
  rspec-core (~> 3.10.0)
@@ -111,17 +114,25 @@ GEM
111
114
  diff-lcs (>= 1.2.0, < 2.0)
112
115
  rspec-support (~> 3.10.0)
113
116
  rspec-support (3.10.2)
114
- rubocop (1.30.1)
117
+ rubocop (1.35.1)
118
+ json (~> 2.3)
115
119
  parallel (~> 1.10)
116
- parser (>= 3.1.0.0)
120
+ parser (>= 3.1.2.1)
117
121
  rainbow (>= 2.2.2, < 4.0)
118
122
  regexp_parser (>= 1.8, < 3.0)
119
123
  rexml (>= 3.2.5, < 4.0)
120
- rubocop-ast (>= 1.18.0, < 2.0)
124
+ rubocop-ast (>= 1.20.1, < 2.0)
121
125
  ruby-progressbar (~> 1.7)
122
126
  unicode-display_width (>= 1.4.0, < 3.0)
123
- rubocop-ast (1.18.0)
127
+ rubocop-ast (1.23.0)
124
128
  parser (>= 3.1.1.0)
129
+ rubocop-performance (1.14.3)
130
+ rubocop (>= 1.7.0, < 2.0)
131
+ rubocop-ast (>= 0.4.0)
132
+ rubocop-rails (2.15.2)
133
+ activesupport (>= 4.2.0)
134
+ rack (>= 1.1)
135
+ rubocop (>= 1.7.0, < 2.0)
125
136
  ruby-progressbar (1.11.0)
126
137
  rubyzip (2.3.2)
127
138
  semantic_range (3.0.0)
@@ -134,7 +145,7 @@ GEM
134
145
  tilt (2.0.10)
135
146
  tzinfo (2.0.4)
136
147
  concurrent-ruby (~> 1.0)
137
- unicode-display_width (2.1.0)
148
+ unicode-display_width (2.3.0)
138
149
  virtus (2.0.0)
139
150
  axiom-types (~> 0.1)
140
151
  coercible (~> 1.0)
@@ -156,7 +167,9 @@ DEPENDENCIES
156
167
  pundit
157
168
  rake (~> 12.0)
158
169
  rspec (~> 3.0)
159
- rubocop
170
+ rubocop (~> 1.35.1)
171
+ rubocop-performance (~> 1.14.3)
172
+ rubocop-rails (~> 2.15.2)
160
173
  slim
161
174
 
162
175
  BUNDLED WITH
@@ -59,7 +59,7 @@
59
59
  padding: 6px 12px;
60
60
  @include font($size: $t3-text, $color: #555555);
61
61
  background-color: $white;
62
- border: 1px solid #ccc;
62
+ border: 1px solid $grey-regular-clr;
63
63
  border-radius: $radius-2;
64
64
  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
65
65
  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
@@ -163,10 +163,10 @@
163
163
  border-radius: $circle;
164
164
  }
165
165
  .border-top {
166
- border-top: 1px solid #ccc;
166
+ border-top: 1px solid $grey-regular-clr;
167
167
  }
168
168
  .border-bottom {
169
- border-bottom: 1px solid #ccc;
169
+ border-bottom: 1px solid $grey-regular-clr;
170
170
  }
171
171
 
172
172
  //common styles gose here
@@ -185,7 +185,7 @@
185
185
  }
186
186
 
187
187
  .error-text {
188
- font-size: 14px;
188
+ font-size: $t4-text;
189
189
  color: $error-clr;
190
190
  margin: 5px 0;
191
191
  animation: shakeError 0.82s cubic-bezier(0.36, 0.07, 0.19, 0.97) both;
@@ -1,9 +1,8 @@
1
1
  @import "../helpers/index.scss";
2
2
 
3
3
  .cm-filters-v2 {
4
- min-height: 64px;
5
4
  padding: 16px 24px;
6
- background-color: $white;
5
+ background-color: transparent;
7
6
  z-index: 1;
8
7
  &__inner {
9
8
  @include flex(row, flex-start, center, wrap);
@@ -13,10 +12,8 @@
13
12
  }
14
13
  }
15
14
  .add-filter-btn {
16
- font-size: $t4-text;
15
+ @include font($size: $t4-text, $color: $primary-text-clr, $weight: 600);
17
16
  line-height: 22px;
18
- font-weight: 600;
19
- color: $primary-text-clr;
20
17
  cursor: pointer;
21
18
  span {
22
19
  margin-right: 4px;
@@ -27,10 +24,8 @@
27
24
  }
28
25
  .clear-btn {
29
26
  position: relative;
30
- font-size: $t4-text;
27
+ @include font($size: $t4-text, $color: $ink-lighter-clr, $weight: 600);
31
28
  line-height: 22px;
32
- font-weight: 600;
33
- color: $ink-lighter-clr;
34
29
  margin-left: 32px;
35
30
  cursor: pointer;
36
31
  &::before {
@@ -77,7 +72,7 @@
77
72
  input {
78
73
  width: 100%;
79
74
  height: 39px;
80
- border: 1px solid #ccc;
75
+ border: 1px solid $grey-regular-clr;
81
76
  border-radius: $radius-4;
82
77
  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
83
78
  &:focus {
@@ -94,7 +89,7 @@
94
89
  //single-select-styles
95
90
  .select2-selection--single {
96
91
  height: 39px;
97
- border: 1px solid #ccc;
92
+ border: 1px solid $grey-regular-clr;
98
93
  border-radius: $radius-4;
99
94
  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
100
95
  &:focus {
@@ -121,7 +116,7 @@
121
116
  //multi-select-styles
122
117
  .select2-selection--multiple {
123
118
  max-height: 39px;
124
- border: 1px solid #ccc;
119
+ border: 1px solid $grey-regular-clr;
125
120
  border-radius: $radius-4;
126
121
  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
127
122
  overflow-y: auto;
@@ -153,14 +148,14 @@
153
148
 
154
149
  .filter-rangepicker {
155
150
  padding: 6px 12px;
156
- color: #172b4d;
157
- font-size: 16px;
151
+ color: $primary-text-clr;
152
+ font-size: $t3-text;
158
153
  }
159
154
 
160
155
  .field-area {
161
156
  display: block;
162
157
  padding: 6px 12px;
163
- font-size: 16px;
158
+ font-size: $t3-text;
164
159
  color: #555555;
165
160
  }
166
161
  .search-icon {
@@ -173,7 +168,7 @@
173
168
  position: absolute;
174
169
  top: 10px;
175
170
  right: 15px;
176
- font-size: 20px;
171
+ font-size: $t1-text;
177
172
  color: $brand-color;
178
173
  }
179
174
  }
@@ -183,8 +178,7 @@
183
178
  text-align: right;
184
179
  .filter-btn {
185
180
  padding: 5px 10px;
186
- color: $white;
187
- font-size: 16px;
181
+ @include font($size: $t3-text, $color: $white);
188
182
  background-color: $brand-color;
189
183
  border: none;
190
184
  border-radius: $radius-4;
@@ -76,14 +76,12 @@
76
76
  .form-field {
77
77
  margin-bottom: 20px;
78
78
  .form-label {
79
- font-weight: 600;
80
- color: #172b4d;
81
- font-size: 14px;
79
+ @include font($size: $t4-text, $color: $primary-text-clr, $weight: 600);
82
80
  margin-bottom: 0.5rem;
83
81
  }
84
82
  .form-input {
85
83
  label {
86
- @include font($size: $t4-text, $color: #172b4d, $weight: bold);
84
+ @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
87
85
  }
88
86
  input {
89
87
  width: 100%;
@@ -129,16 +127,12 @@
129
127
  }
130
128
 
131
129
  .radio-label {
132
- color: #172b4d;
133
- font-size: 16px;
134
- font-weight: 600;
130
+ @include font($size: $t3-text, $color: $primary-text-clr, $weight: 600);
135
131
  margin-left: 8px;
136
132
  }
137
133
 
138
134
  .checkbox-label {
139
- color: #172b4d;
140
- font-size: 16px;
141
- font-weight: 600;
135
+ @include font($size: $t3-text, $color: $primary-text-clr, $weight: 600);
142
136
  margin-left: 8px;
143
137
  }
144
138
  }
@@ -163,7 +157,7 @@
163
157
  .field-item {
164
158
  margin: 0 5px;
165
159
  label {
166
- @include font($size: $t4-text, $color: #172b4d, $weight: bold);
160
+ @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
167
161
  margin-bottom: 4px;
168
162
  }
169
163
  input {
@@ -191,6 +185,6 @@
191
185
  }
192
186
 
193
187
  .add-field-btn {
194
- font-size: 14px;
188
+ font-size: $t4-text;
195
189
  margin: 10px 0;
196
190
  }
@@ -15,9 +15,8 @@
15
15
  &__lhs {
16
16
  .bread-crumb-area {
17
17
  .breadcrumb-text {
18
- font-size: $t4-text;
18
+ @include font($size: $t4-text, $color: $ink-lighter-clr);
19
19
  line-height: 22px;
20
- color: $ink-lighter-clr;
21
20
  margin: 0 0 16px;
22
21
  a {
23
22
  color: inherit;
@@ -26,16 +25,13 @@
26
25
  }
27
26
  .nav-title-area {
28
27
  .title-text {
29
- font-size: 24px;
30
- font-weight: 600;
28
+ @include font($size: $font-size(24), $color: $primary-text-clr, $weight: 600);
31
29
  line-height: 32px;
32
- color: $primary-text-clr;
33
30
  margin: 0 0 8px;
34
31
  }
35
32
  .title-sub-text {
36
- font-size: $t4-text;
33
+ @include font($size: $t4-text, $color: $primary-text-clr);
37
34
  line-height: 22px;
38
- color: $primary-text-clr;
39
35
  margin: 0;
40
36
  }
41
37
  }
@@ -6,8 +6,9 @@
6
6
  left: 225px;
7
7
  display: flex;
8
8
  justify-content: space-between;
9
- min-height: 140px;
10
- padding: 24px 24px 16px;
9
+ align-items: flex-start;
10
+ min-height: 102px;
11
+ padding: 24px;
11
12
  background-color: $white;
12
13
  z-index: 2;
13
14
  &__lhs {
@@ -15,9 +15,8 @@
15
15
  position: absolute;
16
16
  top: 8px;
17
17
  right: 16px;
18
- font-size: $t4-text;
18
+ @include font($size: $t4-text, $color: $ink-lighter-clr);
19
19
  line-height: 22px;
20
- color: $ink-lighter-clr;
21
20
  cursor: pointer;
22
21
  }
23
22
  }
@@ -28,7 +27,7 @@
28
27
  font-size: $t4-text;
29
28
  line-height: 22px;
30
29
  span:nth-child(1) {
31
- color: #828282;
30
+ color: $grey-dark-clr;
32
31
  }
33
32
  span:nth-child(2) {
34
33
  margin-left: 8px;
@@ -42,9 +41,8 @@
42
41
  padding: 4px 16px;
43
42
  box-shadow: inset 0px 1px 0px rgba(148, 151, 155, 0.15);
44
43
  .select {
45
- font-size: $t6-text;
44
+ @include font($size: $t6-text, $color: $ink-lighter-clr);
46
45
  line-height: 16px;
47
- color: $ink-lightest-clr;
48
46
  cursor: pointer;
49
47
  .move-arrow {
50
48
  font-size: 10px;
@@ -67,7 +65,7 @@
67
65
  }
68
66
  }
69
67
  .active-item {
70
- background: #D9DEE3;
68
+ background: $grey-light-clr;
71
69
  width: 100%;
72
70
  height: 40px;
73
71
  float: left;
@@ -64,14 +64,14 @@ a {
64
64
  opacity: 1 !important;
65
65
  }
66
66
 
67
- .page-container {
67
+ .cm-page-container {
68
68
  height: 100vh;
69
69
  }
70
70
 
71
71
  .sticky-container {
72
72
  position: sticky;
73
73
  top: 0;
74
- background-color: #fff;
74
+ background-color: $white;
75
75
  z-index: 4;
76
76
  }
77
77
 
@@ -117,3 +117,46 @@ a {
117
117
  opacity: 0;
118
118
  z-index: -1;
119
119
  }
120
+
121
+ //select 2 styles
122
+ .select2-container {
123
+ .selection {
124
+ .select2-selection {
125
+ padding: 8px 16px;
126
+ background-color: $white;
127
+ border: 1px solid $grey-light-clr;
128
+ border-radius: $radius-4;
129
+ height: 40px;
130
+ .select2-selection__rendered {
131
+ padding-left: 0;
132
+ @include font($size: $t4-text, $color: $primary-text-clr);
133
+ line-height: 22px;
134
+ }
135
+ .select2-selection__arrow {
136
+ top: 6px;
137
+ }
138
+ }
139
+ }
140
+ .select2-dropdown {
141
+ border: 1px solid $grey-lighter-clr;
142
+ box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.16);
143
+ border-radius: $radius-4;
144
+ .select2-results {
145
+ .select2-results__options {
146
+ .select2-results__option {
147
+ padding: 9px 16px;
148
+ @include font($size: $t4-text, $color: $primary-text-clr);
149
+ line-height: 22px;
150
+ }
151
+ }
152
+ .select2-results__option--highlighted.select2-results__option--selectable {
153
+ background: $grey-lighter-clr;
154
+ color: $primary-text-clr;
155
+ }
156
+ .select2-results__option--selected {
157
+ color: $brand-color !important;
158
+ background-color: $grey-lighter-clr !important;
159
+ }
160
+ }
161
+ }
162
+ }
@@ -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
  }
@@ -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 {