english_tea 1.17.0 → 1.18.0

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/english_tea/forms/_range.scss +20 -66
  3. data/app/assets/stylesheets/english_tea/forms/_select.scss +41 -6
  4. data/app/assets/stylesheets/english_tea/icons/_index.scss +4 -0
  5. data/lib/english_tea/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5673848778df1a4db4ffac03009d5613c495a818ae1f80d20096a7d2a16cd60a
4
- data.tar.gz: b47335413ca297fb27fa4b5fad7f79d895cff2c10931320c877b188524f4a888
3
+ metadata.gz: '05878ba863697c68320093bbbc9a195252279c2fa3f737ce48cb757039df8464'
4
+ data.tar.gz: b3777520128a1b69dd63bffb7a9444e34b61866db91e70329f76de9af9f38e26
5
5
  SHA512:
6
- metadata.gz: eea702d545eeb1aa64873b163f0a3e8c7d72789d7fa1e506a457d64cc5f70543337b6e18d3e253780c07711d6f2e45f9da44d16c7b3bb0bb98a9993cf3504d5b
7
- data.tar.gz: 8209b98867dd6021d9d997488d38a27b83230127ad31ad579075e201d468d3c638f542294416fb699a20a7ec9bcf126773e2618103d32cb6338e5526455b9bfe
6
+ metadata.gz: 9a79a46a7aa101b27d873266dbb37339f4c0e6ff205eab34f981a3e4508a9ec982471a643387dc06637c8907e033acfce6e33a50b0de3726f6831b1100564ba5
7
+ data.tar.gz: 3bc1fbd49b2ddc9cd3fb601ca3926023b69dd56d8f16f68eb451a20a4f5b08c6f1dedbd7178bb4ac9cd4256e6b6ccbaf24590724290111120741321f867e1a8d
data/app/assets/stylesheets/english_tea/forms/_range.scss CHANGED
@@ -7,77 +7,31 @@
7
7
 
8
8
  .field-range {
9
9
 
10
- &-input {
11
- @include prefixer(appearance, none, webkit);
10
+ &.noUi-horizontal {
11
+ height: _rem($base-rhythm);
12
12
 
13
- &:focus {
14
- outline: none;
15
-
16
- &::-webkit-slider-runnable-track {
17
- background: map-get($colors, 3);
18
- }
19
- &::-ms-fill-lower {
20
- background: map-get($colors, 4);
21
- }
22
- &::-ms-fill-upper {
23
- background: map-get($colors, 3);
24
- }
13
+ .noUi-handle {
14
+ width: _rem($base-rhythm * 2);
15
+ height: _rem($base-rhythm * 2);
25
16
  }
17
+ }
26
18
 
27
- &::-webkit-slider-runnable-track {
28
- width: 100%;
29
- height: 4px;
30
- cursor: pointer;
31
- background: map-get($colors, 3);
32
- border-radius: 2px;
33
- }
34
-
35
- &::-webkit-slider-thumb {
36
- height: 12px;
37
- width: 12px;
38
- border-radius: 6px;
39
- background: map-get($colors, 10);;
40
- cursor: pointer;
41
- -webkit-appearance: none;
42
- margin-top: -4.5px;
43
- }
44
-
45
- &::-moz-range-track {
46
- width: 100%;
47
- height: 3px;
48
- cursor: pointer;
49
- background: map-get($colors, 3);
50
- border-radius: 0px;
51
- }
52
-
53
- &::-moz-range-progress {
54
- background: map-get($colors, 4);
55
- }
19
+ .noUi-handle {
20
+ background: map-get($colors, 10);
21
+ border: none;
22
+ border-radius: _rem($base-rhythm);
23
+ box-shadow: none;
24
+ cursor: pointer;
25
+ outline: none;
56
26
 
57
- &::-moz-range-thumb {
58
- height: 12px;
59
- width: 12px;
60
- border-radius: 6px;
61
- background: #000000;
62
- cursor: pointer;
63
- }
27
+ &:before {
28
+ display: none
29
+ }
64
30
 
65
- &::-ms-track {
66
- width: 100%;
67
- height: 3px;
68
- cursor: pointer;
69
- background: transparent;
70
- border-color: transparent;
71
- color: transparent;
72
- }
31
+ &:after {
32
+ display: none
33
+ }
73
34
 
74
- &::-ms-thumb {
75
- height: 12px;
76
- width: 12px;
77
- border-radius: 6px;
78
- background: map-get($colors, 10);;
79
- cursor: pointer;
80
- height: 3px;
81
- }
82
35
  }
36
+
83
37
  }
data/app/assets/stylesheets/english_tea/forms/_select.scss CHANGED
@@ -104,17 +104,19 @@
104
104
  .select2-selection__clear,
105
105
  .select2-selection__choice__remove
106
106
  {
107
- $_icon-size: map-get($icon-scale, base);
107
+ $_icon-size: map-get($icon-scale, base) / 1.5;
108
108
 
109
- background: transparent url('data:image/svg+xml,#{$icon-delete}') no-repeat center center;
109
+ float: right;
110
+ background: transparent url('data:image/svg+xml,#{$icon-close-rev}') no-repeat center center;
110
111
  background-size: _rem($_icon-size);
111
112
  display: block;
112
113
  @include flex-shrink(0 !important);
113
- height: _rem($_icon-size);
114
- margin-right: $base-rhythm-half;
114
+ height: _rem($_icon-size);
115
+ margin-left: _rem($base-rhythm);
115
116
  text-indent: -999em; // ¯\_(ツ)_/¯
116
- width: _rem($_icon-size);
117
+ width: _rem($_icon-size);
117
118
  @include transition(opacity $transition-timing-border $transition-easing-border);
119
+ @include order(999);
118
120
 
119
121
  &:active,
120
122
  &:focus,
@@ -126,7 +128,12 @@
126
128
 
127
129
  .select2-selection__choice
128
130
  {
129
- margin-right: _rem($base-gutter);
131
+ font-size: map-get(map-get($type-scale, 1), size);
132
+ margin-right: _rem($base-rhythm-half);
133
+ background-color: map-get($colors, 10);
134
+ color: map-get($colors, 1);
135
+ padding: _rem($base-rhythm / 3) _rem($base-rhythm / 1.8) _rem($base-rhythm / 3) _rem($base-rhythm);
136
+ border-radius: _rem($base-gutter);
130
137
  }
131
138
 
132
139
  // ---
@@ -419,6 +426,15 @@
419
426
  right: _rem($base-rhythm * 2);
420
427
  }
421
428
 
429
+ .choices__input {
430
+ background-color: transparent;
431
+ margin-bottom: 0;
432
+ @include _placeholder-prefix()
433
+ {
434
+ color: map-get($colors, 3);
435
+ }
436
+ }
437
+
422
438
  .choices__inner {
423
439
  border: 1px solid map-get($colors, 2);
424
440
  }
@@ -438,6 +454,25 @@
438
454
  padding: 0;
439
455
  }
440
456
 
457
+ .choices__list--multiple .choices__item {
458
+ background-color: map-get($colors, 10);
459
+ border: none;
460
+ margin-bottom: 2px;
461
+ font-weight: normal;
462
+ }
463
+
464
+ .choices__list--multiple .choices__item.is-highlighted {
465
+ background-color: map-get($colors, 6);
466
+ border: inherit;
467
+ }
468
+
469
+ .choices[data-type*="select-multiple"] .choices__button,
470
+ .choices[data-type*="text"] .choices__button {
471
+ border: none;
472
+ margin-right: 0;
473
+ opacity: 1;
474
+ }
475
+
441
476
  .is-open .choices__inner, .choices__list--dropdown {
442
477
  border-radius: 0;
443
478
  }
data/app/assets/stylesheets/english_tea/icons/_index.scss CHANGED
@@ -47,6 +47,10 @@ $icon-next-rev: '%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20viewBox%3
47
47
 
48
48
  $icon-check-simple: '%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20viewBox%3D%220%200%2024%2024%22%3E%3Cpath%20d%3D%22M9%2016.2L4.8%2012l-1.4%201.4L9%2019%2021%207l-1.4-1.4L9%2016.2z%22%20fill%3D%22%23ffffff%22/%3E%3C/svg%3E';
49
49
 
50
+ $icon-close: '%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%3E%3Cpath%20d%3D%22M19%206.41L17.59%205%2012%2010.59%206.41%205%205%206.41%2010.59%2012%205%2017.59%206.41%2019%2012%2013.41%2017.59%2019%2019%2017.59%2013.41%2012z%22%2F%3E%3C%2Fsvg%3E';
51
+
52
+ $icon-close-rev: '%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%3E%3Cpath%20d%3D%22M19%206.41L17.59%205%2012%2010.59%206.41%205%205%206.41%2010.59%2012%205%2017.59%206.41%2019%2012%2013.41%2017.59%2019%2019%2017.59%2013.41%2012z%22%20fill%3D%22%23ffffff%22%20%2F%3E%3C%2Fsvg%3E';
53
+
50
54
  $icon-delete: '%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20viewBox%3D%220%200%2024%2024%22%3E%3Cpath%20d%3D%22M6%2019c0%201.1.9%202%202%202h8c1.1%200%202-.9%202-2V7H6v12zm2.46-7.12l1.41-1.41L12%2012.59l2.12-2.12%201.41%201.41L13.41%2014l2.12%202.12-1.41%201.41L12%2015.41l-2.12%202.12-1.41-1.41L10.59%2014l-2.13-2.12zM15.5%204l-1-1h-5l-1%201H5v2h14V4z%22/%3E%3C/svg%3E';
51
55
 
52
56
  $icon-search: '%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20viewBox%3D%220%200%2024%2024%22%3E%3Cpath%20d%3D%22M15.5%2014h-.79l-.28-.27C15.41%2012.59%2016%2011.11%2016%209.5%2016%205.91%2013.09%203%209.5%203S3%205.91%203%209.5%205.91%2016%209.5%2016c1.61%200%203.09-.59%204.23-1.57l.27.28v.79l5%204.99L20.49%2019l-4.99-5zm-6%200C7.01%2014%205%2011.99%205%209.5S7.01%205%209.5%205%2014%207.01%2014%209.5%2011.99%2014%209.5%2014z%22%20/%3E%3C/svg%3E';
data/lib/english_tea/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnglishTea
2
- VERSION = "1.17.0"
2
+ VERSION = "1.18.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: english_tea
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.17.0
4
+ version: 1.18.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel Parr
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2018-05-22 00:00:00.000000000 Z
12
+ date: 2018-05-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler