History

Revert "Update dependency sprockets to 4.2.1"

This reverts commit 1b58ff1ac05198ec3a93d99242aef0f33429e022.

Simon Legner committed 2 years ago

Commit cf0f7da1 parent 55b0da76 files · +76 −71Browse files

Unified · Split

6 files
  1. Gemfile +2 −1
  2. Gemfile.lock +24 −16
  3. assets/stylesheets/application.css.scss +3 −53
  4. assets/stylesheets/components/_environment.scss.erb +3 −0
  5. assets/stylesheets/global/_icons.scss.erb +43 −0
  6. lib/app.rb +1 −1
Gemfile+2−1
@@ -20,10 +20,11 @@ group :app do · 19 unmodified lines
20 gem 'rack-ssl-enforcer'20 gem 'rack-ssl-enforcer'
21 gem 'rack'21 gem 'rack'
22 gem 'rss'22 gem 'rss'
23 gem 'sassc'23 gem 'sass'
24 gem 'sinatra-contrib'24 gem 'sinatra-contrib'
25 gem 'sinatra'25 gem 'sinatra'
26 gem 'sprockets-helpers'26 gem 'sprockets-helpers'
27 gem 'sprockets-sass'
27 gem 'sprockets'28 gem 'sprockets'
28 gem 'thin'29 gem 'thin'
29end30end
Gemfile.lock+24−16
@@ -78,13 +78,15 @@ GEM · 77 unmodified lines
78 pry (>= 0.13, < 0.15)78 pry (>= 0.13, < 0.15)
79 racc (1.6.2)79 racc (1.6.2)
80 rack (2.2.8)80 rack (2.2.8)
81 rack-protection (3.2.0)81 rack-protection (3.1.0)
82 base64 (>= 0.1.0)
83 rack (~> 2.2, >= 2.2.4)82 rack (~> 2.2, >= 2.2.4)
84 rack-ssl-enforcer (0.2.9)83 rack-ssl-enforcer (0.2.9)
85 rack-test (2.1.0)84 rack-test (2.1.0)
86 rack (>= 1.3)85 rack (>= 1.3)
87 rake (13.1.0)86 rake (13.0.6)
87 rb-fsevent (0.11.2)
88 rb-inotify (0.10.1)
89 ffi (~> 1.0)
88 redcarpet (3.6.0)90 redcarpet (3.6.0)
89 rexml (3.2.6)91 rexml (3.2.6)
90 rouge (1.11.1)92 rouge (1.11.1)
@@ -92,24 +94,29 @@ GEM · 1 unmodified line
92 rss (0.3.0)94 rss (0.3.0)
93 rexml95 rexml
94 ruby2_keywords (0.0.5)96 ruby2_keywords (0.0.5)
95 sassc (2.4.0)97 sass (3.7.4)
96 ffi (~> 1.9)98 sass-listen (~> 4.0.0)
97 sinatra (3.2.0)99 sass-listen (4.0.0)
100 rb-fsevent (~> 0.9, >= 0.9.4)
101 rb-inotify (~> 0.9, >= 0.9.7)
102 sinatra (3.1.0)
98 mustermann (~> 3.0)103 mustermann (~> 3.0)
99 rack (~> 2.2, >= 2.2.4)104 rack (~> 2.2, >= 2.2.4)
100 rack-protection (= 3.2.0)105 rack-protection (= 3.1.0)
101 tilt (~> 2.0)106 tilt (~> 2.0)
102 sinatra-contrib (3.2.0)107 sinatra-contrib (3.1.0)
103 multi_json (>= 0.0.2)108 multi_json
104 mustermann (~> 3.0)109 mustermann (~> 3.0)
105 rack-protection (= 3.2.0)110 rack-protection (= 3.1.0)
106 sinatra (= 3.2.0)111 sinatra (= 3.1.0)
107 tilt (~> 2.0)112 tilt (~> 2.0)
108 sprockets (4.2.1)113 sprockets (3.7.2)
109 concurrent-ruby (~> 1.0)114 concurrent-ruby (~> 1.0)
110 rack (>= 2.2.4, < 4)115 rack (> 1, < 3)
111 sprockets-helpers (1.4.0)116 sprockets-helpers (1.4.0)
112 sprockets (>= 2.2)117 sprockets (>= 2.2)
118 sprockets-sass (2.0.0.beta2)
119 sprockets (>= 2.0, < 4.0)
113 strings (0.2.1)120 strings (0.2.1)
114 strings-ansi (~> 0.2)121 strings-ansi (~> 0.2)
115 unicode-display_width (>= 1.5, < 3.0)122 unicode-display_width (>= 1.5, < 3.0)
@@ -124,7 +131,7 @@ GEM · 8 unmodified lines
124 eventmachine (~> 1.0, >= 1.0.4)131 eventmachine (~> 1.0, >= 1.0.4)
125 rack (>= 1, < 3)132 rack (>= 1, < 3)
126 thor (1.3.0)133 thor (1.3.0)
127 tilt (2.3.0)134 tilt (2.2.0)
128 tty-pager (0.14.0)135 tty-pager (0.14.0)
129 strings (~> 0.2.0)136 strings (~> 0.2.0)
130 tty-screen (~> 0.8)137 tty-screen (~> 0.8)
@@ -163,11 +170,12 @@ DEPENDENCIES · 32 unmodified lines
163 redcarpet170 redcarpet
164 rr171 rr
165 rss172 rss
166 sassc173 sass
167 sinatra174 sinatra
168 sinatra-contrib175 sinatra-contrib
169 sprockets176 sprockets
170 sprockets-helpers177 sprockets-helpers
178 sprockets-sass
171 terminal-table179 terminal-table
172 terser180 terser
173 thin181 thin
@@ -181,4 +189,4 @@ RUBY VERSION · 7 unmodified lines
181 ruby 3.3.0p0189 ruby 3.3.0p0
182 190
183BUNDLED WITH191BUNDLED WITH
184 2.5.4192 2.4.6
assets/stylesheets/application.css.scssrenamed from assets/stylesheets/application.css.scss.erb+3−53
@@ -10,61 +10,11 @@ · 9 unmodified lines
10 * http://mozilla.org/MPL/2.0/10 * http://mozilla.org/MPL/2.0/
11 */11 */
12 12
13/* https://github.com/rails/sass-rails/issues/139 */
14
15<% manifest = JSON.parse(File.read('assets/images/sprites/docs.json')) %>
16
17%svg-icon {
18 display: inline-block;
19 vertical-align: top;
20 width: 1rem;
21 height: 1rem;
22 pointer-events: none;
23 fill: currentColor;
24}
25
26%doc-icon {
27 content: '';
28 display: block;
29 width: 1rem;
30 height: 1rem;
31 background-image: image-url('sprites/docs.png');
32 background-size: <%= manifest['icons_per_row'] %>rem <%= manifest['icons_per_row'] %>rem;
33}
34
35@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
36 %doc-icon { background-image: image-url('sprites/docs@2x.png'); }
37}
38
39html._theme-dark {
40 %darkIconFix {
41 filter: invert(100%) grayscale(100%);
42 -webkit-filter: invert(100%) grayscale(100%);
43 }
44}
45
46<%=
47 items = []
48
49 manifest['items'].each do |item|
50 rules = []
51 rules << "background-position: -#{item['col']}rem -#{item['row']}rem;"
52 rules << "@extend %darkIconFix !optional;" if item['dark_icon_fix']
53 items << "._icon-#{item['type']}:before { #{rules.join(' ')} }"
54 end
55
56 items.join('')
57 %>
58
59._hide-in-development {
60 <%= App.environment != :production ? 'display: none;' : '' %>
61}
62
63
64@import 'global/variables-light',13@import 'global/variables-light',
65 'global/variables-dark',14 'global/variables-dark',
66 'global/variables',15 'global/variables',
67 'global/mixins',16 'global/mixins',
17 'global/icons',
68 'global/classes',18 'global/classes',
69 'global/base';19 'global/base';
70 20
@@ -79,8 +29,8 @@ html._theme-dark { · 8 unmodified lines
79 'components/path',29 'components/path',
80 'components/notice',30 'components/notice',
81 'components/prism',31 'components/prism',
82 'components/mobile';32 'components/mobile',
83 33 'components/environment';
84 34
85@import 'pages/simple',35@import 'pages/simple',
86 'pages/angular',36 'pages/angular',
assets/stylesheets/components/_environment.scss.erb+3−0
@@ -0,0 +1,3 @@
1._hide-in-development {
2 <%= App.environment != :production ? 'display: none;' : '' %>
3}
assets/stylesheets/global/_icons.scss.erb+43−0
@@ -0,0 +1,43 @@
1<% manifest = JSON.parse(File.read('assets/images/sprites/docs.json')) %>
2
3%svg-icon {
4 display: inline-block;
5 vertical-align: top;
6 width: 1rem;
7 height: 1rem;
8 pointer-events: none;
9 fill: currentColor;
10}
11
12%doc-icon {
13 content: '';
14 display: block;
15 width: 1rem;
16 height: 1rem;
17 background-image: image-url('sprites/docs.png');
18 background-size: <%= manifest['icons_per_row'] %>rem <%= manifest['icons_per_row'] %>rem;
19}
20
21@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
22 %doc-icon { background-image: image-url('sprites/docs@2x.png'); }
23}
24
25html._theme-dark {
26 %darkIconFix {
27 filter: invert(100%) grayscale(100%);
28 -webkit-filter: invert(100%) grayscale(100%);
29 }
30}
31
32<%=
33 items = []
34
35 manifest['items'].each do |item|
36 rules = []
37 rules << "background-position: -#{item['col']}rem -#{item['row']}rem;"
38 rules << "@extend %darkIconFix !optional;" if item['dark_icon_fix']
39 items << "._icon-#{item['type']}:before { #{rules.join(' ')} }"
40 end
41
42 items.join('')
43 %>
lib/app.rb+1−1
@@ -94,7 +94,7 @@ class App < Sinatra::Application · 93 unmodified lines
94 ]94 ]
95 95
96 sprockets.js_compressor = Terser.new96 sprockets.js_compressor = Terser.new
97 sprockets.css_compressor = :sassc97 sprockets.css_compressor = :sass
98 98
99 Sprockets::Helpers.configure do |config|99 Sprockets::Helpers.configure do |config|
100 config.digest = true100 config.digest = true