Skip to content

Commit ea24c1b

Browse files
hsbthsbt
authored
Merge pull request #651 from ruby/claude/remove-dartsass-rails-dependency-ba256a
Remove dartsass-rails and importmap-rails
2 parents a0fa5ca + ef77425 commit ea24c1b

11 files changed

Lines changed: 119 additions & 229 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
db/*.sqlite3
33
log/*.log
44
tmp/
5-
.sass-cache/
65
.DS_Store
76
.rvmrc
87
*~
@@ -11,6 +10,3 @@ tmp/
1110
*.swp
1211
*.swo
1312
public/assets/
14-
15-
/app/assets/builds/*
16-
!/app/assets/builds/.keep

‎Gemfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 3.4.7'
55
gem 'rails', '~> 8.1'
66
gem 'puma'
77
gem 'bootsnap', require: false
8-
gem "importmap-rails"
98
gem "propshaft"
10-
gem "dartsass-rails"
119
gem 'aws-sdk-s3', '~> 1'
1210

1311
group :development, :test do

‎Gemfile.lock‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -102,48 +102,14 @@ GEM
102102
concurrent-ruby (1.3.7)
103103
connection_pool (3.0.2)
104104
crass (1.0.7)
105-
dartsass-rails (0.5.1)
106-
railties (>= 6.0.0)
107-
sass-embedded (~> 1.63)
108105
date (3.5.1)
109106
drb (2.2.3)
110107
erb (6.0.4)
111108
erubi (1.13.1)
112109
globalid (1.3.0)
113110
activesupport (>= 6.1)
114-
google-protobuf (4.34.1)
115-
bigdecimal
116-
rake (~> 13.3)
117-
google-protobuf (4.34.1-aarch64-linux-gnu)
118-
bigdecimal
119-
rake (~> 13.3)
120-
google-protobuf (4.34.1-aarch64-linux-musl)
121-
bigdecimal
122-
rake (~> 13.3)
123-
google-protobuf (4.34.1-arm64-darwin)
124-
bigdecimal
125-
rake (~> 13.3)
126-
google-protobuf (4.34.1-x86-linux-gnu)
127-
bigdecimal
128-
rake (~> 13.3)
129-
google-protobuf (4.34.1-x86-linux-musl)
130-
bigdecimal
131-
rake (~> 13.3)
132-
google-protobuf (4.34.1-x86_64-darwin)
133-
bigdecimal
134-
rake (~> 13.3)
135-
google-protobuf (4.34.1-x86_64-linux-gnu)
136-
bigdecimal
137-
rake (~> 13.3)
138-
google-protobuf (4.34.1-x86_64-linux-musl)
139-
bigdecimal
140-
rake (~> 13.3)
141111
i18n (1.14.8)
142112
concurrent-ruby (~> 1.0)
143-
importmap-rails (2.2.3)
144-
actionpack (>= 6.0.0)
145-
activesupport (>= 6.0.0)
146-
railties (>= 6.0.0)
147113
io-console (0.8.2)
148114
irb (1.17.0)
149115
pp (>= 0.6.0)
@@ -265,37 +231,6 @@ GEM
265231
tsort
266232
reline (0.6.3)
267233
io-console (~> 0.5)
268-
sass-embedded (1.98.0)
269-
google-protobuf (~> 4.31)
270-
rake (>= 13)
271-
sass-embedded (1.98.0-aarch64-linux-android)
272-
google-protobuf (~> 4.31)
273-
sass-embedded (1.98.0-aarch64-linux-gnu)
274-
google-protobuf (~> 4.31)
275-
sass-embedded (1.98.0-aarch64-linux-musl)
276-
google-protobuf (~> 4.31)
277-
sass-embedded (1.98.0-arm-linux-androideabi)
278-
google-protobuf (~> 4.31)
279-
sass-embedded (1.98.0-arm-linux-gnueabihf)
280-
google-protobuf (~> 4.31)
281-
sass-embedded (1.98.0-arm-linux-musleabihf)
282-
google-protobuf (~> 4.31)
283-
sass-embedded (1.98.0-arm64-darwin)
284-
google-protobuf (~> 4.31)
285-
sass-embedded (1.98.0-riscv64-linux-android)
286-
google-protobuf (~> 4.31)
287-
sass-embedded (1.98.0-riscv64-linux-gnu)
288-
google-protobuf (~> 4.31)
289-
sass-embedded (1.98.0-riscv64-linux-musl)
290-
google-protobuf (~> 4.31)
291-
sass-embedded (1.98.0-x86_64-darwin)
292-
google-protobuf (~> 4.31)
293-
sass-embedded (1.98.0-x86_64-linux-android)
294-
google-protobuf (~> 4.31)
295-
sass-embedded (1.98.0-x86_64-linux-gnu)
296-
google-protobuf (~> 4.31)
297-
sass-embedded (1.98.0-x86_64-linux-musl)
298-
google-protobuf (~> 4.31)
299234
securerandom (0.4.1)
300235
sqlite3 (2.9.5)
301236
mini_portile2 (~> 2.8.0)
@@ -352,8 +287,6 @@ PLATFORMS
352287
DEPENDENCIES
353288
aws-sdk-s3 (~> 1)
354289
bootsnap
355-
dartsass-rails
356-
importmap-rails
357290
pg
358291
propshaft
359292
puma

‎Procfile.dev‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
web: unset PORT && bin/rails server
2-
css: bin/rails dartsass:watch

‎app/assets/builds/.keep‎

Whitespace-only changes.

‎app/assets/stylesheets/application.css‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
body {
2+
padding-top: 50px;
3+
font-size: 13px;
4+
}
5+
6+
.container-fluid {
7+
max-width: 1200px;
8+
}
9+
10+
.navbar-nav > li > a, .navbar-brand {
11+
height: 28px;
12+
}
13+
14+
@media screen and (max-width: 767px) {
15+
.table-responsive-border {
16+
border: 1px solid #ddd;
17+
}
18+
.table-responsive-border > .table {
19+
margin-bottom: 0;
20+
}
21+
22+
.table-responsive {
23+
width: 100%;
24+
margin-bottom: 15px;
25+
overflow-y: hidden;
26+
}
27+
28+
.table-responsive > .table > thead > tr > th,
29+
.table-responsive > .table > thead > tr > td,
30+
.table-responsive > .table > tbody > tr > th,
31+
.table-responsive > .table > tbody > tr > td,
32+
.table-responsive > .table > tfoot > tr > th,
33+
.table-responsive > .table > tfoot > tr > td {
34+
white-space: nowrap;
35+
}
36+
37+
.table-responsive > .table-bordered {
38+
border: 0;
39+
}
40+
41+
.table-responsive > .table-bordered > thead > tr > th:first-child,
42+
.table-responsive > .table-bordered > thead > tr > td:first-child,
43+
.table-responsive > .table-bordered > tbody > tr > th:first-child,
44+
.table-responsive > .table-bordered > tbody > tr > td:first-child,
45+
.table-responsive > .table-bordered > tfoot > tr > th:first-child,
46+
.table-responsive > .table-bordered > tfoot > tr > td:first-child {
47+
border-left: 0;
48+
}
49+
50+
.table-responsive > .table-bordered > thead > tr > th:last-child,
51+
.table-responsive > .table-bordered > thead > tr > td:last-child,
52+
.table-responsive > .table-bordered > tbody > tr > th:last-child,
53+
.table-responsive > .table-bordered > tbody > tr > td:last-child,
54+
.table-responsive > .table-bordered > tfoot > tr > th:last-child,
55+
.table-responsive > .table-bordered > tfoot > tr > td:last-child {
56+
border-right: 0;
57+
}
58+
59+
.table-responsive > .table-bordered > tbody > tr:last-child > th,
60+
.table-responsive > .table-bordered > tbody > tr:last-child > td,
61+
.table-responsive > .table-bordered > tfoot > tr:last-child > th,
62+
.table-responsive > .table-bordered > tfoot > tr:last-child > td {
63+
border-bottom: 0;
64+
}
65+
}
66+
67+
table.reports th, table.reports td {
68+
padding: 1px !important;
69+
}
70+
71+
table.reports tr.branch-separator td {
72+
border-top: solid 2px black;
73+
}
74+
75+
table.reports tr td.datetime {
76+
text-align: center;
77+
}
78+
79+
table.reports tr td.branch {
80+
text-align: center;
81+
}
82+
83+
table.reports tr td.revision {
84+
font-family: Menlo, monospace;
85+
text-align: center;
86+
}
87+
88+
/* :where() keeps specificity at 0-1-1 so the later td.summary rules
89+
still win for the summary column, which falls in this range. */
90+
table.reports tr td:nth-child(n+6):where(:nth-child(-n+9)) {
91+
background-color: #FF9090;
92+
}
93+
94+
table.reports tr td:nth-child(n+6):where(:nth-child(-n+9)):empty {
95+
background-color: #F0FFF0;
96+
}
97+
98+
table.reports tr td.summary {
99+
background-color: #F0FFF0;
100+
}
101+
102+
table.reports tr td.summary div {
103+
overflow: hidden;
104+
white-space: nowrap;
105+
text-overflow: ellipsis;
106+
width: 250px !important;
107+
}
108+
109+
table.reports tr td.summary.failure {
110+
background-color: #FF9090;
111+
}
112+
113+
table.reports tr td.diff div {
114+
overflow: hidden;
115+
white-space: nowrap;
116+
text-overflow: ellipsis;
117+
width: 100px !important;
118+
}

‎app/assets/stylesheets/application.scss‎

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

‎app/javascript/application.js‎

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<!-- For all other devices -->
1010
<!-- Size should be 32 x 32 pixels -->
1111
<%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
12-
<%= stylesheet_link_tag "application", :media => "all" %>
13-
<%= javascript_importmap_tags %>
12+
<%= stylesheet_link_tag "bootstrap.min", "application", :media => "all" %>
1413
</head>
1514
<body>
1615

0 commit comments

Comments
 (0)