Skip to content

Commit 8f18cec

Browse files
tchoutritchoutri
authored
[NO-ISSUE] Remove last @apply from Tailwind (#550)
* [NO-ISSUE] Remove last @apply from Tailwind * Add changelog entry
1 parent ae6a1f2 commit 8f18cec

File tree

14 files changed

+102
-106
lines changed

14 files changed

+102
-106
lines changed

‎.github/workflows/setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-
55
sudo apt -y update
66
sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm
77

8-
wget https://github.com/souffle-lang/souffle/releases/download/2.3/x86_64-ubuntu-2004-souffle-2.3-Linux.deb
9-
sudo dpkg -i ./x86_64-ubuntu-2004-souffle-2.3-Linux.deb
8+
wget https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb
9+
sudo dpkg -i ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ design/node_modules
3838
_build/cabal-store
3939
storage/
4040
cabal.project.release.freeze
41+
prlog

‎assets/css/1-core/1-core.css

+3-16
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,19 @@ body {
1111
}
1212

1313
.container {
14-
width: auto;
14+
width: calc(100% - 2rem);
1515
max-width: 1300px;
16-
padding-right: 15px;
17-
padding-left: 15px;
16+
padding-right: 1rem;
17+
padding-left: 1rem;
1818
margin-right: auto;
1919
margin-left: auto;
2020
}
2121

2222
.container-small {
23-
margin-right: auto;
24-
margin-left: auto;
25-
padding-right: 1rem;
26-
padding-left: 1rem;
2723
max-width: 28rem;
28-
width: calc(100% - 2rem);
2924
}
3025

3126
a {
3227
text-decoration: none;
3328
color: var(--link-color);
3429
}
35-
36-
.larger-container {
37-
margin-left: auto;
38-
margin-right: auto;
39-
max-width: 80rem;
40-
padding-left: 0.5rem;
41-
padding-right: 0.5rem;
42-
}

‎assets/css/2-components/1-navbar.css

+10-4
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,18 @@
7979
}
8080

8181
.navbar-search {
82-
@apply rounded-full w-full mr-3 pl-3 py-1 px-1;
83-
@apply leading-tight focus:outline-none border border-2;
84-
82+
background-color: var(--navbar-search-background-color);
8583
border-color: var(--navbar-search-border-color);
84+
border-radius: 9999px;
85+
border-width: 2px;
8686
color: var(--navbar-search-color);
87-
background-color: var(--navbar-search-background-color);
87+
line-height: 1.25;
88+
margin-right: 0.75rem;
89+
padding-bottom: 0.25rem;
90+
padding-left: 0.75rem;
91+
padding-right: 0.25rem;
92+
padding-top: 0.25rem;
93+
width: 100%;
8894
}
8995

9096
.navbar-search:focus {

‎assets/css/2-components/10-error.css

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
.error {
2+
margin-left: auto;
3+
margin-right: auto;
4+
max-width: max-content;
5+
padding-top: 6rem;
6+
text-wrap: nowrap;
7+
}
8+
9+
p.error-zone {
10+
display: flex;
11+
flex-flow: row wrap;
12+
color: var(--error-code);
13+
14+
> * {
15+
font-size: 3rem;
16+
font-weight: 800;
17+
line-height: 1;
18+
letter-spacing: -0.025rem;
19+
}
20+
}
21+
22+
.error-code {
23+
color: var(--error-code);
24+
font-size: 3rem;
25+
line-height: 1;
26+
font-weight: 800;
27+
border-color: rgb(229 231 235 / var(--tw-border-opacity));
28+
border-right-width: 1px;
29+
margin-right: 1.5rem;
30+
padding-right: 1.5rem;
31+
}
32+
33+
.error-message {
34+
color: var(--error-code);
35+
font-size: 3rem;
36+
font-weight: 800;
37+
letter-spacing: -0.025rem;
38+
line-height: 1;
39+
}
40+
41+
.error-page-button {
42+
background-color: var(--error-button);
43+
border-color: transparent;
44+
margin-top: 2.5rem;
45+
}

‎assets/css/3-screens/1-package/1-package.css

+27-22
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,22 @@
5050
justify-content: center;
5151
display: grid;
5252
grid-template-columns: 25% 1fr 25%;
53-
grid-gap: 10px;
53+
gap: 10px;
5454

55-
a {
56-
font-weight: 500;
55+
> * {
56+
grid-row-start: 1;
5757
}
5858

59-
.maintainer-info {
60-
font-weight: 500;
61-
flex-wrap: wrap;
59+
.package-left-column {
60+
grid-column: 1 / 2;
6261
}
6362

64-
.package-body-section {
65-
font-size: 1.5rem;
66-
line-height: 2rem;
67-
margin-bottom: 0.5rem;
63+
.release-readme-column {
64+
grid-column: 2 / 3;
6865
}
6966

7067
.package-right-column {
71-
order: 3;
68+
grid-column: 3 / 4;
7269
}
7370

7471
.package-right-rows {
@@ -80,10 +77,6 @@
8077
margin-bottom: 1.25rem;
8178
}
8279

83-
.package-left-column {
84-
order: 1;
85-
}
86-
8780
.package-left-rows {
8881
position: sticky;
8982
top: 7rem;
@@ -93,6 +86,21 @@
9386
margin-bottom: 1.25rem;
9487
}
9588

89+
a {
90+
font-weight: 500;
91+
}
92+
93+
.maintainer-info {
94+
font-weight: 500;
95+
flex-wrap: wrap;
96+
}
97+
98+
.package-body-section {
99+
font-size: 1.5rem;
100+
line-height: 2rem;
101+
margin-bottom: 0.5rem;
102+
}
103+
96104
.package-flags-section {
97105
display: inline;
98106
}
@@ -272,23 +280,20 @@ a.breadcrumb-segment:hover {
272280

273281
@media (max-width: 47rem) {
274282
.package-body {
275-
grid-template-columns: repeat(1, 1fr);
283+
grid-template-columns: 1fr;
276284

277-
.package-left-column {
278-
order: 1;
285+
> *:nth-child(n) {
286+
grid-row-start: auto;
287+
grid-column: 1 / 2;
279288
}
280289

281290
.package-right-column {
282-
order: 2;
283-
284291
.package-right-rows .dependents {
285292
margin-bottom: 2rem;
286293
}
287294
}
288295

289296
.release-readme-column {
290-
order: 3;
291-
grid-column: 1;
292297
overflow: auto;
293298
}
294299
}

‎assets/css/3-screens/1-package/3-release-readme.css

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
.release-readme-column {
2-
margin: 0 2em;
3-
flex-basis: 40rem;
4-
order: 2;
5-
min-width: 75%;
6-
}
7-
81
.release-readme {
92
overflow-wrap: break-word;
103
box-sizing: border-box;

‎assets/css/3-screens/3-about.css

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/* stylelint-disable declaration-block-no-redundant-longhand-properties */
33

44
.about-page {
5-
margin-left: auto;
6-
margin-right: auto;
7-
max-width: 1000px;
8-
padding-bottom: 4rem;
9-
padding-left: 2rem;
10-
padding-right: 2rem;
11-
padding-top: 6rem;
12-
width: auto;
13-
145
h3 {
156
font-weight: 700;
167
font-size: 1.25rem;

‎assets/css/styles.css

+1-19
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@import "2-components/7-button.css";
1414
@import "2-components/8-alert.css";
1515
@import "2-components/9-terminal-icon.css";
16+
@import "2-components/10-error.css";
1617

1718
@import "3-screens/1-package/1-package.css";
1819
@import "3-screens/1-package/2-release-changelog.css";
@@ -217,25 +218,6 @@
217218
display: none;
218219
}
219220

220-
.error-code {
221-
color: var(--error-code);
222-
font-size: 3rem;
223-
line-height: 1;
224-
font-weight: 800;
225-
}
226-
227-
.error-message {
228-
letter-spacing: -0.025rem;
229-
font-weight: 800;
230-
font-size: 3rem;
231-
line-height: 1;
232-
color: var(--error-code);
233-
}
234-
235-
.error-page-button {
236-
background-color: var(--error-button);
237-
}
238-
239221
/* Dark mode-specific rules */
240222
.dark {
241223
.social-button:hover {

‎changelog.d/550

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
synopsis: Remove the last @apply from tailwind
2+
prs: #550
3+
issues: #0

‎prlog

-12
This file was deleted.

‎src/web/FloraWeb/Pages/Templates/Error.hs

+6-11
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,9 @@ web404 session = do
4949

5050
showError :: Status -> FloraHTML
5151
showError status = do
52-
div_ [class_ "px-4 py-2 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8"] $
53-
div_ [class_ "max-w-max mx-auto"] $
54-
main_ [class_ "sm:flex"] $ do
55-
p_ [class_ "error-code"] $ toHtml $ show $ statusCode status
56-
div_ [class_ "sm:ml-6"] $ do
57-
div_ [class_ "sm:border-l sm:border-gray-200 sm:pl-6"] $ do
58-
h1_ [class_ "text-5xl error-message"] $
59-
toHtml $
60-
statusMessage status
61-
div_ [class_ "mt-10 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6"] $ do
62-
a_ [href_ "/", class_ "inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm dark:text-gray-100 text-gray-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 error-page-button"] "Go back home"
52+
section_ [class_ "error container"] $ do
53+
p_ [class_ "error-zone"] $ do
54+
span_ [class_ "error-code"] $ toHtml $ show $ statusCode status
55+
span_ [class_ "error-message"] $ toHtml $ statusMessage status
56+
button_ [class_ "mt-10 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6"] $ do
57+
a_ [href_ "/", class_ "button error-page-button"] "Go back home"

‎src/web/FloraWeb/Pages/Templates/Screens/Home.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import FloraWeb.Pages.Templates.Types
1515
show :: FloraHTML
1616
show = do
1717
banner
18-
div_ [class_ "container-small"] $ do
18+
div_ [class_ "container container-small"] $ do
1919
mainSearchBar
2020
buttons
2121

@@ -40,7 +40,7 @@ buttons =
4040
about :: FloraHTML
4141
about = do
4242
TemplateEnv{environment} <- ask
43-
div_ [class_ "about-page"] $ do
43+
div_ [class_ "container about-page"] $ do
4444
div_ [class_ "divider about-page__banner"] $ do
4545
p_ [class_ "about-page__title"] "Flora.pm"
4646
p_ [class_ "about-page__subtitle"] "An index for the Haskell ecosystem"

‎src/web/FloraWeb/Pages/Templates/Screens/Packages.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ showPackage
5555
dependencies
5656
numberOfDependencies
5757
categories =
58-
div_ [class_ "larger-container"] $ do
58+
div_ [class_ "container"] $ do
5959
presentationHeader latestRelease namespace name latestRelease.synopsis
6060
packageBody
6161
package
@@ -113,7 +113,6 @@ packageBody
113113
displayMaintainer maintainer
114114
displayLinks namespace packageName packageIndexURL latestRelease
115115
displayVersions namespace packageName packageReleases numberOfReleases
116-
div_ [class_ "release-readme-column"] $ div_ [class_ "release-readme"] $ displayReadme latestRelease
117116
div_ [class_ "package-right-column"] $ ul_ [class_ "package-right-rows"] $ do
118117
case deprecationInfo of
119118
Just inFavourOf -> displayPackageDeprecation inFavourOf
@@ -125,6 +124,7 @@ packageBody
125124
displayDependencies (namespace, packageName, version) numberOfDependencies dependencies
126125
displayDependents (namespace, packageName) numberOfDependents dependents
127126
displayPackageFlags flags
127+
div_ [class_ "release-readme-column"] $ div_ [class_ "release-readme"] $ displayReadme latestRelease
128128

129129
getLatestViableRelease
130130
:: Namespace

0 commit comments

Comments
 (0)