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

Revert "Fixed: Teile der Startseite sehen wieder normal aus" 

This reverts commit c8d9e97b.
parent 1b5cc4e2
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 112 deletions
resources/assets/less/metager/base.less
+ 3
− 41
View file @ 178cacaf
...@@ -7,51 +7,13 @@ ...@@ -7,51 +7,13 @@
@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;
@new-feature-badge-background-color: @base-new-feature-badge-background-color; @new-feature-badge-background-color: @base-new-feature-badge-background-color;
body { body {
background-color: @body-background-color; background-color: @body-background-color;
display: flex; background-attachment: fixed;
flex-direction: column;
}
header {
width: 100%;
padding: 5px;
background-color: white;
border-bottom: 1px grey solid;
}
.content {
width: 100%;
background-color: white;
flex-grow: 1;
}
a {
&,
&:link,
&:visited,
&:active,
&:focus,
&:hover {
text-decoration: none;
}
&,
&:link {
color: inherit;
}
&:visited {
color: rgb(143, 0, 172);
}
&:active,
&:focus,
&:hover {
color: rgb(136, 0, 0);
}
} }
.image-box { body#resultBody {
display: flex; background-image: inherit;
} }
summary { summary {
......
resources/assets/less/metager/footer.less
+ 4
− 13
View file @ 178cacaf
footer { footer {
padding: 5px; margin: 10px 0px 30px 0px;
width: 100%; width: 100%;
background-color: white;
border-top: 1px solid grey;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
white-space: pre-line; white-space: pre-line;
align-items: center; align-items: flex-end;
div { div {
display: flex;
text-align: center; text-align: center;
margin-left: 10px; margin-left: 10px;
&:first-child { &:first-child {
...@@ -19,14 +16,8 @@ footer { ...@@ -19,14 +16,8 @@ footer {
max-width: 100%; max-width: 100%;
} }
&.startPageFooter { &.startPageFooter {
#info { position: absolute;
display: flex; bottom: 0;
flex-direction: column;
p {
margin: 0px;
line-height: 10px;
}
}
} }
&.footer-resultpage { &.footer-resultpage {
justify-content: center; justify-content: center;
......
resources/assets/less/metager/start-page.less
+ 1
− 4
View file @ 178cacaf
.modal { @search-bar-width: 1000px;
display: none;
}
.mg-panel { .mg-panel {
@media(max-width: @search-bar-width) { @media(max-width: @search-bar-width) {
...@@ -79,7 +77,6 @@ ...@@ -79,7 +77,6 @@
flex-grow: 1; flex-grow: 1;
input { input {
border: none; border: none;
width: 100%;
height: 40px; height: 40px;
&:focus { &:focus {
outline-color: rgb(255, 128, 0); outline-color: rgb(255, 128, 0);
......
resources/assets/less/metager/static-pages.less
+ 17
− 2
View file @ 178cacaf
...@@ -42,6 +42,13 @@ body { ...@@ -42,6 +42,13 @@ body {
} }
} }
.wrapper {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
}
ul.startpage { ul.startpage {
list-style-type: none; list-style-type: none;
} }
...@@ -467,6 +474,14 @@ a.content.hidden-xs { ...@@ -467,6 +474,14 @@ a.content.hidden-xs {
color: @a-content-hidden-xs-color; color: @a-content-hidden-xs-color;
} }
a.navbar-brand {
line-height: 100%!important;
padding: 0;
position: absolute;
z-index: 5;
left: 10px;
}
.logo { .logo {
height: 30px!important; height: 30px!important;
&>h1 { &>h1 {
...@@ -541,13 +556,13 @@ main ul li:not(.lslide) { ...@@ -541,13 +556,13 @@ main ul li:not(.lslide) {
margin-top: 10px; margin-top: 10px;
} }
/*fieldset input[type=text] { fieldset input[type=text] {
width: 100%; width: 100%;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-width: 1px; border-width: 1px;
overflow: visible; overflow: visible;
}*/ }
main fieldset { main fieldset {
border: 0; border: 0;
......
resources/assets/less/variables-default.less
+ 3
− 5
View file @ 178cacaf
...@@ -18,7 +18,9 @@ sans-serif; ...@@ -18,7 +18,9 @@ sans-serif;
//** Link hover decoration. //** Link hover decoration.
@link-hover-decoration: underline; @link-hover-decoration: underline;
@font-size-base: 14px; @font-size-base: 14px;
@screen-md: 992px;
@container-desktop: (920px + @grid-gutter-width); @container-desktop: (920px + @grid-gutter-width);
@screen-lg: 1440px;
@container-large-desktop: (1370px + @grid-gutter-width); @container-large-desktop: (1370px + @grid-gutter-width);
//** Point at which the navbar becomes uncollapsed. //** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: 865px; @grid-float-breakpoint: 865px;
...@@ -36,8 +38,4 @@ sans-serif; ...@@ -36,8 +38,4 @@ sans-serif;
@screen-xs-max: (@screen-sm-min - 1); @screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1); @screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1); @screen-md-max: (@screen-lg-min - 1);
@grid-gutter-width: 30px; @grid-gutter-width: 30px;
\ No newline at end of file
/* Other sizes */
@search-bar-width: 1000px;
\ No newline at end of file
resources/views/index.blade.php
+ 3
− 9
View file @ 178cacaf
@extends('layouts.indexPage') @extends('layouts.indexPage')
@section('title', $title) @section('title', $title )
@section('content') @section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog"> <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="create-focus-modal" tab-index="-1" role="dialog"> <div id="create-focus-modal" class="modal fade" tab-index="-1" role="dialog">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="content modal-content"> <div class="content modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -203,10 +203,7 @@ ...@@ -203,10 +203,7 @@
</div> </div>
</div> </div>
</div> </div>
<div> <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
</div>
<div>
<fieldset> <fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8"> <form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
<div class="search-bar"> <div class="search-bar">
...@@ -254,8 +251,6 @@ ...@@ -254,8 +251,6 @@
</div> </div>
</form> </form>
</fieldset> </fieldset>
</div>
<div>
<ul class="list-inline searchform-bonus hidden"> <ul class="list-inline searchform-bonus hidden">
<li id="plug" <li id="plug"
@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi') @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
...@@ -270,7 +265,6 @@ ...@@ -270,7 +265,6 @@
</li> </li>
@endif @endif
</ul> </ul>
</div>
<script src="{{ elixir('js/scriptStartPage.js') }}"></script> <script src="{{ elixir('js/scriptStartPage.js') }}"></script>
@endsection @endsection
......
resources/views/layouts/alerts.blade.php deleted 100644 → 0
+ 0
− 12
View file @ 1b5cc4e2
@if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
@endif
@if (isset($info))
<div class="alert alert-info" role="alert">{{ $info }}</div>
@endif
@if (isset($warning))
<div class="alert alert-warning" role="alert">{{ $warning }}</div>
@endif
@if (isset($error))
<div class="alert alert-danger" role="alert">{{ $error }}</div>
@endif
\ No newline at end of file
resources/views/layouts/footer.blade.php
+ 10
− 12
View file @ 178cacaf
@if ($type === 'startpage' || $type === 'subpage') @if ($type === 'startpage' || $type === 'subpage')
<footer class="{{ $id }} noprint">
<div> <div>
<a class="image-box" href="https://www.suma-ev.de/"> <a href="https://www.suma-ev.de/" >
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"> <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
</a>
</div> </div>
<div id="info"> <div id="info">
<p> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a> {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</p>
<p>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</p>
</div> </div>
<div> <div>
<a class="image-box" href="https://www.uni-hannover.de/"> <a href="https://www.uni-hannover.de/" >
<img src="/img/luh_metager.png" alt="LUH Logo"> <img src="/img/luh_metager.png" alt="LUH Logo"></a>
</a>
</div> </div>
</footer>
@elseif ($type === 'resultpage') @elseif ($type === 'resultpage')
<footer class="footer-resultpage">
<div> <div>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a> <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div> </div>
<div> <div>
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a> <a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div> </div>
</footer>
@endif @endif
\ No newline at end of file
resources/views/layouts/header.blade.php deleted 100644 → 0
+ 0
− 1
View file @ 1b5cc4e2
@yield('homeIcon')
\ No newline at end of file
resources/views/layouts/staticPages.blade.php
+ 18
− 13
View file @ 178cacaf
...@@ -33,25 +33,30 @@ ...@@ -33,25 +33,30 @@
</head> </head>
<body> <body>
<header> <header>
@include('layouts.header') @yield('homeIcon')
</header> </header>
@include('layouts.sidebar', ['id' => 'staticPagesSideBar']) @include('layouts.sidebar', ['id' => 'staticPagesSideBar'])
<div class="content"> <div class="wrapper">
@include('layouts.alerts') <main class="mg-panel container">
<main> @if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
@endif
@if (isset($info))
<div class="alert alert-info" role="alert">{{ $info }}</div>
@endif
@if (isset($warning))
<div class="alert alert-warning" role="alert">{{ $warning }}</div>
@endif
@if (isset($error))
<div class="alert alert-danger" role="alert">{{ $error }}</div>
@endif
@yield('content') @yield('content')
</main> </main>
@yield('optionalContent') @yield('optionalContent')
@if (isset($page) && $page === 'startpage') @include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
@else @include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
@endif
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div> </div>
@if (isset($page) && $page === 'startpage')
<footer class="noprint startPageFooter">
@include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
</footer>
@else
<footer class="noprint">
@include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
</footer>
@endif
</body> </body>
</html> </html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment