From: Hamatoma Date: Wed, 15 May 2024 22:05:00 +0000 (+0200) Subject: V 0.3.7 Farben / Design, front- backend X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=85b4b351e411427556cf34ef09d51be1560303a0;p=gadeku.git V 0.3.7 Farben / Design, front- backend - neues Schema: Purple - frontend/backend: - kein expliziter Import der bootstrap-Dateien (von Vite erledigt) - purple.css: Anpassungen --- diff --git a/CHANGELOG.md b/CHANGELOG.md index fa59242..f6e83dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# V 0.3.7 Farben / Design, front- backend + +## Added +- neues Schema: Purple +- frontend/backend: + - kein expliziter Import der bootstrap-Dateien (von Vite erledigt) +- purple.css: Anpassungen + # V 0.3.6 Farben ## Added diff --git a/composer.lock b/composer.lock index 118447f..ef700e6 100644 --- a/composer.lock +++ b/composer.lock @@ -1056,7 +1056,7 @@ "dist": { "type": "path", "url": "../laraknife", - "reference": "44cc14deda280e8fe91b0f524b15e3acbf9cf656" + "reference": "825fbc96aa19f8e838deef77f3a3b99f523c4340" }, "require-dev": { "phpunit/phpunit": "11.0.x-dev" diff --git a/public/css/purple.css b/public/css/purple.css index 2ae0af7..4ff3c9f 100644 --- a/public/css/purple.css +++ b/public/css/purple.css @@ -2,6 +2,11 @@ h1{ color: #143F4E; border-bottom: solid 0.1rem #143F4E; } h2{ color: #83163F; border-bottom: solid 0.1rem #83163F; } h3{ color: #477085 ; border-bottom: solid 0.1rem #477085; } +.lkn-text { + color: black; + background-color: white; + border: 0.15rem solid #143F4E; +} .lkn-text h4, .lkn-text h5{ color: #d86d0c; } /* Links */ @@ -11,21 +16,13 @@ h3{ color: #477085 ; border-bottom: solid 0.1rem #477085; } #lkn-header { background-color: #143F4E; color: white;} /* panels: */ .lkn-text-frame-background{ background-color: #e1d6ad !important } -.lkn-noform-frame, -.lkn-standard-panel, -.lkn-edit-panel, -.lkn-create-panel, -.lkn-show-panel, .lkn-panel, .lkn-nav-tab-panel, #main-content li.lkn-nav-item-active, .lkn-filter, -.lkn-fieldset, .lkn-form-table, .lkn-filter, -.lkn-fieldset, .lkn-form-table, -.lkn-text-frame, .lkn-header-frame, .lkn-pagination-block { @@ -43,9 +40,9 @@ a.lnk-overview-cell, a:visited.lkn-overview-cell, a:link.lkn-overview-cell, a:active.lkn-overview-cell { - border: 1px solid #83163F;; + border: 0.1rem solid #83163F;; color: #83163F;; - box-shadow: 0 0 5px 0 #e1d6ad; + box-shadow: 0 0 5px 0 #bf5c82; } .lkn-icon-as-link, a.lkn-overview-cell, @@ -95,8 +92,11 @@ a:active.lkn-overview-cell { .lkn-del { background-color: rgba(255, 166, 0, 0.418); } -button.bg-primary { - background-color: #83163F !important; +.lkn-button { + background-color: #83163F !important; + color: white; + border: 0.1rem solid #143F4E; + /*box-shadow: 0 0 0.3rem 0.3rem #888888;*/ } /* Links */ @@ -112,9 +112,9 @@ nav a:active, nav a:link, nav a:visited, nav a:any-link { } nav a:hover { color: rgba(255, 166, 0, 0.418); } /* Register tabs: */ -.page-link { color: black !important; background-color: #e1d6ad; } +.page-link { color: black !important; background-color: #c2b0a8; } .page-link.active, .active > .page-link { background-color: #477085; } -.page-item { color: black; background-color: #EEE; } +.page-item { color: black; background-color: #c2b0a8; } #main-content > div > h1, #main-content > div > h2 { color: #fdaf40; @@ -148,3 +148,7 @@ nav a:hover { color: rgba(255, 166, 0, 0.418); } } /* Icons: */ i.text-primary { color: #477085 !important; } + +.lkn-frame-indented { + border: solid 0.1rem #83163F; +} diff --git a/resources/views/layouts/backend.blade.php b/resources/views/layouts/backend.blade.php index 32d788c..407f4db 100644 --- a/resources/views/layouts/backend.blade.php +++ b/resources/views/layouts/backend.blade.php @@ -6,23 +6,12 @@ {{ config('app.name', 'Laravel') }} - - - @vite(['resources/sass/app.scss', 'resources/js/app.js']) - - - + diff --git a/resources/views/layouts/frontend.blade.php b/resources/views/layouts/frontend.blade.php index ada29e2..3f724ba 100644 --- a/resources/views/layouts/frontend.blade.php +++ b/resources/views/layouts/frontend.blade.php @@ -6,23 +6,12 @@ {{ config('app.name', 'Laravel') }} - - - @vite(['resources/sass/app.scss', 'resources/js/app.js']) - - - +