From cb0c32e0956cb97f78994b856489c5340fb182ca Mon Sep 17 00:00:00 2001 From: Karl Date: Wed, 5 Oct 2016 08:24:42 +0200 Subject: [PATCH 1/4] =?UTF-8?q?WiP:=20Erste=20Entw=C3=BCrfe=20f=C3=BCr=20e?= =?UTF-8?q?in=20neues=20dunkles=20Layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 9 +- public/css/theme.css.php | 5 +- public/css/themeDark.css | 213 ++++++++++++++++++ resources/views/layouts/resultPage.blade.php | 3 +- resources/views/layouts/staticPages.blade.php | 5 +- resources/views/quicktip.blade.php | 3 + 6 files changed, 225 insertions(+), 13 deletions(-) create mode 100644 public/css/themeDark.css diff --git a/public/css/style.css b/public/css/style.css index ab51f618..41df5f7f 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -295,7 +295,7 @@ By Class margin-top: 20px; padding: 10px 20px; margin-bottom: 0; - background-color: white; + /*! background-color: white; */ -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); @@ -639,13 +639,8 @@ nav h1 { white-space: nowrap; } -header nav a { - text-decoration: none; - color: rgb(119, 119, 119); -} - body > div { - background-color: transparent; + /*! background-color: transparent; */ padding-top: 70px; } diff --git a/public/css/theme.css.php b/public/css/theme.css.php index 6b51fd22..4aa847d5 100644 --- a/public/css/theme.css.php +++ b/public/css/theme.css.php @@ -57,7 +57,4 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] .lSPrev > span, .lSNext > span { color: ; -} - - - +} \ No newline at end of file diff --git a/public/css/themeDark.css b/public/css/themeDark.css new file mode 100644 index 00000000..facc63f7 --- /dev/null +++ b/public/css/themeDark.css @@ -0,0 +1,213 @@ +* { + background-color: #505050; + color: antiquewhite; +} + +a { + color: #aaaaff; +} + +#foki input:checked + label{ + background-color: #909090; +} + +.navbar { + border-bottom: 3px solid #707070; + box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2); +} + +.navbar li a { + color: antiquewhite !important; +} + +.navbar-default .navbar-nav > .active > a { + background-color: #909090!important; +} + +.btn-default { + background-color: #909090; + border-color: transparent; + color: antiquewhite; +} + +.form-control { + background-color: #909090; + border-color: #909090; + color: antiquewhite; +} + +.dropdown-menu { + background-color: #505050; +} + +.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover { + background-color: #909090; +} + +.caret { + background-color: transparent; +} + +.input-group-addon { + background-color: #909090; + border: 1px solid #909090; +} + +#moreInformation ul li { + color: antiquewhite; +} + +#moreInformation h2 { + color: antiquewhite; +} + +.mutelink { + color: antiquewhite +} + +div#right { + background-color: #606060; +} + +div#right h3 { + background-color: #606060; +} + +div#right p { + background-color: #606060; +} + +#foki { + background-color: #505050; +} + +.tab-content { + background-color: #505050; +} + +.content-wrapper { + background-color: #505050; +} + +.nav-tabs { + border-bottom: none; +} + +#foki li.active a { + background-color: #505050; +} + +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { + border: none; +} + +pre { + background-color: #505050; + border: 1px solid antiquewhite; +} + +.alert-warning { + background-color: #8B8B60; + color: #3D3D30; + border-color: #979750; +} + +.well { + background-color: #606060; + border-color: #909090; +} + +.panel-default > .panel-heading { + color: antiquewhite; + background-color: #707070; + border-color: #909090; +} + +.panel-title { + color: antiquewhite; + background-color: #707070; +} + +.form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */ + color: #404040; +} + +.form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ + color: #404040; + opacity: 1; +} + +.form-control::-moz-placeholder { /* Mozilla Firefox 19+ */ + color: #404040; + opacity: 1; +} + +.form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: #404040; +} + +.navbar-default .navbar-collapse { + border-color: #505050; +} + +.navbar-default { + background-color: #505050; + border-radius: 0; +} + + + + + + + + + + + +/* Aus der theme.css */ + +body{ + background-color: #505050; + background-attachment: fixed; +} + +body#resultBody{ + background-image: inherit; +} + + +input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus, .form-control:focus { + outline-color: #c0c0c0; + -webkit-box-shadow: 0px 0px 2px 2px #c0c0c0; + -moz-box-shadow: 0px 0px 2px 2px #c0c0c0; + box-shadow: 0px 0px 2px 2pxc0c0c0; + border: 1px solid #c0c0c0; +} + +#mglogo > a { + background-image: linear-gradient(#909090 0%, #909090 250%); + background-color: transparent; + color: antiquewhite; +} + +.logo h1{ + color: antiquewhite; +} + +.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus{ + background-color: #909; + border-color: #909; +} + +.pagination > li > a, .pagination > li > span{ + color: #909; +} + +.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus{ + color: #909; +} + +.lSPrev > span, .lSNext > span { + color: #909; +} diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php index b8a19899..5588283d 100644 --- a/resources/views/layouts/resultPage.blade.php +++ b/resources/views/layouts/resultPage.blade.php @@ -21,7 +21,8 @@ @endif - + + @if( !isset($suspendheader) ) diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index d656954b..84233e88 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -26,7 +26,10 @@ @endif @endif - + + + + diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php index 892d2bc0..4d8282b7 100644 --- a/resources/views/quicktip.blade.php +++ b/resources/views/quicktip.blade.php @@ -4,6 +4,9 @@ + + + @if( $spruch !== "" )
{!! $spruch !!}
-- GitLab From 4c33b48784f5827d63edd142366a110e2b27f94b Mon Sep 17 00:00:00 2001 From: Karl Date: Wed, 5 Oct 2016 09:23:26 +0200 Subject: [PATCH 2/4] Weitere Verbesserungen am neuen Design --- public/css/themeDark.css | 120 +++++++++++++++++++++++++++++++-------- 1 file changed, 96 insertions(+), 24 deletions(-) diff --git a/public/css/themeDark.css b/public/css/themeDark.css index facc63f7..0c37aebc 100644 --- a/public/css/themeDark.css +++ b/public/css/themeDark.css @@ -4,14 +4,16 @@ } a { - color: #aaaaff; + color: #90a0f0; } #foki input:checked + label{ - background-color: #909090; + background-color: #707070; } .navbar { + background-color: #505050; + border-color: #505050; border-bottom: 3px solid #707070; box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2); } @@ -21,17 +23,17 @@ a { } .navbar-default .navbar-nav > .active > a { - background-color: #909090!important; + background-color: #707070!important; } .btn-default { - background-color: #909090; + background-color: #707070; border-color: transparent; color: antiquewhite; } .form-control { - background-color: #909090; + background-color: #707070; border-color: #909090; color: antiquewhite; } @@ -41,7 +43,7 @@ a { } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover { - background-color: #909090; + background-color: #707070; } .caret { @@ -49,7 +51,7 @@ a { } .input-group-addon { - background-color: #909090; + background-color: #707070; border: 1px solid #909090; } @@ -117,12 +119,6 @@ pre { border-color: #909090; } -.panel-default > .panel-heading { - color: antiquewhite; - background-color: #707070; - border-color: #909090; -} - .panel-title { color: antiquewhite; background-color: #707070; @@ -138,7 +134,7 @@ pre { } .form-control::-moz-placeholder { /* Mozilla Firefox 19+ */ - color: #404040; + color: antiquewhite; opacity: 1; } @@ -146,19 +142,95 @@ pre { color: #404040; } -.navbar-default .navbar-collapse { - border-color: #505050; +.panel-default { + border-color: #909090; } -.navbar-default { - background-color: #505050; - border-radius: 0; +.panel-default > .panel-heading { + color: antiquewhite; + background-color: #707070; + border-color: #909090; } +/* Result Page */ + +.result .description { + color: antiquewhite; + font-size: 16px; +} +/* +a:link, a:visited { + color: #90a0f0; +} +*/ +.result:not(.ad) .hoster { + font-size: 14px; + color: #b0b0b0; +} +.result:not(.ad) .hoster a { + color: #b0b0b0; +} +.result > .number { + color: burlywood !important; /* Wird normalerweise inline gesetzt */ +} + +.result .title { + color: burlywood; + font-size: 18px; +} + +.pager li > a, .pager li > span { + background-color: #909090; + border-color: #c0c0c0; + color: antiquewhite; +} + +.pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { + color: antiquewhite; + background-color: #909090; +} + +footer a { + color: antiquewhite !important; +} + +.quicktip { + font-family: Georgia, "Times New Roman", Palatino, Times, serif; + color: antiquewhite; + border-color: #909090; + font-size: 16px; +} + +.btn-default:focus, .btn-default.focus, .btn-default:hover, .btn-default:active { + color: antiquewhite; + background-color: #909090; + border-color: #909090; +} + +a:hover { + cursor: pointer; + color: #6771AB; +} + +.text-muted { + color: #b0b0b0; +} + +.result.ad .description { + color: #95cf5e; +} + +.result.ad .title { + color: #95cf5e; +} + +.result.ad .hoster { + color: #95cf5e; +} @@ -178,15 +250,15 @@ body#resultBody{ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus, .form-control:focus { - outline-color: #c0c0c0; - -webkit-box-shadow: 0px 0px 2px 2px #c0c0c0; - -moz-box-shadow: 0px 0px 2px 2px #c0c0c0; - box-shadow: 0px 0px 2px 2pxc0c0c0; + outline-color: #909090; + -webkit-box-shadow: 0px 0px 2px 2px #909090; + -moz-box-shadow: 0px 0px 2px 2px #909090; + box-shadow: 0px 0px 2px 2px909090; border: 1px solid #c0c0c0; } #mglogo > a { - background-image: linear-gradient(#909090 0%, #909090 250%); + background-image: linear-gradient(#707070 0%, #707070 250%); background-color: transparent; color: antiquewhite; } -- GitLab From c4680ffa0e0a08f6dd084bca82179c03c9eaac5f Mon Sep 17 00:00:00 2001 From: Karl Date: Thu, 6 Oct 2016 10:46:35 +0200 Subject: [PATCH 3/4] Das erste alternative Design ist jetzt soweit fertig. --- public/css/themeDark.css | 144 +++++++++++++------- resources/views/index.blade.php | 6 +- resources/views/widget/sitesearch.blade.php | 7 +- resources/views/widget/widget.blade.php | 4 +- 4 files changed, 103 insertions(+), 58 deletions(-) diff --git a/public/css/themeDark.css b/public/css/themeDark.css index 0c37aebc..edd53669 100644 --- a/public/css/themeDark.css +++ b/public/css/themeDark.css @@ -3,10 +3,12 @@ color: antiquewhite; } -a { - color: #90a0f0; +a, a:link, a:visited { + color: #f5a25c; + text-decoration: none; } + #foki input:checked + label{ background-color: #707070; } @@ -23,16 +25,10 @@ a { } .navbar-default .navbar-nav > .active > a { - background-color: #707070!important; + background-color: #707070 !important; } .btn-default { - background-color: #707070; - border-color: transparent; - color: antiquewhite; -} - -.form-control { background-color: #707070; border-color: #909090; color: antiquewhite; @@ -63,8 +59,8 @@ a { color: antiquewhite; } -.mutelink { - color: antiquewhite +a:link.mutelink, a:visited.mutelink{ + color: antiquewhite; } div#right { @@ -83,6 +79,11 @@ div#right p { background-color: #505050; } +#foki input + label:hover { + cursor: pointer; + background-color: #707070; +} + .tab-content { background-color: #505050; } @@ -95,10 +96,6 @@ div#right p { border-bottom: none; } -#foki li.active a { - background-color: #505050; -} - .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { border: none; } @@ -109,8 +106,8 @@ pre { } .alert-warning { - background-color: #8B8B60; - color: #3D3D30; + background-color: #656433; + color: antiquewhite; border-color: #979750; } @@ -124,12 +121,18 @@ pre { background-color: #707070; } +.form-control { + background-color: #707070; + border-color: #909090; + color: antiquewhite; +} + .form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */ - color: #404040; + color: #antiquewhite; } .form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ - color: #404040; + color: #antiquewhite; opacity: 1; } @@ -139,7 +142,7 @@ pre { } .form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */ - color: #404040; + color: #antiquewhite; } .panel-default { @@ -152,6 +155,18 @@ pre { border-color: #909090; } +.btn-primary { + color: antiquewhite; + background-color: #6C7233; + border-color: #4D4D14; +} + +.btn-danger { + color: antiquewhite; + background-color: #b07534; + border-color: #68491c; +} + /* Result Page */ .result .description { @@ -159,11 +174,17 @@ pre { font-size: 16px; } -/* -a:link, a:visited { - color: #90a0f0; +.result.ad .description { + color: #8ccf55; +} + +.result.ad .title { + color: #63b715; +} + +.resultInformation .link a:link, .resultInformation .link a:visited { + color: #f5a25c; } -*/ .result:not(.ad) .hoster { font-size: 14px; @@ -179,19 +200,23 @@ a:link, a:visited { } .result .title { - color: burlywood; + color: #e18d20; font-size: 18px; } .pager li > a, .pager li > span { - background-color: #909090; - border-color: #c0c0c0; + background-color: #707070; + border-color: #909090; color: antiquewhite; } +.pager li > a:hover { + background-color: #909090; +} + .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: antiquewhite; - background-color: #909090; + background-color: #707070; } footer a { @@ -213,29 +238,61 @@ footer a { a:hover { cursor: pointer; - color: #6771AB; + color: #9c6232; } .text-muted { color: #b0b0b0; } -.result.ad .description { - color: #95cf5e; +.alert-danger, .alert-danger a, .alert-danger ul, .alert-danger li { + background-color: #707070; + border-color: #909090; } -.result.ad .title { - color: #95cf5e; +.result.ad .hoster { + color: #b0b0b0; } -.result.ad .hoster { - color: #95cf5e; +.nav > li > a:hover, .nav > li > a:focus { + text-decoration: none; + background-color: #707070; +} + +#searchplugin > div > a { + color: antiquewhite; + background-color: #707070; + border-color: #909090; +} + +#searchplugin div { + background-color: #656433; +} + +#foki li.active a { + background-color: #707070; } +#foki li.active a span { + background-color: #707070; +} +#foki li.active a:hover span { + background-color: #707070; +} +#foki li a:hover { + border-color: #909090; + border: none; +} +#foki li a:hover span { + background-color: #707070; +} +.glyphicon-search { + background-color: transparent; +} /* Aus der theme.css */ @@ -266,20 +323,3 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] .logo h1{ color: antiquewhite; } - -.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus{ - background-color: #909; - border-color: #909; -} - -.pagination > li > a, .pagination > li > span{ - color: #909; -} - -.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus{ - color: #909; -} - -.lSPrev > span, .lSNext > span { - color: #909; -} diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 84e30eb7..603b4fa2 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -149,7 +149,7 @@