Commit c4daed1b authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Revert "Aufgegeben"

This reverts commit 64959710
parent 826eee48
@import "./font-awesome/fontawesome.less";
@import "./font-awesome/solid.less";
@import "./bootstrap/bootstrap.less";
@import "./metager/metager.less";
\ No newline at end of file
@import "./metager/variables.less";
@import "./metager/cards.less";
@import "./metager/general.less";
@import "./metager/specific.less";
\ No newline at end of file
/* Winter-Spendenaufruf */ /* Winter-Spendenaufruf */
@import "./variables.less";
@import "./cards.less";
@base-aufruf-winter-color: #ab2121; @base-aufruf-winter-color: #ab2121;
@base-aufruf-winter-border-color: #953535; @base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white; @base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d; @base-aufruf-winter-btn-hover-background-color: #bd0d0d;
// //
@aufruf-winter-a-normal-or-visited: @base-aufruf-winter-color; @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-color: @base-aufruf-winter-btn-color!important;
@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-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-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-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 { .aufruf-winter {
h1 { h1 {
font-size: 32px; font-size: 32px;
......
/* Footer bar with logos and general links */ /* Footer bar with logos and general links */
@import "./variables.less";
@import "./cards.less";
footer { footer {
padding: 5px 5px 15px 5px; padding: 5px 5px 15px 5px;
width: 100%; width: 100%;
......
@import "./helpers.less";
/* Default Font */ /* Default Font */
body { body {
...@@ -104,6 +103,14 @@ a { ...@@ -104,6 +103,14 @@ a {
/* Logo */ /* Logo */
.logo {
color: @metager-orange;
font-family: Arimo, Liberation Sans, sans-serif;
font-style: italic;
font-weight: bold;
white-space: nowrap;
}
#startpage-logo { #startpage-logo {
.logo; .logo;
display: flex; display: flex;
...@@ -281,6 +288,12 @@ summary { ...@@ -281,6 +288,12 @@ summary {
cursor: not-allowed !important; cursor: not-allowed !important;
} }
.overflow-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Button */ /* Button */
button { button {
......
.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
@import "./general.less";
@import "./specific.less";
@import "./result-page.less"; @import "./result-page.less";
@import "./start-page.less"; @import "./start-page.less";
@import "./settings.less"; @import "./settings.less";
@import "./variables.less";
@import "./sidebar.less"; @import "./sidebar.less";
@import "./modals.less"; @import "./modals.less";
@import "./footer.less"; @import "./footer.less";
@import "./searchbar.less"; @import "./searchbar.less";
@import "./aufruf-winter.less"; @import "./aufruf-winter.less";
@import "./cards.less";
@import "./widget.less"; @import "./widget.less";
\ No newline at end of file
/* Rund ums Fokus Modal */ /* Rund ums Fokus Modal */
@import "./variables.less";
@import "./cards.less";
#show-create-focus:checked { #show-create-focus:checked {
&+#create-focus-modal { & + #create-focus-modal {
position: fixed; position: fixed;
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
...@@ -12,7 +10,7 @@ ...@@ -12,7 +10,7 @@
} }
#plugin-modal-checkbox:checked { #plugin-modal-checkbox:checked {
&+#plugin-modal { & + #plugin-modal {
display: block; display: block;
} }
} }
...@@ -27,7 +25,13 @@ ...@@ -27,7 +25,13 @@
justify-content: center; justify-content: center;
min-height: 100%; min-height: 100%;
width: 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: -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)); background: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7));
z-index: 150; z-index: 150;
.metager-modal-dialog { .metager-modal-dialog {
...@@ -60,13 +64,13 @@ ...@@ -60,13 +64,13 @@
.focus-dropdown-toggle { .focus-dropdown-toggle {
display: none; display: none;
&:not(:checked) { &:not(:checked) {
&~.focus-dropdown-label~.row { & ~ .focus-dropdown-label ~ .row {
max-height: 0px; max-height: 0px;
overflow: hidden; overflow: hidden;
} }
} }
&:checked { &:checked {
&~.focus-dropdown-label::after { & ~ .focus-dropdown-label::after {
content: " ➖ "; content: " ➖ ";
} }
} }
...@@ -79,7 +83,7 @@ ...@@ -79,7 +83,7 @@
margin-left: 3px; margin-left: 3px;
vertical-align: middle; vertical-align: middle;
} }
&~.row { & ~ .row {
-webkit-transition: max-height 0.4s ease; -webkit-transition: max-height 0.4s ease;
/* Chrome 1-25, Safari 3.2+ */ /* Chrome 1-25, Safari 3.2+ */
/* Firefox 4-15 */ /* Firefox 4-15 */
......
/* Ergebnisseite */ /* Ergebnisseite */
@import "./variables.less";
@import "./cards.less";
@import "./helpers.less";
@import "./quicktips.less"; @import "./quicktips.less";
@import "./result-saver.less"; @import "./result-saver.less";
@import "./result.less"; @import "./result.less";
@import "./product.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 { #header-logo {
z-index: 0; z-index: 0;
padding-right: 10px; padding-right: 10px;
......
/* Suchleiste */ /* Suchleiste */
@import "./variables.less"; @startpage-border-color: #a2a2a2;
@import "./cards.less";
/**/ /**/
.searchbar { .searchbar {
......
/* Einstellungen */ /* Einstellungen */
@import "./variables.less";
@import "./cards.less";
@settings-abort-btn-color: white; @settings-abort-btn-color: white;
#settings-buttons { #settings-buttons {
margin-top: 10px; margin-top: 10px;
......
/* Navigations-Seitenleiste */ /* Navigations-Seitenleiste */
@import "./variables.less";
@import "./cards.less";
.sidebar { .sidebar {
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
box-shadow: 0px 1px 1.5px 1px #c0c0c0; box-shadow: 0px 1px 1.5px 1px #c0c0c0;
......
/* Startseite */ /* Startseite */
@import "./variables.less";
@import "./cards.less";
@search-bar-width: 1000px; @search-bar-width: 1000px;
// //
@focus-hover-focus-edit-background-color: #e3e3e3; @focus-hover-focus-edit-background-color: #e3e3e3;
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
// //
@body-bg: rgb(250, 250, 250); @body-bg: rgb(250, 250, 250);
@input-border-focus: @metager-orange; @input-border-focus: @metager-orange;
@font-family-sans-serif: Arimo, @font-family-sans-serif: Arimo, "Liberation Sans",
"Liberation Sans",
"Helvetica Neue", "Helvetica Neue",
Helvetica, Helvetica,
Arial, Arial,
...@@ -28,12 +27,6 @@ sans-serif; ...@@ -28,12 +27,6 @@ sans-serif;
@link-color: #0066CC; @link-color: #0066CC;
// //
@padding-small-default: 8px; @padding-small-default: 8px;
/* Screen Sizes */
@screen-xs-max: 767px;
@screen-sm-max: 991;
@screen-md-max: 1199px;
@screen-lg: 1200;
/* Unsorted */ /* Unsorted */
@quicktip-background-color: @color-white; @quicktip-background-color: @color-white;
...@@ -63,35 +56,3 @@ sans-serif; ...@@ -63,35 +56,3 @@ sans-serif;
@product-price-background-color: fade(@color-white, 90%); @product-price-background-color: fade(@color-white, 90%);
@lsprev-or-lsnext-i-background-color: @color-black; @lsprev-or-lsnext-i-background-color: @color-black;
@searchbar-background-color: white; @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
@import "./variables.less";
@import "./cards.less";
.metager-searchinput { .metager-searchinput {
height: 30px; height: 30px;
float: left; float: left;
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
@section('title', $title ) @section('title', $title )
@section('stylesheets')
<link type="text/css" rel="stylesheet" href="{{ mix('css/start-page.css') }}" />
@endsection
@section('content') @section('content')
@include('modals.plugin-modal') @include('modals.plugin-modal')
<h1 id="startpage-logo"> <h1 id="startpage-logo">
......
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
<meta name="mm" content="{{ $metager->getVerificationId() }}" /> <meta name="mm" content="{{ $metager->getVerificationId() }}" />
<meta name="mn" content="{{ $metager->getVerificationCount() }}" /> <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 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/fontawesome.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.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" /> <link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<meta name="referrer" content="origin"> <meta name="referrer" content="origin">
<meta name="age-meta-label" content="age=18"/> <meta name="age-meta-label" content="age=18"/>
......
...@@ -14,12 +14,8 @@ ...@@ -14,12 +14,8 @@
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" /> <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 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="/fonts/arimo/stylesheet.css" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.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') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
@yield('stylesheets')
<script src="{{ mix('js/lib.js') }}"></script> <script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/utility.js') }}"></script> <script src="{{ mix('js/utility.js') }}"></script>
@if (isset($css)) @if (isset($css))
......
<link type="text/css" rel="stylesheet" href="{{ mix('css/modals.css') }}" />
<input type="checkbox" id="show-create-focus" class="hidden"> <input type="checkbox" id="show-create-focus" class="hidden">
<div class="metager-modal" id="create-focus-modal" role="dialog"> <div class="metager-modal" id="create-focus-modal" role="dialog">
<div class="metager-modal-dialog"> <div class="metager-modal-dialog">
......
<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> <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" id="plugin-modal" role="dialog">
<div class="metager-modal-dialog "> <div class="metager-modal-dialog ">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment