Skip to content

Commit 5b7b8f3

Browse files
author
Giacomo Guiulfo
authored
Remove sass-rails dependency (#907)
1 parent 515e267 commit 5b7b8f3

10 files changed

Lines changed: 217 additions & 201 deletions

File tree

‎Gemfile.lock‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ PATH
1616
pg
1717
rack-rewrite (>= 1.5.0)
1818
rails (>= 6.0)
19-
sass-rails
2019
stimulus-rails (>= 0.7.0)
2120
turbo-rails (~> 0.9)
2221
view_component (~> 2.32)
@@ -222,16 +221,6 @@ GEM
222221
ruby-vips (2.1.4)
223222
ffi (~> 1.12)
224223
rubyzip (2.3.2)
225-
sass-rails (6.0.0)
226-
sassc-rails (~> 2.1, >= 2.1.1)
227-
sassc (2.4.0)
228-
ffi (~> 1.9)
229-
sassc-rails (2.1.2)
230-
railties (>= 4.0.0)
231-
sassc (>= 2.0)
232-
sprockets (> 3.0)
233-
sprockets-rails
234-
tilt
235224
selenium-webdriver (4.1.0)
236225
childprocess (>= 0.5, < 5.0)
237226
rexml (~> 3.2, >= 3.2.5)
@@ -251,7 +240,6 @@ GEM
251240
stimulus-rails (0.7.3)
252241
rails (>= 6.0.0)
253242
thor (1.1.0)
254-
tilt (2.0.10)
255243
turbo-rails (0.9.0)
256244
rails (>= 6.0.0)
257245
tzinfo (2.0.4)

‎app/assets/stylesheets/spina/_fonts.css.erb‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
@font-face {
2+
font-family: "Metropolis";
3+
font-weight: 400;
4+
src: url('<%= asset_path "spina/Metropolis-Regular.woff2" %>') format("woff2");
5+
}
6+
7+
@font-face {
8+
font-family: "Metropolis";
9+
font-style: italic;
10+
src: url('<%= asset_path "spina/Metropolis-RegularItalic.woff2" %>') format("woff2");
11+
}
12+
13+
@font-face {
14+
font-family: "Metropolis";
15+
font-weight: 100;
16+
src: url('<%= asset_path "spina/Metropolis-Thin.woff2" %>') format("woff2");
17+
}
18+
19+
@font-face {
20+
font-family: "Metropolis";
21+
font-weight: 100;
22+
font-style: italic;
23+
src: url('<%= asset_path "spina/Metropolis-ThinItalic.woff2" %>') format("woff2");
24+
}
25+
26+
@font-face {
27+
font-family: "Metropolis";
28+
font-weight: 200;
29+
src: url('<%= asset_path "spina/Metropolis-ExtraLight.woff2" %>') format("woff2");
30+
}
31+
32+
@font-face {
33+
font-family: "Metropolis";
34+
font-weight: 200;
35+
src: url('<%= asset_path "spina/Metropolis-ExtraLightItalic.woff2" %>') format("woff2");
36+
}
37+
38+
@font-face {
39+
font-family: "Metropolis";
40+
font-weight: 300;
41+
src: url('<%= asset_path "spina/Metropolis-Light.woff2" %>') format("woff2");
42+
}
43+
44+
@font-face {
45+
font-family: "Metropolis";
46+
font-weight: 300;
47+
font-style: italic;
48+
src: url('<%= asset_path "spina/Metropolis-LightItalic.woff2" %>') format("woff2");
49+
}
50+
51+
@font-face {
52+
font-family: "Metropolis";
53+
font-weight: 500;
54+
src: url('<%= asset_path "spina/Metropolis-Medium.woff2" %>') format("woff2");
55+
}
56+
57+
@font-face {
58+
font-family: "Metropolis";
59+
font-weight: 500;
60+
font-style: italic;
61+
src: url('<%= asset_path "spina/Metropolis-MediumItalic.woff2" %>') format("woff2");
62+
}
63+
64+
@font-face {
65+
font-family: "Metropolis";
66+
font-weight: 600;
67+
src: url('<%= asset_path "spina/Metropolis-SemiBold.woff2" %>') format("woff2");
68+
}
69+
70+
@font-face {
71+
font-family: "Metropolis";
72+
font-weight: 600;
73+
font-style: italic;
74+
src: url('<%= asset_path "spina/Metropolis-SemiBoldItalic.woff2" %>') format("woff2");
75+
}
76+
77+
@font-face {
78+
font-family: "Metropolis";
79+
font-weight: 700;
80+
src: url('<%= asset_path "spina/Metropolis-Bold.woff2" %>') format("woff2");
81+
}
82+
83+
@font-face {
84+
font-family: "Metropolis";
85+
font-weight: 700;
86+
font-style: italic;
87+
src: url('<%= asset_path "spina/Metropolis-BoldItalic.woff2" %>') format("woff2");
88+
}
89+
90+
@font-face {
91+
font-family: "Metropolis";
92+
font-weight: 800;
93+
src: url('<%= asset_path "spina/Metropolis-ExtraBold.woff2" %>') format("woff2");
94+
}
95+
96+
@font-face {
97+
font-family: "Metropolis";
98+
font-weight: 800;
99+
font-style: italic;
100+
src: url('<%= asset_path "spina/Metropolis-ExtraBoldItalic.woff2" %>') format("woff2");
101+
}
102+
103+
@font-face {
104+
font-family: "Metropolis";
105+
font-weight: 900;
106+
src: url('<%= asset_path "spina/Metropolis-Black.woff2" %>') format("woff2");
107+
}
108+
109+
@font-face {
110+
font-family: "Metropolis";
111+
font-weight: 900;
112+
font-style: italic;
113+
src: url('<%= asset_path "spina/Metropolis-BlackItalic.woff2" %>') format("woff2");
114+
}

‎app/assets/stylesheets/spina/_fonts.scss‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎app/assets/stylesheets/spina/application.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*
2+
*= require spina/_animate
3+
*= require spina/_fonts
4+
*= require spina/_tailwind
5+
*= require_self
6+
*/

‎app/assets/stylesheets/spina/application.sass‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎app/views/layouts/spina/admin/application.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="icon" href="<%= image_url('spina/favicon.png') %>" />
1010

1111
<title>Spina CMS</title>
12-
12+
1313
<!-- Tailwind -->
1414
<%= stylesheet_link_tag 'spina/application', data: {turbolinks_track: true} %>
1515

‎lib/spina/engine.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require 'sass-rails'
21
require 'importmap-rails'
32
require 'turbo-rails'
43
require 'stimulus-rails'

‎spina.gemspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Gem::Specification.new do |gem|
3030
gem.add_dependency 'rails', '>= 6.0'
3131
gem.add_dependency 'pg'
3232
gem.add_dependency 'bcrypt'
33-
gem.add_dependency 'sass-rails'
3433
gem.add_dependency 'image_processing'
3534
gem.add_dependency 'ancestry'
3635
gem.add_dependency 'breadcrumbs_on_rails'

‎test/dummy/app/assets/stylesheets/demo/application.css‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
html {
2+
font-size: 16px;
3+
}
4+
5+
body {
6+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
7+
font-size: 1rem;
8+
line-height: 1.5;
9+
}
10+
11+
h1,
12+
h2,
13+
h3,
14+
h4,
15+
h5,
16+
h6 {
17+
margin-top: 0;
18+
margin-bottom: 0.5rem;
19+
}
20+
21+
h1 {
22+
font-size: 2.5rem;
23+
}
24+
25+
h2 {
26+
font-size: 2rem;
27+
}
28+
29+
h3 {
30+
font-size: 1.75rem;
31+
}
32+
33+
h4 {
34+
font-size: 1.5rem;
35+
}
36+
37+
h5 {
38+
font-size: 1.25rem;
39+
}
40+
41+
h6 {
42+
font-size: 1rem;
43+
}
44+
45+
p {
46+
margin-top: 0;
47+
margin-bottom: 1rem;
48+
}
49+
50+
ul,
51+
ol {
52+
margin-top: 0;
53+
margin-bottom: 1rem;
54+
}
55+
56+
img {
57+
vertical-align: middle;
58+
}
59+
60+
a {
61+
color: #0275d8;
62+
text-decoration: none;
63+
}
64+
65+
a:hover,
66+
a:focus {
67+
color: #014c8c;
68+
text-decoration: underline;
69+
}
70+
71+
.container {
72+
width: 960px;
73+
margin: 0 auto;
74+
}
75+
76+
.nav {
77+
padding-left: 0;
78+
margin-bottom: 2rem;
79+
list-style: none;
80+
}
81+
82+
.nav-item {
83+
display: inline-block;
84+
}
85+
86+
.nav-item+.nav-item {
87+
margin-left: 20px;
88+
}
89+
90+
.nav-item.active>a {
91+
text-decoration: underline;
92+
}
93+
94+
#languages {
95+
float: right;
96+
}

0 commit comments

Comments
 (0)