History

Merge pull request #2106 from freeCodeCamp/sprockets

Update dependency sprockets to 4.2.1

Simon Legner committed 2 years ago

Commit 75e39c82 parents b7a5c9e 1b58ff15 files · +59 −65Browse files

Unified · Split

5 files
  1. Gemfile +1 −2
  2. Gemfile.lock +5 −14
  3. assets/stylesheets/application.css.scss.erb +53 −3
  4. assets/stylesheets/components/_environment.scss.erb +0 −3
  5. assets/stylesheets/global/_icons.scss.erb +0 −43
Gemfile+1−2
@@ -20,11 +20,10 @@ 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 'sass'23 gem 'sassc'
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'
28 gem 'sprockets'27 gem 'sprockets'
29 gem 'thin'28 gem 'thin'
30end29end
Gemfile.lock+5−14
@@ -84,9 +84,6 @@ GEM · 83 unmodified lines
84 rack-test (2.1.0)84 rack-test (2.1.0)
85 rack (>= 1.3)85 rack (>= 1.3)
86 rake (13.0.6)86 rake (13.0.6)
87 rb-fsevent (0.11.2)
88 rb-inotify (0.10.1)
89 ffi (~> 1.0)
90 redcarpet (3.6.0)87 redcarpet (3.6.0)
91 rexml (3.2.6)88 rexml (3.2.6)
92 rouge (1.11.1)89 rouge (1.11.1)
@@ -94,11 +91,8 @@ GEM · 1 unmodified line
94 rss (0.3.0)91 rss (0.3.0)
95 rexml92 rexml
96 ruby2_keywords (0.0.5)93 ruby2_keywords (0.0.5)
97 sass (3.7.4)94 sassc (2.4.0)
98 sass-listen (~> 4.0.0)95 ffi (~> 1.9)
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)96 sinatra (3.1.0)
103 mustermann (~> 3.0)97 mustermann (~> 3.0)
104 rack (~> 2.2, >= 2.2.4)98 rack (~> 2.2, >= 2.2.4)
@@ -110,13 +104,11 @@ GEM · 5 unmodified lines
110 rack-protection (= 3.1.0)104 rack-protection (= 3.1.0)
111 sinatra (= 3.1.0)105 sinatra (= 3.1.0)
112 tilt (~> 2.0)106 tilt (~> 2.0)
113 sprockets (3.7.2)107 sprockets (4.2.1)
114 concurrent-ruby (~> 1.0)108 concurrent-ruby (~> 1.0)
115 rack (> 1, < 3)109 rack (>= 2.2.4, < 4)
116 sprockets-helpers (1.4.0)110 sprockets-helpers (1.4.0)
117 sprockets (>= 2.2)111 sprockets (>= 2.2)
118 sprockets-sass (2.0.0.beta2)
119 sprockets (>= 2.0, < 4.0)
120 strings (0.2.1)112 strings (0.2.1)
121 strings-ansi (~> 0.2)113 strings-ansi (~> 0.2)
122 unicode-display_width (>= 1.5, < 3.0)114 unicode-display_width (>= 1.5, < 3.0)
@@ -170,12 +162,11 @@ DEPENDENCIES · 47 unmodified lines
170 redcarpet162 redcarpet
171 rr163 rr
172 rss164 rss
173 sass165 sassc
174 sinatra166 sinatra
175 sinatra-contrib167 sinatra-contrib
176 sprockets168 sprockets
177 sprockets-helpers169 sprockets-helpers
178 sprockets-sass
179 terminal-table170 terminal-table
180 terser171 terser
181 thin172 thin
assets/stylesheets/application.css.scss.erbrenamed from assets/stylesheets/application.css.scss+53−3
@@ -10,11 +10,61 @@ · 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
13@import 'global/variables-light',64@import 'global/variables-light',
14 'global/variables-dark',65 'global/variables-dark',
15 'global/variables',66 'global/variables',
16 'global/mixins',67 'global/mixins',
17 'global/icons',
18 'global/classes',68 'global/classes',
19 'global/base';69 'global/base';
20 70
@@ -29,8 +79,8 @@ · 8 unmodified lines
29 'components/path',79 'components/path',
30 'components/notice',80 'components/notice',
31 'components/prism',81 'components/prism',
32 'components/mobile',82 'components/mobile';
33 'components/environment';83
34 84
35@import 'pages/simple',85@import 'pages/simple',
36 'pages/angular',86 'pages/angular',
assets/stylesheets/components/_environment.scss.erb+0−3
@@ -1,3 +0,0 @@
1._hide-in-development {
2 <%= App.environment != :production ? 'display: none;' : '' %>
3}
assets/stylesheets/global/_icons.scss.erb+0−43
@@ -1,43 +0,0 @@
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 %>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t