V 0.3.8 Design

- green.css, standard.css

- frontend: id bei Logout-Button
- purple.css: Korrekturen

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6e83dd3f83797704be2386974195004b845972c..29895132e22a811a0e37346fa2205cb11d5aee2f 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# V 0.3.8 Design
+
+## Added
+- green.css, standard.css
+
+## Changed
+- frontend: id bei Logout-Button
+- purple.css: Korrekturen
+
 # V 0.3.7 Farben / Design, front- backend
 
 ## Added

diff --git a/composer.lock b/composer.lock
index ef700e62f681e50015e493a57b5cae3149052286..064d4fa3af015b1e2c5a9f7c49692d4cc4864697 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1056,7 +1056,7 @@
             "dist": {
                 "type": "path",
                 "url": "../laraknife",
-                "reference": "825fbc96aa19f8e838deef77f3a3b99f523c4340"
+                "reference": "f7daed6efc1d2a40b8f16884a2dbfdb5e6343def"
             },
             "require-dev": {
                 "phpunit/phpunit": "11.0.x-dev"
@@ -6190,16 +6190,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.11",
+            "version": "1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                 "shasum": ""
             },
             "require": {
@@ -6269,7 +6269,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-03-21T18:34:15+00:00"
+            "time": "2024-05-16T03:13:13+00:00"
         },
         {
             "name": "myclabs/deep-copy",

diff --git a/public/css/green.css b/public/css/green.css
new file mode 100644 (file)
index 0000000..026cfe1
--- /dev/null
+++ b/public/css/green.css
@@ -0,0 +1,159 @@
+/* purple colors: head: 143F4E icons: 83163F shadow: 888888 panel: c2b0a8 link: 477085 info: 9D8C84 */
+/* green colors: head: 1C191A icons: 5D8967 shadow: 9D8C84 panel: DDDFE0 link: 8CB094 info: F6C9CA */
+.lkn-text-info {color: #5D8967;} 
+
+/* headlines: */
+h1{ color: #1C191A; border-bottom: solid 0.1rem #1C191A; }
+h2{ color: #5D8967; border-bottom: solid 0.1rem #5D8967; }
+h3{ color: #8CB094 ; border-bottom: solid 0.1rem #8CB094; }
+h4{ color: #F6C9CA ; border-bottom: solid 0.1rem #F6C9CA; }
+.lkn-text { 
+    color: black;
+    background-color: white;
+    border: 0.15rem solid #1C191A;
+}
+/* Links */
+
+/* chapter headline */
+#main-content h1 { border: none; }
+/* top menu */
+#lkn-header {    background-color: #1C191A;    color: white;}
+/* panels: */
+.lkn-text-frame-background{ background-color: #e1d6ad !important }
+.lkn-panel,
+.lkn-nav-tab-panel,
+#main-content li.lkn-nav-item-active,
+.lkn-filter,
+.lkn-form-table,
+.lkn-filter,
+.lkn-form-table,
+.lkn-header-frame,
+.lkn-pagination-block
+{
+    background-color: #DDDFE0;
+}
+.lkn-page-item.active .lkn-page-link {
+    background-color: #e1d6ad;
+    border-color: #e1d6ad;
+}
+.lkn-field-error {
+    color: red;
+}
+/* overview page */
+a.lnk-overview-cell,
+a:visited.lkn-overview-cell,
+a:link.lkn-overview-cell,
+a:active.lkn-overview-cell {
+    border: 0.25rem solid #F6C9CA;;
+    color: #5D8967;;
+    box-shadow: 0 0 5px 0 #74ab80;
+}
+.lkn-icon-as-link,
+a.lkn-overview-cell,
+a:visited.lkn-overview-cell,
+a:link.lkn-overview-cell,
+a:active.lkn-overview-cell {
+    background-color: #EEE;
+    color: #5D8967;;
+}
+.lkn-overview-cell h2 {
+    border: none;
+}
+#main-content .nav-item {
+    background-color: #EEE;
+}
+.lkn-text-info {color: #5D8967;} 
+.lkn-text-info2 {color: #F6C9CA;}
+.lkn-text-info3 {color: #1C191A;}
+.lkn-text-info4 {color: #8CB094;}
+.lkn-filter {
+    background: #DDDFE0;
+}
+.lkn-text-error {
+    color: red;
+    background-color: yellow;
+}
+.lkn-text-warning {
+    color: green;
+    background-color: yellow;
+}
+.lkn-text-important {
+    color: red;
+}
+.lkn-text-tagged {
+    background-color: rgba(255, 166, 0, 0.418);
+}
+.lkn-text-tagged2 {
+    background-color: yellow;
+}
+.lkn-header-frame h1, .text-header-frame h2, .text-header-frame h3 {
+    color: whitesmoke;
+    background-color: #fdaf40;
+}
+.lkn-ins {
+    background-color: lightblue;
+}
+.lkn-del {
+    background-color: rgba(255, 166, 0, 0.418);
+}
+.lkn-button {
+  background-color: #5D8967 !important;
+  color: white;
+  border: 0.1rem solid #1C191A;
+  /* box-shadow: 0 0 0.3rem 0.3rem #74ab80; */
+}
+/* Links */
+
+a, a:active, a:link, a:visited, a:any-link { 
+    color: #8CB094; }
+a:hover { 
+        color: black; }
+a.nav-item, a:active.nav-item, a:link.nav-item, a:visited.nav-item, a:any-link.nav-item { 
+    color: blue; }
+a:hover.nav-item { color: black; }
+nav a:active, nav a:link, nav a:visited, nav a:any-link {
+    color: white;
+}
+nav a:hover { color: rgba(255, 166, 0, 0.418); }
+/* Register tabs: */
+.page-link { color: black !important; background-color: #DDDFE0; }
+.page-link.active, .active > .page-link { color: white !important; background-color: #8CB094; }
+.page-item { color: black; background-color: #DDDFE0; }
+
+#main-content > div > h1, #main-content > div > h2 {
+    color: #fdaf40;
+    background-color: rgba(240, 240, 240, 0.75);
+}
+#main-content .nav-link {
+    color: black;
+}
+#main-content .nav-link-item{
+    background-color: #e1d6ad;
+}
+#main-content .nav-link:hover {
+    color: white;
+}
+#main-content .nav-link.lkn-nav-item-active {
+    color: blue !important;
+}
+#main-content nav-item.lkn-nav-item-active {
+    background-color: whitesmoke !important;
+}
+#main-content .nav-item {
+    border-bottom-color: black !important;
+}
+
+#lkn-header .nav-link, #lkn-header .nav-item { color: white; font-weight: bolder;}
+
+#main-content .nav-tabs.nav-link { background-color: #e1d6ad !important; }
+
+#lkn-btn-logout {
+    background-color: #5D8967;
+}
+/* Icons: */
+i.text-primary { color: #8CB094 !important; }
+
+.lkn-frame-indented {
+    border: solid 0.1rem #5D8967;
+}
+

diff --git a/public/css/purple.css b/public/css/purple.css
index 4ff3c9f2343bf4aa27ecbc6187c49a98c4627fc0..0a7a3df16be152dee8f4749f1590178e9e169bde 100644 (file)
--- a/public/css/purple.css
+++ b/public/css/purple.css
@@ -1,13 +1,16 @@
+/* purple colors: head: 143F4E icons: 83163F shadow: 888888 panel: c2b0a8 link: 477085 info: 9D8C84 */
+.lkn-text-info {color: #83163F;} 
+
 /* headlines: */
 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; }
+h4{ color: #9D8C84 ; border-bottom: solid 0.1rem #9D8C84; }
 .lkn-text { 
     color: black;
     background-color: white;
     border: 0.15rem solid #143F4E;
 }
-.lkn-text h4, .lkn-text h5{ color: #d86d0c; }
 /* Links */
 
 /* chapter headline */
@@ -23,10 +26,15 @@ h3{ color: #477085 ; border-bottom: solid 0.1rem #477085; }
 .lkn-form-table,
 .lkn-filter,
 .lkn-form-table,
-.lkn-header-frame,
+.lkn-header-frame
+{
+    background-color: #c2b0a8;
+    border: 0.2rem solid #143F4E;
+}
 .lkn-pagination-block
 {
     background-color: #c2b0a8;
+    border: none;
 }
 .lkn-page-item.active .lkn-page-link {
     background-color: #e1d6ad;
@@ -40,7 +48,7 @@ a.lnk-overview-cell,
 a:visited.lkn-overview-cell,
 a:link.lkn-overview-cell,
 a:active.lkn-overview-cell {
-    border: 0.1rem solid #83163F;;
+    border: 0.2rem solid #83163F;;
     color: #83163F;;
     box-shadow: 0 0 5px 0 #bf5c82;
 }
@@ -113,7 +121,7 @@ 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: #c2b0a8; }
-.page-link.active, .active > .page-link { background-color: #477085; }
+.page-link.active, .active > .page-link { color: white !important; background-color: #477085; }
 .page-item { color: black; background-color: #c2b0a8; }
 
 #main-content > div > h1, #main-content > div > h2 {

diff --git a/public/css/standard.css b/public/css/standard.css
new file mode 100644 (file)
index 0000000..b315796
--- /dev/null
+++ b/public/css/standard.css
@@ -0,0 +1,160 @@
+/* purple colors: head: 143F4E icons: 83163F shadow: 888888 panel: c2b0a8 link: 477085 info: 9D8C84 */
+/* standard colors: head: 36449E icons: blue shadow: aliceblue panel: aliceblue link: blue info: green */
+.lkn-text-info {color: blue;} 
+
+/* headlines: */
+h1{ color: #36449E; border-bottom: solid 0.1rem #bf5c82; }
+h2{ color: blue; border-bottom: solid 0.1rem blue; }
+h3{ color: green ; border-bottom: solid 0.1rem green; }
+h4{ color: green ; border-bottom: solid 0.1rem green; }
+.lkn-text { 
+    color: black;
+    background-color: white;
+    border: 0.15rem solid #36449E;
+}
+/* Links */
+
+/* chapter headline */
+#main-content h1 { border: none; color: #bf5c82; }
+/* top menu */
+#lkn-header {    background-color: #36449E;    color: white;}
+/* panels: */
+.lkn-text-frame-background{ background-color: #e1d6ad !important }
+.lkn-panel,
+.lkn-nav-tab-panel,
+#main-content li.lkn-nav-item-active,
+.lkn-filter,
+.lkn-form-table,
+.lkn-filter,
+.lkn-form-table,
+.lkn-header-frame,
+.lkn-pagination-block
+{
+    background-color: aliceblue;
+}
+.lkn-page-item.active .lkn-page-link {
+    background-color: #e1d6ad;
+    border-color: #e1d6ad;
+}
+.lkn-field-error {
+    color: red;
+}
+/* overview page */
+a.lnk-overview-cell,
+a:visited.lkn-overview-cell,
+a:link.lkn-overview-cell,
+a:active.lkn-overview-cell {
+    border: 0.25rem solid #bf5c82;
+    color: blue;;
+    /*box-shadow: 0 0 5px 0 #bf5c82;*/
+}
+.lkn-icon-as-link,
+a.lkn-overview-cell,
+a:visited.lkn-overview-cell,
+a:link.lkn-overview-cell,
+a:active.lkn-overview-cell {
+    background-color: #EEE;
+    color: blue;;
+}
+.lkn-overview-cell h2 {
+    color: #bf5c82;
+    border: none;
+}
+#main-content .nav-item {
+    background-color: #EEE;
+}
+.lkn-text-info {color: blue;} 
+.lkn-text-info2 {color: #green;}
+.lkn-text-info3 {color: #36449E;}
+.lkn-text-info4 {color: blue;}
+.lkn-filter {
+    background: aliceblue;
+}
+.lkn-text-error {
+    color: red;
+    background-color: yellow;
+}
+.lkn-text-warning {
+    color: green;
+    background-color: yellow;
+}
+.lkn-text-important {
+    color: red;
+}
+.lkn-text-tagged {
+    background-color: rgba(255, 166, 0, 0.418);
+}
+.lkn-text-tagged2 {
+    background-color: yellow;
+}
+.lkn-header-frame h1, .text-header-frame h2, .text-header-frame h3 {
+    color: whitesmoke;
+    background-color: #fdaf40;
+}
+.lkn-ins {
+    background-color: lightblue;
+}
+.lkn-del {
+    background-color: rgba(255, 166, 0, 0.418);
+}
+.lkn-button {
+  background-color: blue !important;
+  color: white;
+  border: 0.1rem solid #36449E;
+  box-shadow: 0 0 0.3rem 0.3rem aliceblue;
+}
+/* Links */
+
+a, a:active, a:link, a:visited, a:any-link { 
+    color: blue; }
+a:hover { 
+        color: black; }
+a.nav-item, a:active.nav-item, a:link.nav-item, a:visited.nav-item, a:any-link.nav-item { 
+    color: blue; }
+a:hover.nav-item { color: black; }
+nav a:active, nav a:link, nav a:visited, nav a:any-link {
+    color: white;
+}
+nav a:hover { color: rgba(255, 166, 0, 0.418); }
+/* Register tabs: */
+.page-link { color: black !important; background-color: aliceblue; }
+.page-link.active, .active > .page-link { color: white !important; background-color: blue; }
+.page-item { color: black; background-color: aliceblue; }
+
+#main-content > div > h1, #main-content > div > h2 {
+    color: #fdaf40;
+    background-color: rgba(240, 240, 240, 0.75);
+}
+#main-content .nav-link {
+    color: black;
+}
+#main-content .nav-link-item{
+    background-color: #e1d6ad;
+}
+#main-content .nav-link:hover {
+    color: white;
+}
+#main-content .nav-link.lkn-nav-item-active {
+    color: blue !important;
+}
+#main-content nav-item.lkn-nav-item-active {
+    background-color: whitesmoke !important;
+}
+#main-content .nav-item {
+    border-bottom-color: black !important;
+}
+
+#lkn-header .nav-link, #lkn-header .nav-item { color: white; font-weight: bolder;}
+
+#main-content .nav-tabs.nav-link { background-color: #e1d6ad !important; }
+
+#lkn-btn-logout {
+    background-color: #bf5c82 !important;
+}
+/* Icons: */
+i.text-primary { color: blue !important; }
+
+.lkn-frame-indented {
+    border: solid 0.1rem blue;
+}
+

diff --git a/resources/views/layouts/frontend.blade.php b/resources/views/layouts/frontend.blade.php
index 3f724ba0f2c60fe69fb390d104e15fbd0b7eb110..6fce63aa1dd81fa611f237be0299f3cf55e00edf 100644 (file)
--- a/resources/views/layouts/frontend.blade.php
+++ b/resources/views/layouts/frontend.blade.php
@@ -42,7 +42,7 @@
                         <a class="nav-link" href="/user-edit-current">{{ session('userName') }}</a>
                     </li>
                     @endauth
-                    <li class="nav-item border rounded-3">
+                    <li id="lkn-btn-logout" class="nav-item border rounded-3">
                         <a class="nav-link" href="/user-logout">{{ __('Logout')  }}</a>
                     </li>
                 </ul>