Skip to content

Commit 803beb9

Browse files
authored
Fix CI (#88)
* Lock some dependencies; update tailwindcss build * Only lock to sqlite3 < 2.0 on Rails 7 versions
1 parent 54f5222 commit 803beb9

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
# Specify your gem's dependencies in showcase.gemspec.
55
gemspec
66

7-
gem "sqlite3"
8-
97
rails_version = ENV.fetch("RAILS_VERSION", "7")
108

119
rails_constraint = if rails_version == "main"
@@ -15,7 +13,9 @@ else
1513
end
1614

1715
gem "rails", rails_constraint
16+
gem "sqlite3", rails_version.start_with?("7") ? "< 2.0" : "> 2"
1817
gem "sprockets-rails"
18+
gem "tailwindcss-rails", "~> 2.3"
1919

2020
# Start debugger with binding.b [https://github.com/ruby/debug]
2121
# gem "debug", ">= 1.0.0"

app/assets/builds/showcase.css

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
/*
2-
! tailwindcss v3.2.7 | MIT License | https://tailwindcss.com
3-
*/
4-
5-
/*
6-
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
7-
2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
8-
*/
9-
10-
* {
11-
box-sizing: border-box;
12-
}
13-
14-
html {
15-
line-height: 1.5;
16-
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
17-
}
18-
19-
body {
20-
margin: 0;
21-
}
22-
23-
pre {
24-
margin: 0;
25-
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
26-
font-size: 1em;
27-
}
28-
291
*, ::before, ::after {
302
--tw-border-spacing-x: 0;
313
--tw-border-spacing-y: 0;
@@ -74,6 +46,10 @@ pre {
7446
--tw-backdrop-opacity: ;
7547
--tw-backdrop-saturate: ;
7648
--tw-backdrop-sepia: ;
49+
--tw-contain-size: ;
50+
--tw-contain-layout: ;
51+
--tw-contain-paint: ;
52+
--tw-contain-style: ;
7753
}
7854

7955
::backdrop {
@@ -124,6 +100,38 @@ pre {
124100
--tw-backdrop-opacity: ;
125101
--tw-backdrop-saturate: ;
126102
--tw-backdrop-sepia: ;
103+
--tw-contain-size: ;
104+
--tw-contain-layout: ;
105+
--tw-contain-paint: ;
106+
--tw-contain-style: ;
107+
}
108+
109+
/*
110+
! tailwindcss v3.2.7 | MIT License | https://tailwindcss.com
111+
*/
112+
113+
/*
114+
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
115+
2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
116+
*/
117+
118+
* {
119+
box-sizing: border-box;
120+
}
121+
122+
html {
123+
line-height: 1.5;
124+
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
125+
}
126+
127+
body {
128+
margin: 0;
129+
}
130+
131+
pre {
132+
margin: 0;
133+
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
134+
font-size: 1em;
127135
}
128136

129137
.sc-link {
@@ -487,38 +495,38 @@ pre {
487495
background-color: rgb(238 242 255 / var(--tw-bg-opacity));
488496
}
489497

490-
:is(.sc-dark .dark\:sc-block) {
498+
.dark\:sc-block:is(.sc-dark *) {
491499
display: block;
492500
}
493501

494-
:is(.sc-dark .dark\:sc-hidden) {
502+
.dark\:sc-hidden:is(.sc-dark *) {
495503
display: none;
496504
}
497505

498-
:is(.sc-dark .dark\:sc-bg-neutral-700\/50) {
506+
.dark\:sc-bg-neutral-700\/50:is(.sc-dark *) {
499507
background-color: rgb(64 64 64 / 0.5);
500508
}
501509

502-
:is(.sc-dark .dark\:sc-bg-neutral-800) {
510+
.dark\:sc-bg-neutral-800:is(.sc-dark *) {
503511
--tw-bg-opacity: 1;
504512
background-color: rgb(38 38 38 / var(--tw-bg-opacity));
505513
}
506514

507-
:is(.sc-dark .dark\:sc-bg-neutral-900) {
515+
.dark\:sc-bg-neutral-900:is(.sc-dark *) {
508516
--tw-bg-opacity: 1;
509517
background-color: rgb(23 23 23 / var(--tw-bg-opacity));
510518
}
511519

512-
:is(.sc-dark .dark\:sc-text-inherit) {
520+
.dark\:sc-text-inherit:is(.sc-dark *) {
513521
color: inherit;
514522
}
515523

516-
:is(.sc-dark .dark\:sc-text-white) {
524+
.dark\:sc-text-white:is(.sc-dark *) {
517525
--tw-text-opacity: 1;
518526
color: rgb(255 255 255 / var(--tw-text-opacity));
519527
}
520528

521-
:is(.sc-dark .dark\:hover\:sc-bg-neutral-700\/50:hover) {
529+
.dark\:hover\:sc-bg-neutral-700\/50:hover:is(.sc-dark *) {
522530
background-color: rgb(64 64 64 / 0.5);
523531
}
524532

0 commit comments

Comments
 (0)