aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--public/css/colorschemes/catppuccin-macchiato.css12
-rw-r--r--public/css/master.css58
-rw-r--r--resources/views/includes/head.blade.php1
-rw-r--r--resources/views/includes/header.blade.php37
-rw-r--r--resources/views/pages/home.blade.php8
5 files changed, 70 insertions, 46 deletions
diff --git a/public/css/colorschemes/catppuccin-macchiato.css b/public/css/colorschemes/catppuccin-macchiato.css
new file mode 100644
index 0000000..3409b30
--- /dev/null
+++ b/public/css/colorschemes/catppuccin-macchiato.css
@@ -0,0 +1,12 @@
+:root {
+ --background: #181926;
+ --foreground: #cad3f5;
+ --links: #8aadf4;
+ --warning: #ff7272;
+ --warning-box-bg: #f64a3c;
+ --warning-box-border: #c81a11;
+}
+
+html {
+ color-scheme: dark;
+}
diff --git a/public/css/master.css b/public/css/master.css
index 0e13965..f0862ec 100644
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -1,8 +1,4 @@
-:root {
- --background: #181926;
- --foreground: #cad3f5;
- --links: #8aadf4;
-}
+/*@import "colorschemes/catppuccin-macchiato.css";*/
body {
font-family: sans-serif;
@@ -12,10 +8,6 @@ body {
text-align: left;
}
-html {
- color-scheme: dark;
-}
-
ul {
list-style-type: square;
}
@@ -59,7 +51,7 @@ table.form td {
div.code-block {
background-color: var(--background);
- border: 2px solid #dddddd;
+ border: 2px solid var(--foreground);
padding: 10px;
display: inline-block;
text-align: left;
@@ -79,7 +71,7 @@ div.code-block h1 {
}
div.code-block h1 small {
- color: #919191;
+ color: var(--foreground);
font-size: 12px;
}
@@ -88,7 +80,7 @@ div.code-block pre hr {
}
div.code-block pre code {
- background-color: #222;
+ background-color: var(--background);
}
pre {
@@ -101,16 +93,37 @@ pre {
text-decoration: none;
}
+.theme-selector {
+ text-align: right;
+ vertical-align: middle;
+}
+
+.nav-wrapper {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-template-rows: 1fr;
+ grid-column-gap: 0;
+ grid-row-gap: 0;
+}
+
+.theme-selector label {
+ font-weight: bold;
+}
+
+.theme-selector label::after {
+ content: ': ';
+}
+
nav {
margin-bottom: 0.3em;
text-align: left;
}
-nav div a img {
+nav img {
width: 32px;
}
-nav div h1 {
+nav h1 {
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
@@ -160,17 +173,8 @@ video {
max-width: 100%;
}
-.deprecated {
- line-height: 140%;
- width: 100%;
- color: #aa0000;
- text-align: center;
- padding-bottom: 0.5em;
- border-bottom: 2px dashed #aa0000;
-}
-
table td {
- border: 1px solid white;
+ border: 1px solid var(--foreground);
}
td {
@@ -238,7 +242,7 @@ table.gb-entry-form tr td label {
table.gb-entry-form tr td span.text-danger {
padding-left: 5px;
- color: rgb(255, 114, 114);
+ color: var(--warning);
}
table.gb-entry-form tr td textarea,
@@ -374,8 +378,8 @@ a:hover {
.error-box {
width: 500px;
- border: 5px solid #c81a11;
- background-color: #f64a3c;
+ border: 5px solid var(--warning-box-border);
+ background-color: var(--warning-box-bg);
padding: 5px;
}
.error-box a,
diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php
index 1191836..2a5ad6e 100644
--- a/resources/views/includes/head.blade.php
+++ b/resources/views/includes/head.blade.php
@@ -3,6 +3,7 @@
<meta property="og:type" content="website">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#333333">
+ <link rel="stylesheet" href="/css/colorschemes/catppuccin-macchiato.css" id="css-colorscheme"/>
<link rel="stylesheet" href="/css/master.css"/>
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"/>
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"/>
diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php
index 9a020d2..ee3d077 100644
--- a/resources/views/includes/header.blade.php
+++ b/resources/views/includes/header.blade.php
@@ -1,18 +1,25 @@
<nav>
- <div>
- <h1>diskfloppy.me | <strong>@yield('title')</strong></h1>
- <a href="/" title="Home"><img src="/images/icons/nav/home.png" alt="Home" width="32" height="32"></a>
- <a href="//git.diskfloppy.me/" title="cgit"><img src="/images/icons/nav/repo.png" alt="cgit" width="32" height="32"></a>
- <a href="/pub/" title="Public Files"><img src="/images/icons/nav/pubfiles.png" alt="Public Files" width="32" height="32"></a>
- <a href="/computers/" title="Computers"><img src="/images/icons/nav/computers.png" alt="Computers" width="32" height="32"></a>
- <a href="/bookmarks/" title="Bookmarks"><img src="/images/icons/nav/bookmarks.png" alt="Bookmarks" width="32" height="32"></a>
- <a href="/guestbook/" title="Guestbook"><img src="/images/icons/nav/guestbook.png" alt="Guestbook" width="32" height="32"></a>
- <!--<a href="/contact/" title="Contact"><img src="/images/icons/nav/mail.png" alt="Contact" width="32" height="32"></a>-->
- <a href="/weather/" title="Weather"><img src="/images/icons/nav/weather.png" alt="Weather" width="32" height="32"></a>
- <a href="/music/" title="Music"><img src="/images/icons/nav/music.png" alt="Music" width="32" height="32"></a>&nbsp;&nbsp;
- @if (auth()->check())
- <a href="/admin/">admin</a>
- ({{ auth()->user()->name }}) <a href="/logout">logout</a>
- @endif
+ <h1>diskfloppy.me | <strong>@yield('title')</strong></h1>
+ <div class="nav-wrapper">
+ <div>
+ <a href="/" title="Home"><img src="/images/icons/nav/home.png" alt="Home" width="32" height="32"></a>
+ <a href="//git.diskfloppy.me/" title="cgit"><img src="/images/icons/nav/repo.png" alt="cgit" width="32" height="32"></a>
+ <a href="/pub/" title="Public Files"><img src="/images/icons/nav/pubfiles.png" alt="Public Files" width="32" height="32"></a>
+ <a href="/computers/" title="Computers"><img src="/images/icons/nav/computers.png" alt="Computers" width="32" height="32"></a>
+ <a href="/bookmarks/" title="Bookmarks"><img src="/images/icons/nav/bookmarks.png" alt="Bookmarks" width="32" height="32"></a>
+ <a href="/guestbook/" title="Guestbook"><img src="/images/icons/nav/guestbook.png" alt="Guestbook" width="32" height="32"></a>
+ <!--<a href="/contact/" title="Contact"><img src="/images/icons/nav/mail.png" alt="Contact" width="32" height="32"></a>-->
+ <a href="/weather/" title="Weather"><img src="/images/icons/nav/weather.png" alt="Weather" width="32" height="32"></a>
+ <a href="/music/" title="Music"><img src="/images/icons/nav/music.png" alt="Music" width="32" height="32"></a>&nbsp;&nbsp;
+ </div>
+ <div class="theme-selector">
+ <form>
+ <label for="theme">Theme</label>
+ <select name="theme" id="theme-selector" onmousedown="this.value='';" onchange="swapTheme(this.value);">
+ <option value="catppuccin-macchiato">Catppuccin Macchiato</option>
+ <option value="blind-yourself">blind yourself</option>
+ </select>
+ </form>
+ </div>
</div>
</nav>
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 9be0baf..b5fd55a 100644
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -6,7 +6,7 @@
<table class="info-table">
<caption>
- <h1>Fun Facts</h1>
+ <h2>Fun Facts</h2>
<hr>
</caption>
<tr>
@@ -29,7 +29,7 @@
<table class="info-table">
<caption>
- <h1>Interests</h1>
+ <h2>Interests</h2>
<hr>
</caption>
<tr>
@@ -49,7 +49,7 @@
<table class="info-table">
<caption>
- <h1>Contact &amp; social</h1>
+ <h2>Contact &amp; social</h2>
<hr>
</caption>
<tr>
@@ -73,7 +73,7 @@
<table class="info-table">
<caption>
- <h1>niko</h1>
+ <h2>niko</h2>
<hr>
</caption>
<tr>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-01 04:45:27 +0000