Skip to content

Commit 67ed14c

Browse files
JacobCoffeeJacobCoffee
authored
Merge pull request #12 from JacobCoffee/experiment_with_static_files
2 parents 3e594df + cbf9ebc commit 67ed14c

5 files changed

Lines changed: 23 additions & 125 deletions

File tree

‎app/domain/web/resources/style.css‎

Lines changed: 17 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -785,14 +785,6 @@ select {
785785
pointer-events: none;
786786
}
787787

788-
.visible {
789-
visibility: visible;
790-
}
791-
792-
.collapse {
793-
visibility: collapse;
794-
}
795-
796788
.fixed {
797789
position: fixed;
798790
}
@@ -893,14 +885,6 @@ select {
893885
margin-top: 2rem;
894886
}
895887

896-
.mr-3 {
897-
margin-right: 0.75rem;
898-
}
899-
900-
.mr-1 {
901-
margin-right: 0.25rem;
902-
}
903-
904888
.block {
905889
display: block;
906890
}
@@ -941,6 +925,10 @@ select {
941925
height: 1rem;
942926
}
943927

928+
.h-5 {
929+
height: 1.25rem;
930+
}
931+
944932
.h-6 {
945933
height: 1.5rem;
946934
}
@@ -957,14 +945,6 @@ select {
957945
height: 100%;
958946
}
959947

960-
.h-2 {
961-
height: 0.5rem;
962-
}
963-
964-
.h-5 {
965-
height: 1.25rem;
966-
}
967-
968948
.min-h-full {
969949
min-height: 100%;
970950
}
@@ -973,6 +953,10 @@ select {
973953
width: 1rem;
974954
}
975955

956+
.w-5 {
957+
width: 1.25rem;
958+
}
959+
976960
.w-56 {
977961
width: 14rem;
978962
}
@@ -989,22 +973,6 @@ select {
989973
width: 100%;
990974
}
991975

992-
.w-8 {
993-
width: 2rem;
994-
}
995-
996-
.w-2 {
997-
width: 0.5rem;
998-
}
999-
1000-
.w-7 {
1001-
width: 1.75rem;
1002-
}
1003-
1004-
.w-5 {
1005-
width: 1.25rem;
1006-
}
1007-
1008976
.min-w-full {
1009977
min-width: 100%;
1010978
}
@@ -1219,23 +1187,6 @@ select {
12191187
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
12201188
}
12211189

1222-
.bg-blue-700 {
1223-
--tw-bg-opacity: 1;
1224-
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
1225-
}
1226-
1227-
.fill-blue-600 {
1228-
fill: #2563eb;
1229-
}
1230-
1231-
.fill-gray-600 {
1232-
fill: #4b5563;
1233-
}
1234-
1235-
.fill-neutral-600 {
1236-
fill: #525252;
1237-
}
1238-
12391190
.fill-neutral-900 {
12401191
fill: #171717;
12411192
}
@@ -1310,16 +1261,6 @@ select {
13101261
padding-bottom: 1.5rem;
13111262
}
13121263

1313-
.px-5 {
1314-
padding-left: 1.25rem;
1315-
padding-right: 1.25rem;
1316-
}
1317-
1318-
.py-2\.5 {
1319-
padding-top: 0.625rem;
1320-
padding-bottom: 0.625rem;
1321-
}
1322-
13231264
.pb-12 {
13241265
padding-bottom: 3rem;
13251266
}
@@ -1352,10 +1293,6 @@ select {
13521293
text-align: left;
13531294
}
13541295

1355-
.text-center {
1356-
text-align: center;
1357-
}
1358-
13591296
.font-mono {
13601297
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
13611298
"Liberation Mono", "Courier New", monospace;
@@ -1415,6 +1352,11 @@ select {
14151352
color: rgb(29 78 216 / var(--tw-text-opacity));
14161353
}
14171354

1355+
.text-gray-200 {
1356+
--tw-text-opacity: 1;
1357+
color: rgb(229 231 235 / var(--tw-text-opacity));
1358+
}
1359+
14181360
.text-gray-400 {
14191361
--tw-text-opacity: 1;
14201362
color: rgb(156 163 175 / var(--tw-text-opacity));
@@ -1454,11 +1396,6 @@ select {
14541396
color: rgb(255 255 255 / var(--tw-text-opacity));
14551397
}
14561398

1457-
.text-gray-200 {
1458-
--tw-text-opacity: 1;
1459-
color: rgb(229 231 235 / var(--tw-text-opacity));
1460-
}
1461-
14621399
.antialiased {
14631400
-webkit-font-smoothing: antialiased;
14641401
-moz-osx-font-smoothing: grayscale;
@@ -1574,11 +1511,6 @@ select {
15741511
background-color: rgb(239 68 68 / var(--tw-bg-opacity));
15751512
}
15761513

1577-
.hover\:bg-blue-800:hover {
1578-
--tw-bg-opacity: 1;
1579-
background-color: rgb(30 64 175 / var(--tw-bg-opacity));
1580-
}
1581-
15821514
.hover\:text-blue-900:hover {
15831515
--tw-text-opacity: 1;
15841516
color: rgb(30 58 138 / var(--tw-text-opacity));
@@ -1617,15 +1549,6 @@ select {
16171549
var(--tw-shadow, 0 0 #0000);
16181550
}
16191551

1620-
.focus\:ring-4:focus {
1621-
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
1622-
var(--tw-ring-offset-width) var(--tw-ring-offset-color);
1623-
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0
1624-
calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);
1625-
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
1626-
var(--tw-shadow, 0 0 #0000);
1627-
}
1628-
16291552
.focus\:ring-inset:focus {
16301553
--tw-ring-inset: inset;
16311554
}
@@ -1635,11 +1558,6 @@ select {
16351558
--tw-ring-color: rgb(96 165 250 / var(--tw-ring-opacity));
16361559
}
16371560

1638-
.focus\:ring-blue-300:focus {
1639-
--tw-ring-opacity: 1;
1640-
--tw-ring-color: rgb(147 197 253 / var(--tw-ring-opacity));
1641-
}
1642-
16431561
.focus\:ring-offset-2:focus {
16441562
--tw-ring-offset-width: 2px;
16451563
}
@@ -1697,11 +1615,6 @@ select {
16971615
background-color: rgb(10 10 10 / var(--tw-bg-opacity));
16981616
}
16991617

1700-
:is(.dark .dark\:bg-blue-600) {
1701-
--tw-bg-opacity: 1;
1702-
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
1703-
}
1704-
17051618
:is(.dark .dark\:fill-gray-300) {
17061619
fill: #d1d5db;
17071620
}
@@ -1730,24 +1643,14 @@ select {
17301643
color: rgb(212 212 212 / var(--tw-text-opacity));
17311644
}
17321645

1733-
:is(.dark .dark\:text-white) {
1734-
--tw-text-opacity: 1;
1735-
color: rgb(255 255 255 / var(--tw-text-opacity));
1736-
}
1737-
1738-
:is(.dark .dark\:text-gray-600) {
1739-
--tw-text-opacity: 1;
1740-
color: rgb(75 85 99 / var(--tw-text-opacity));
1741-
}
1742-
1743-
:is(.dark .dark\:text-neutral-600) {
1646+
:is(.dark .dark\:text-neutral-900) {
17441647
--tw-text-opacity: 1;
1745-
color: rgb(82 82 82 / var(--tw-text-opacity));
1648+
color: rgb(23 23 23 / var(--tw-text-opacity));
17461649
}
17471650

1748-
:is(.dark .dark\:text-neutral-900) {
1651+
:is(.dark .dark\:text-white) {
17491652
--tw-text-opacity: 1;
1750-
color: rgb(23 23 23 / var(--tw-text-opacity));
1653+
color: rgb(255 255 255 / var(--tw-text-opacity));
17511654
}
17521655

17531656
:is(.dark .dark\:placeholder-neutral-500)::-moz-placeholder {
@@ -1770,11 +1673,6 @@ select {
17701673
--tw-ring-color: rgb(30 64 175 / var(--tw-ring-opacity));
17711674
}
17721675

1773-
:is(.dark .dark\:hover\:bg-blue-700:hover) {
1774-
--tw-bg-opacity: 1;
1775-
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
1776-
}
1777-
17781676
:is(.dark .dark\:hover\:text-blue-500:hover) {
17791677
--tw-text-opacity: 1;
17801678
color: rgb(59 130 246 / var(--tw-text-opacity));

‎app/domain/web/templates/base/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
name="viewport"
88
content="width=device-width, initial-scale=1.0, maximum-scale=1.0"
99
/>
10-
<link rel="stylesheet" href="/static/style.css" />
10+
<link rel="stylesheet" href="static/style.css" />
1111
<title>{% block title %}{% endblock %} {{ title }}</title>
1212

13-
<link rel="icon" href="/static/badge.png" type="image/x-icon" />
13+
<link rel="icon" href="static/badge.png" type="image/x-icon" />
1414

1515
{% block extrahead %}{% endblock %} {% block extrastyle %}{% endblock %}
1616
</head>

‎app/domain/web/templates/base/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<h2 id="footer-heading" class="sr-only">Footer</h2>
99
<div class="mx-auto max-w-7xl px-6 pb-8 pt-8 sm:pt-12 lg:px-8 lg:pt-16">
1010
<div class="xl:grid xl:grid-cols-3 xl:gap-8">
11-
<img class="h-7" src="/static/badge.png" alt="NIAPI" />
11+
<img class="h-7" src="static/badge.png" alt="NIAPI" />
1212
<div class="mt-16 grid grid-cols-2 gap-8 xl:col-span-2 xl:mt-0">
1313
<div class="md:grid md:grid-cols-2 md:gap-8">
1414
<div>

‎app/domain/web/templates/base/nav.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</div>
7979
<a href="#" class="-m-1.5 p-1.5">
8080
<span class="sr-only">NIAPI</span>
81-
<img class="h-8 w-auto" src="/static/badge.png" alt="" />
81+
<img class="h-8 w-auto" src="static/badge.png" alt="" />
8282
</a>
8383

8484
<div class="flex flex-1 justify-end">
@@ -234,7 +234,7 @@
234234
</div>
235235
<a href="#" class="-m-1.5 p-1.5">
236236
<span class="sr-only">NIAPI Company</span>
237-
<img class="h-8 w-auto" src="/static/badge.png" alt="" />
237+
<img class="h-8 w-auto" src="static/badge.png" alt="" />
238238
</a>
239239
<div class="flex flex-1 justify-end">
240240
<a

‎app/lib/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
DEFAULT_MODULE_NAME = "app"
3232
BASE_DIR: Final = utils.module_to_os_path(DEFAULT_MODULE_NAME)
33-
STATIC_DIR = Path(BASE_DIR / "domain" / "web" / "public")
33+
STATIC_DIR = Path(BASE_DIR / "domain" / "web" / "resources")
3434
TEMPLATES_DIR = Path(BASE_DIR / "domain" / "web" / "templates")
3535

3636

0 commit comments

Comments
 (0)