Skip to content
Snippets Groups Projects
Commit 64959710 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Aufgegeben

parent 61a047e3
Branches
No related tags found
1 merge request!1348Resolve "Styles auf Seiten aufteilen"
Hide whitespace changes
Inline Side-by-side
Showing
with 181 additions and 149 deletions
resources/assets/less/default.less deleted 100644 → 0
+ 0
− 4
View file @ 61a047e3
@import "./font-awesome/fontawesome.less";
@import "./font-awesome/solid.less";
@import "./bootstrap/bootstrap.less";
@import "./metager/metager.less";
\ No newline at end of file
resources/assets/less/metager.less 0 → 100644
+ 4
− 0
View file @ 64959710
@import "./metager/variables.less";
@import "./metager/cards.less";
@import "./metager/general.less";
@import "./metager/specific.less";
\ No newline at end of file
resources/assets/less/metager/aufruf-winter.less
+ 6
− 4
View file @ 64959710
/* Winter-Spendenaufruf */
@import "./variables.less";
@import "./cards.less";
@base-aufruf-winter-color: #ab2121;
@base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
//
@aufruf-winter-a-normal-or-visited: @base-aufruf-winter-color;
@aufruf-winter-aufruf-action-btn-color: @base-aufruf-winter-btn-color!important;
@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-color!important;
@aufruf-winter-aufruf-action-btn-color: @base-aufruf-winter-btn-color !important;
@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-color !important;
@aufruf-winter-aufruf-action-btn-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important;
@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important;
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color !important;
.aufruf-winter {
h1 {
font-size: 32px;
......
resources/assets/less/metager/footer.less
+ 2
− 0
View file @ 64959710
/* Footer bar with logos and general links */
@import "./variables.less";
@import "./cards.less";
footer {
padding: 5px 5px 15px 5px;
width: 100%;
......
resources/assets/less/metager/general.less
+ 2
− 15
View file @ 64959710
@import "./helpers.less";
/* Default Font */
body {
......@@ -103,14 +104,6 @@ a {
/* Logo */
.logo {
color: @metager-orange;
font-family: Arimo, Liberation Sans, sans-serif;
font-style: italic;
font-weight: bold;
white-space: nowrap;
}
#startpage-logo {
.logo;
display: flex;
......@@ -288,12 +281,6 @@ summary {
cursor: not-allowed !important;
}
.overflow-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Button */
button {
......@@ -326,4 +313,4 @@ li.nodot {
// Used on labels which initiate visual change (e.g. open-sidebar-button)
.navigation-element {
cursor: pointer;
}
}
\ No newline at end of file
resources/assets/less/metager/helpers.less 0 → 100644
+ 13
− 0
View file @ 64959710
.overflow-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.logo {
color: @metager-orange;
font-family: Arimo, Liberation Sans, sans-serif;
font-style: italic;
font-weight: bold;
white-space: nowrap;
}
\ No newline at end of file
resources/assets/less/metager/metager.less
+ 0
− 4
View file @ 64959710
@import "./general.less";
@import "./specific.less";
@import "./result-page.less";
@import "./start-page.less";
@import "./settings.less";
@import "./variables.less";
@import "./sidebar.less";
@import "./modals.less";
@import "./footer.less";
@import "./searchbar.less";
@import "./aufruf-winter.less";
@import "./cards.less";
@import "./widget.less";
\ No newline at end of file
resources/assets/less/metager/modals.less
+ 82
− 86
View file @ 64959710
/* Rund ums Fokus Modal */
@import "./variables.less";
@import "./cards.less";
#show-create-focus:checked {
& + #create-focus-modal {
position: fixed;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
&+#create-focus-modal {
position: fixed;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
}
#plugin-modal-checkbox:checked {
& + #plugin-modal {
display: block;
}
&+#plugin-modal {
display: block;
}
}
.metager-modal {
display: none;
position: absolute;
top: 0;
right: 0;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
min-height: 100%;
width: 100%;
background: -webkit-gradient(
linear,
left top,
left bottom,
from(rgba(0, 0, 0, 0.7)),
to(rgba(0, 0, 0, 0.7))
);
background: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7));
z-index: 150;
.metager-modal-dialog {
background-color: white;
max-width: 700px;
margin: 30px auto;
height: 90vh;
overflow-y: auto;
.metager-modal-content {
.metager-modal-header {
padding: 15px;
position: relative;
border-bottom: 1px solid #e5e5e5;
.close-metager-modal {
position: absolute;
right: 15px;
&::after {
font-size: 24px;
content: "×";
}
}
}
#toggle-dropdowns-label {
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.focus-dropdown-toggle {
display: none;
&:not(:checked) {
& ~ .focus-dropdown-label ~ .row {
max-height: 0px;
overflow: hidden;
}
}
&:checked {
& ~ .focus-dropdown-label::after {
content: " ➖ ";
}
display: none;
position: absolute;
top: 0;
right: 0;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
min-height: 100%;
width: 100%;
background: -webkit-gradient( linear, left top, left bottom, from(rgba(0, 0, 0, 0.7)), to(rgba(0, 0, 0, 0.7)));
background: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7));
z-index: 150;
.metager-modal-dialog {
background-color: white;
max-width: 700px;
margin: 30px auto;
height: 90vh;
overflow-y: auto;
.metager-modal-content {
.metager-modal-header {
padding: 15px;
position: relative;
border-bottom: 1px solid #e5e5e5;
.close-metager-modal {
position: absolute;
right: 15px;
&::after {
font-size: 24px;
content: "×";
}
}
}
#toggle-dropdowns-label {
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.focus-dropdown-toggle {
display: none;
&:not(:checked) {
&~.focus-dropdown-label~.row {
max-height: 0px;
overflow: hidden;
}
}
&:checked {
&~.focus-dropdown-label::after {
content: " ➖ ";
}
}
}
.focus-dropdown-label {
cursor: pointer;
&::after {
font-size: 16px;
content: " ➕ ";
margin-left: 3px;
vertical-align: middle;
}
&~.row {
-webkit-transition: max-height 0.4s ease;
/* Chrome 1-25, Safari 3.2+ */
/* Firefox 4-15 */
/* Opera 10.50–12.00 */
transition: max-height 0.4s ease;
max-height: 400px;
}
}
}
}
.focus-dropdown-label {
cursor: pointer;
&::after {
font-size: 16px;
content: " ➕ ";
margin-left: 3px;
vertical-align: middle;
}
& ~ .row {
-webkit-transition: max-height 0.4s ease;
/* Chrome 1-25, Safari 3.2+ */
/* Firefox 4-15 */
/* Opera 10.50–12.00 */
transition: max-height 0.4s ease;
max-height: 400px;
}
}
}
}
}
}
\ No newline at end of file
resources/assets/less/metager/result-page.less
+ 3
− 30
View file @ 64959710
/* Ergebnisseite */
@import "./variables.less";
@import "./cards.less";
@import "./helpers.less";
@import "./quicktips.less";
@import "./result-saver.less";
@import "./result.less";
@import "./product.less";
//
@resultpage-background-color: #FAFAFA;
//
@results-margin-left: 16px;
//
@result-page-body-background-color: @background-color;
@result-page-a-hover-color: red;
@result-page-product-shop-color: green;
//
@body-background-color: @result-page-body-background-color;
@a-hover-color: @result-page-a-hover-color;
@a-donation-hover-color: @result-page-a-hover-color;
@product-shop-color: @result-page-product-shop-color;
//
@results-width-min: 500px;
@results-width-max: 700px;
@additions-width-min: 400px;
@additions-width-max: 500px;
//
@resultpage-breakpoint-large: (@results-width-max + @additions-width-max + @padding-small-default * 4);
@resultpage-breakpoint-small: (@results-width-min + @additions-width-min + @padding-small-default * 4);
//
@resultpage-leftbox-max-width: @results-width-max;
@resultpage-leftbox-min-dist-left-right: @padding-small-default;
@resultpage-leftbox-min-dist-top-bottom: @padding-small-default;
//
@logo-size-breakpoint: (@results-width-min + @padding-small-default * 2);
//
@sidebar-opener-breakpoint: (@results-width-max + @padding-small-default * 2 + 60px);
//
#header-logo {
z-index: 0;
padding-right: 10px;
......
resources/assets/less/metager/searchbar.less
+ 2
− 1
View file @ 64959710
/* Suchleiste */
@startpage-border-color: #a2a2a2;
@import "./variables.less";
@import "./cards.less";
/**/
.searchbar {
......
resources/assets/less/metager/settings.less
+ 2
− 0
View file @ 64959710
/* Einstellungen */
@import "./variables.less";
@import "./cards.less";
@settings-abort-btn-color: white;
#settings-buttons {
margin-top: 10px;
......
resources/assets/less/metager/sidebar.less
+ 2
− 0
View file @ 64959710
/* Navigations-Seitenleiste */
@import "./variables.less";
@import "./cards.less";
.sidebar {
border-left: 1px solid #ccc;
box-shadow: 0px 1px 1.5px 1px #c0c0c0;
......
resources/assets/less/metager/start-page.less
+ 2
− 0
View file @ 64959710
/* Startseite */
@import "./variables.less";
@import "./cards.less";
@search-bar-width: 1000px;
//
@focus-hover-focus-edit-background-color: #e3e3e3;
......
resources/assets/less/metager/variables.less
+ 40
− 1
View file @ 64959710
......@@ -18,7 +18,8 @@
//
@body-bg: rgb(250, 250, 250);
@input-border-focus: @metager-orange;
@font-family-sans-serif: Arimo, "Liberation Sans",
@font-family-sans-serif: Arimo,
"Liberation Sans",
"Helvetica Neue",
Helvetica,
Arial,
......@@ -27,6 +28,12 @@ sans-serif;
@link-color: #0066CC;
//
@padding-small-default: 8px;
/* Screen Sizes */
@screen-xs-max: 767px;
@screen-sm-max: 991;
@screen-md-max: 1199px;
@screen-lg: 1200;
/* Unsorted */
@quicktip-background-color: @color-white;
......@@ -56,3 +63,35 @@ sans-serif;
@product-price-background-color: fade(@color-white, 90%);
@lsprev-or-lsnext-i-background-color: @color-black;
@searchbar-background-color: white;
//
@startpage-border-color: #a2a2a2;
//
@resultpage-background-color: #FAFAFA;
//
@results-margin-left: 16px;
//
@result-page-body-background-color: @background-color;
@result-page-a-hover-color: red;
@result-page-product-shop-color: green;
//
@body-background-color: @result-page-body-background-color;
@a-hover-color: @result-page-a-hover-color;
@a-donation-hover-color: @result-page-a-hover-color;
@product-shop-color: @result-page-product-shop-color;
//
@results-width-min: 500px;
@results-width-max: 700px;
@additions-width-min: 400px;
@additions-width-max: 500px;
//
@resultpage-breakpoint-large: (@results-width-max + @additions-width-max + @padding-small-default * 4);
@resultpage-breakpoint-small: (@results-width-min + @additions-width-min + @padding-small-default * 4);
//
@resultpage-leftbox-max-width: @results-width-max;
@resultpage-leftbox-min-dist-left-right: @padding-small-default;
@resultpage-leftbox-min-dist-top-bottom: @padding-small-default;
//
@logo-size-breakpoint: (@results-width-min + @padding-small-default * 2);
//
@sidebar-opener-breakpoint: (@results-width-max + @padding-small-default * 2 + 60px);
//
\ No newline at end of file
resources/assets/less/metager/widget.less
+ 2
− 0
View file @ 64959710
@import "./variables.less";
@import "./cards.less";
.metager-searchinput {
height: 30px;
float: left;
......
resources/views/index.blade.php
+ 4
− 0
View file @ 64959710
......@@ -2,6 +2,10 @@
@section('title', $title )
@section('stylesheets')
<link type="text/css" rel="stylesheet" href="{{ mix('css/start-page.css') }}" />
@endsection
@section('content')
@include('modals.plugin-modal')
<h1 id="startpage-logo">
......
resources/views/layouts/resultPage.blade.php
+ 5
− 1
View file @ 64959710
......@@ -12,7 +12,11 @@
<meta name="mm" content="{{ $metager->getVerificationId() }}" />
<meta name="mn" content="{{ $metager->getVerificationCount() }}" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/metager.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/result-page.css') }}" />
<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<meta name="referrer" content="origin">
<meta name="age-meta-label" content="age=18"/>
......
resources/views/layouts/staticPages.blade.php
+ 5
− 1
View file @ 64959710
......@@ -14,8 +14,12 @@
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/metager.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
@yield('stylesheets')
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/utility.js') }}"></script>
@if (isset($css))
......
resources/views/modals/create-focus-modal.blade.php
+ 3
− 2
View file @ 64959710
<link type="text/css" rel="stylesheet" href="{{ mix('css/modals.css') }}" />
<input type="checkbox" id="show-create-focus" class="hidden">
<div class="metager-modal" id="create-focus-modal" role="dialog">
<div class="metager-modal-dialog">
......@@ -22,7 +23,7 @@
<form id="customSearchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<input type="hidden" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif">
<input type="hidden" name="encoding" value="utf8">
<input type="hidden" name="focus" value="focus_custom">
<input type="hidden" name="focus" value="focus_custom">
@foreach( App\Http\Controllers\FokiLoader::loadFoki() as $fokus => $sumas )
<div class="headingGroup {{ $fokus }}">
<input type="checkbox" id="toggle-{{ $fokus }}-dropdown" class="focus-dropdown-toggle" checked>
......@@ -57,4 +58,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
resources/views/modals/plugin-modal.blade.php
+ 2
− 0
View file @ 64959710
<link type="text/css" rel="stylesheet" href="{{ mix('css/modals.css') }}" />
<input type="checkbox" id="plugin-modal-checkbox" class="hidden" @if( isset($pluginmodal) && $pluginmodal == 'on') checked @endif>
<div class="metager-modal" id="plugin-modal" role="dialog">
<div class="metager-modal-dialog ">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment