Skip to content

Commit b2f9e5e

Browse files
author
Nils Henning
committed
Merge branch 'develop' into next-release
2 parents 407dee9 + d5f9ade commit b2f9e5e

File tree

5 files changed

+120
-83
lines changed

5 files changed

+120
-83
lines changed

‎Gemfile.lock

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,61 +13,61 @@ PATH
1313
GEM
1414
remote: https://rubygems.org/
1515
specs:
16-
actioncable (6.0.2.2)
17-
actionpack (= 6.0.2.2)
16+
actioncable (6.0.3.2)
17+
actionpack (= 6.0.3.2)
1818
nio4r (~> 2.0)
1919
websocket-driver (>= 0.6.1)
20-
actionmailbox (6.0.2.2)
21-
actionpack (= 6.0.2.2)
22-
activejob (= 6.0.2.2)
23-
activerecord (= 6.0.2.2)
24-
activestorage (= 6.0.2.2)
25-
activesupport (= 6.0.2.2)
20+
actionmailbox (6.0.3.2)
21+
actionpack (= 6.0.3.2)
22+
activejob (= 6.0.3.2)
23+
activerecord (= 6.0.3.2)
24+
activestorage (= 6.0.3.2)
25+
activesupport (= 6.0.3.2)
2626
mail (>= 2.7.1)
27-
actionmailer (6.0.2.2)
28-
actionpack (= 6.0.2.2)
29-
actionview (= 6.0.2.2)
30-
activejob (= 6.0.2.2)
27+
actionmailer (6.0.3.2)
28+
actionpack (= 6.0.3.2)
29+
actionview (= 6.0.3.2)
30+
activejob (= 6.0.3.2)
3131
mail (~> 2.5, >= 2.5.4)
3232
rails-dom-testing (~> 2.0)
33-
actionpack (6.0.2.2)
34-
actionview (= 6.0.2.2)
35-
activesupport (= 6.0.2.2)
33+
actionpack (6.0.3.2)
34+
actionview (= 6.0.3.2)
35+
activesupport (= 6.0.3.2)
3636
rack (~> 2.0, >= 2.0.8)
3737
rack-test (>= 0.6.3)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.0, >= 1.2.0)
40-
actiontext (6.0.2.2)
41-
actionpack (= 6.0.2.2)
42-
activerecord (= 6.0.2.2)
43-
activestorage (= 6.0.2.2)
44-
activesupport (= 6.0.2.2)
40+
actiontext (6.0.3.2)
41+
actionpack (= 6.0.3.2)
42+
activerecord (= 6.0.3.2)
43+
activestorage (= 6.0.3.2)
44+
activesupport (= 6.0.3.2)
4545
nokogiri (>= 1.8.5)
46-
actionview (6.0.2.2)
47-
activesupport (= 6.0.2.2)
46+
actionview (6.0.3.2)
47+
activesupport (= 6.0.3.2)
4848
builder (~> 3.1)
4949
erubi (~> 1.4)
5050
rails-dom-testing (~> 2.0)
5151
rails-html-sanitizer (~> 1.1, >= 1.2.0)
52-
activejob (6.0.2.2)
53-
activesupport (= 6.0.2.2)
52+
activejob (6.0.3.2)
53+
activesupport (= 6.0.3.2)
5454
globalid (>= 0.3.6)
55-
activemodel (6.0.2.2)
56-
activesupport (= 6.0.2.2)
57-
activerecord (6.0.2.2)
58-
activemodel (= 6.0.2.2)
59-
activesupport (= 6.0.2.2)
60-
activestorage (6.0.2.2)
61-
actionpack (= 6.0.2.2)
62-
activejob (= 6.0.2.2)
63-
activerecord (= 6.0.2.2)
55+
activemodel (6.0.3.2)
56+
activesupport (= 6.0.3.2)
57+
activerecord (6.0.3.2)
58+
activemodel (= 6.0.3.2)
59+
activesupport (= 6.0.3.2)
60+
activestorage (6.0.3.2)
61+
actionpack (= 6.0.3.2)
62+
activejob (= 6.0.3.2)
63+
activerecord (= 6.0.3.2)
6464
marcel (~> 0.3.1)
65-
activesupport (6.0.2.2)
65+
activesupport (6.0.3.2)
6666
concurrent-ruby (~> 1.0, >= 1.0.2)
6767
i18n (>= 0.7, < 2)
6868
minitest (~> 5.1)
6969
tzinfo (~> 1.1)
70-
zeitwerk (~> 2.2)
70+
zeitwerk (~> 2.2, >= 2.2.2)
7171
addressable (2.7.0)
7272
public_suffix (>= 2.0.2, < 5.0)
7373
builder (3.2.4)
@@ -119,22 +119,22 @@ GEM
119119
temple (>= 0.8.0)
120120
tilt
121121
hashdiff (1.0.0)
122-
i18n (1.8.2)
122+
i18n (1.8.3)
123123
concurrent-ruby (~> 1.0)
124-
loofah (2.5.0)
124+
loofah (2.6.0)
125125
crass (~> 1.0.2)
126126
nokogiri (>= 1.5.9)
127127
mail (2.7.1)
128128
mini_mime (>= 0.1.1)
129129
marcel (0.3.3)
130130
mimemagic (~> 0.3.2)
131131
method_source (0.9.2)
132-
mimemagic (0.3.4)
132+
mimemagic (0.3.5)
133133
mini_mime (1.0.2)
134134
mini_portile2 (2.4.0)
135-
minitest (5.14.0)
135+
minitest (5.14.1)
136136
nio4r (2.5.2)
137-
nokogiri (1.10.9)
137+
nokogiri (1.10.10)
138138
mini_portile2 (~> 2.4.0)
139139
pipetree (0.1.1)
140140
pry (0.12.2)
@@ -146,36 +146,36 @@ GEM
146146
pry-rails (0.3.9)
147147
pry (>= 0.10.4)
148148
public_suffix (4.0.3)
149-
puma (4.3.3)
149+
puma (4.3.5)
150150
nio4r (~> 2.0)
151-
rack (2.2.2)
151+
rack (2.2.3)
152152
rack-proxy (0.6.5)
153153
rack
154154
rack-test (1.1.0)
155155
rack (>= 1.0, < 3)
156-
rails (6.0.2.2)
157-
actioncable (= 6.0.2.2)
158-
actionmailbox (= 6.0.2.2)
159-
actionmailer (= 6.0.2.2)
160-
actionpack (= 6.0.2.2)
161-
actiontext (= 6.0.2.2)
162-
actionview (= 6.0.2.2)
163-
activejob (= 6.0.2.2)
164-
activemodel (= 6.0.2.2)
165-
activerecord (= 6.0.2.2)
166-
activestorage (= 6.0.2.2)
167-
activesupport (= 6.0.2.2)
156+
rails (6.0.3.2)
157+
actioncable (= 6.0.3.2)
158+
actionmailbox (= 6.0.3.2)
159+
actionmailer (= 6.0.3.2)
160+
actionpack (= 6.0.3.2)
161+
actiontext (= 6.0.3.2)
162+
actionview (= 6.0.3.2)
163+
activejob (= 6.0.3.2)
164+
activemodel (= 6.0.3.2)
165+
activerecord (= 6.0.3.2)
166+
activestorage (= 6.0.3.2)
167+
activesupport (= 6.0.3.2)
168168
bundler (>= 1.3.0)
169-
railties (= 6.0.2.2)
169+
railties (= 6.0.3.2)
170170
sprockets-rails (>= 2.0.0)
171171
rails-dom-testing (2.0.3)
172172
activesupport (>= 4.2.0)
173173
nokogiri (>= 1.6)
174174
rails-html-sanitizer (1.3.0)
175175
loofah (~> 2.3)
176-
railties (6.0.2.2)
177-
actionpack (= 6.0.2.2)
178-
activesupport (= 6.0.2.2)
176+
railties (6.0.3.2)
177+
actionpack (= 6.0.3.2)
178+
activesupport (= 6.0.3.2)
179179
method_source
180180
rake (>= 0.8.7)
181181
thor (>= 0.20.3, < 2.0)
@@ -225,7 +225,7 @@ GEM
225225
docile (~> 1.1)
226226
simplecov-html (~> 0.11.0)
227227
simplecov-html (0.11.0)
228-
sprockets (4.0.0)
228+
sprockets (4.0.2)
229229
concurrent-ruby (~> 1.0)
230230
rack (> 1, < 3)
231231
sprockets-rails (3.2.1)
@@ -266,12 +266,12 @@ GEM
266266
activesupport (>= 4.2)
267267
rack-proxy (>= 0.6.1)
268268
railties (>= 4.2)
269-
websocket-driver (0.7.1)
269+
websocket-driver (0.7.2)
270270
websocket-extensions (>= 0.1.0)
271-
websocket-extensions (0.1.4)
271+
websocket-extensions (0.1.5)
272272
xpath (3.2.0)
273273
nokogiri (~> 1.8)
274-
zeitwerk (2.3.0)
274+
zeitwerk (2.3.1)
275275

276276
PLATFORMS
277277
ruby

‎builder/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ GEM
8787
nokogiri (1.10.8)
8888
mini_portile2 (~> 2.4.0)
8989
puma (3.12.4)
90-
rack (2.1.2)
90+
rack (2.2.3)
9191
rack-proxy (0.6.5)
9292
rack
9393
rack-test (1.1.0)
@@ -157,7 +157,7 @@ GEM
157157
railties (>= 4.2)
158158
websocket-driver (0.7.1)
159159
websocket-extensions (>= 0.1.0)
160-
websocket-extensions (0.1.4)
160+
websocket-extensions (0.1.5)
161161

162162
PLATFORMS
163163
ruby

‎builder/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,9 +4043,9 @@ lodash.uniq@^4.5.0:
40434043
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
40444044

40454045
lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
4046-
version "4.17.15"
4047-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
4048-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
4046+
version "4.17.19"
4047+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
4048+
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
40494049

40504050
loglevel@^1.6.6:
40514051
version "1.6.6"
@@ -7271,9 +7271,9 @@ websocket-driver@>=0.5.1:
72717271
websocket-extensions ">=0.1.1"
72727272

72737273
websocket-extensions@>=0.1.1:
7274-
version "0.1.3"
7275-
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
7276-
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
7274+
version "0.1.4"
7275+
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
7276+
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
72777277

72787278
which-module@^1.0.0:
72797279
version "1.0.0"

‎guides/30_inline_styling.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Inline styling of Matestack components
2+
3+
*Prerequisite:* We assume you have read and followed the [installation guide](/docs/install), either in a new or existing Rails application.
4+
5+
## General approach
6+
7+
Matestack components can easily be styled through the `attributes` parameter. In a growing application, you will most probably work with a (S)CSS framework/library and often style your pages and components through `id`s and `classes`. Inline styles allow for dynamic styling and can come in handy in certain use cases - as shown below:
8+
9+
```ruby
10+
# [...]
11+
12+
def prepare
13+
@colors = ['green', 'blue', 'red']
14+
end
15+
16+
def response
17+
components {
18+
@colors.each do |color|
19+
paragraph attributes: { style: "color: #{color};" }, text: "I will be displayed as #{color} text."
20+
end
21+
}
22+
end
23+
24+
# [...]
25+
```
26+
## Accessing videos and images with inline styling
27+
28+
For now, we have to resort to an `ActionController` helper in order to work with our assets. See a working example below:
29+
30+
```ruby
31+
# [...]
32+
33+
def response
34+
components {
35+
div attributes: { style: "background-image: url(#{ActionController::Base.helpers.asset_path('image.png')});" } do
36+
# [...]
37+
end
38+
}
39+
end
40+
41+
# [...]
42+
```

‎spec/dummy/yarn.lock

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4274,15 +4274,10 @@ lodash.uniq@^4.5.0:
42744274
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
42754275
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
42764276

4277-
lodash@^4.0.0, lodash@~4.17.10:
4278-
version "4.17.11"
4279-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
4280-
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
4281-
4282-
lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5:
4283-
version "4.17.15"
4284-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
4285-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
4277+
lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
4278+
version "4.17.19"
4279+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
4280+
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
42864281

42874282
loglevel@^1.6.6:
42884283
version "1.6.6"
@@ -4364,7 +4359,7 @@ map-visit@^1.0.0:
43644359
object-visit "^1.0.0"
43654360

43664361
matestack-ui-core@../../:
4367-
version "0.7.4"
4362+
version "0.7.6"
43684363
dependencies:
43694364
axios "^0.18.1"
43704365
link-module-alias "^1.2.0"
@@ -7700,9 +7695,9 @@ websocket-driver@>=0.5.1:
77007695
websocket-extensions ">=0.1.1"
77017696

77027697
websocket-extensions@>=0.1.1:
7703-
version "0.1.3"
7704-
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
7705-
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
7698+
version "0.1.4"
7699+
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
7700+
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
77067701

77077702
which-module@^1.0.0:
77087703
version "1.0.0"

0 commit comments

Comments
 (0)