From bd626fccd6babb811db0a2bce886c569eeb3e012 Mon Sep 17 00:00:00 2001 From: Frankie B Date: Wed, 12 Jul 2023 15:06:44 +0100 Subject: [PATCH] Merge CSS into one file --- config/app.php | 2 +- public/css/dark.css | 77 ----------------- public/css/{global.css => master.css} | 105 ++++++++++++------------ resources/views/includes/head.blade.php | 3 +- 4 files changed, 55 insertions(+), 132 deletions(-) delete mode 100644 public/css/dark.css rename public/css/{global.css => master.css} (77%) diff --git a/config/app.php b/config/app.php index 5a81355..c27f3bb 100644 --- a/config/app.php +++ b/config/app.php @@ -17,7 +17,7 @@ */ 'name' => env('APP_NAME', 'diskfloppy.me'), - 'version' => '5.4', + 'version' => '5.4.1', /* |-------------------------------------------------------------------------- diff --git a/public/css/dark.css b/public/css/dark.css deleted file mode 100644 index 1eeaf43..0000000 --- a/public/css/dark.css +++ /dev/null @@ -1,77 +0,0 @@ -/* -This stylesheet contains only colors which are -different depending on theme. All other styles have -been moved to global.css and imported below. -*/ -@import url('global.css'); - -html { - color-scheme: dark; -} - -div.project pre { - border: 1px solid #666666 -} - -body { - color: #ddd; - background-color: #333; -} - -h1 { - color: #fff; -} - - -h2 { - color: #fff; -} - -h3 { - color: #fff; -} - -div.preview pre, div.project pre { - background-color: #222; - color: #ccc; -} - -a { - color: #99f; - text-decoration: none -} -.header { - color: #fff; -} - - -.header .pagetree { - color: #fff; -} - -.header .pagetree .title { - color: #fff -} - -/*table td { - border: 1px solid black -}*/ - - -/*table.skami { - border-color: #eeeeee -}*/ -table.skami .semiused { - color: #ccc; - background-color: #444; - border-color: #FFF; -} - -table.skami .unused { - color: #bbb; - background-color: #555 -} - -table { - border-color: #fff -} diff --git a/public/css/global.css b/public/css/master.css similarity index 77% rename from public/css/global.css rename to public/css/master.css index adae17c..bc0c796 100644 --- a/public/css/global.css +++ b/public/css/master.css @@ -1,11 +1,11 @@ -/* -This stylesheet contains all styles which are -the same across both themes. -*/ * { font-family: monospace; } +html { + color-scheme: dark; +} + ul { list-style-type: square; } @@ -16,30 +16,28 @@ table.banner { border: 2px solid #E04A38; background-color: #E6897E; width: 95%; - /* Passes both WCAG AA and WCAG AAA contrast tests */ + /* Passes both WCAG AD and WCAG AAA contrast tests */ color: #0F0F0F; } -td.banner { +table.banner td { padding: 5px; } -a.bannerlink { - color: #0F0F0F; +table.banner td a { + color: #0F0F0F; } -a.bannerlink:hover { +table.banner td a:hover { text-decoration: underline; } div.page { min-width: 700px; max-width: 1024px; - /*margin-left: 0.5em; - margin-right: 0.5em;*/ padding-left: 0.5em; padding-right: 0.5em; - margin: auto + margin: auto; } h1.inline { @@ -48,34 +46,20 @@ h1.inline { margin-top: 0em; clear: none; font-size: 100%; - display: inline + display: inline; } -h1.inline:before { - content: "" -} - -h1:before { - content: "> " -} - -h2:before { - content: ">> " -} - -h3:before { - content: ">>> " -} - -.toplinks span:after { - content: " >" -} +h1.inline:before { content: "" } +h1:before { content: "> " } +h2:before { content: ">> " } +h3:before { content: ">>> " } h1, h2, h3 { - font-family: Monospace; + font-family: monospace; font-weight: normal; margin-top: 1em; - clear: left + clear: left; + color: #FFFFFF; } img { @@ -85,13 +69,16 @@ img { img.right { float: right; - margin-left: 0.5em + margin-left: 0.5em; } -table.form, td.form { +table.form td { border: none; } +/* -------------------------------------------------------------------------- */ + + div.preview { display: inline-block; width: 30em; @@ -125,6 +112,15 @@ div.preview pre.small, div.project pre.small { overflow: hidden } +div.preview pre, div.project pre { + background-color: #222; + color: #ccc; +} + +div.project pre { + border: 1px solid #666666 +} + pre { display: inline; max-width: 95%; @@ -148,7 +144,8 @@ div.note { } table { - border-collapse: collapse + border-collapse: collapse; + border-color: #FFFFFF; } table.noborder td { @@ -254,7 +251,7 @@ table td { } td { - padding: 3px; + padding: 0px; vertical-align: top; } @@ -269,7 +266,12 @@ .header .pagetree { width: 100%; padding-top: 0.1em; padding-bottom: 0.1em; - border-top: 1px solid #cccccc + border-top: 1px solid #cccccc; + color: #FFFFFF; +} + +.header .pagetree .title { + color: #fff } .header { @@ -277,7 +279,8 @@ .header { font-weight: normal; padding-bottom: 0em; border-bottom: 1px solid #cccccc; - text-align: center + text-align: center; + color: #FFFFFF; } div.preview pre, div.project pre { @@ -287,22 +290,15 @@ div.preview pre, div.project pre { max-width: 90% } -h1 { - font-size: 150% -} - - -h2 { - font-size: 130% -} - -h3 { - font-size: 115% -} +h1 { font-size: 150% } +h2 { font-size: 130% } +h3 { font-size: 115% } body { font-family: sans-serif; margin: 0px; + color: #ddd; + background-color: #333; } table.computers { @@ -323,3 +319,8 @@ table.commits tr td { border: none; padding-right: 5px; } + +a { + color: #99f; + text-decoration: none +} diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php index cff286e..ef5d03f 100644 --- a/resources/views/includes/head.blade.php +++ b/resources/views/includes/head.blade.php @@ -3,7 +3,7 @@ - + @@ -12,4 +12,3 @@ -