Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
c8d9e97b
Commit
c8d9e97b
authored
Nov 06, 2017
by
Karl Hasselbring
Browse files
Fixed: Teile der Startseite sehen wieder normal aus
parent
940b493b
Changes
10
Hide whitespace changes
Inline
Side-by-side
resources/assets/less/metager/base.less
View file @
c8d9e97b
...
...
@@ -7,13 +7,51 @@
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@new-feature-badge-background-color: @base-new-feature-badge-background-color;
body {
background-color: @body-background-color;
background-attachment: fixed;
display: flex;
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);
}
}
body#resultBody
{
background-image: inherit
;
.image-box
{
display: flex
;
}
summary {
...
...
resources/assets/less/metager/footer.less
View file @
c8d9e97b
footer {
marg
in:
10px 0px 30px 0
px;
padd
in
g
:
5
px;
width: 100%;
background-color: white;
border-top: 1px solid grey;
display: flex;
justify-content: space-around;
white-space: pre-line;
align-items:
flex-end
;
align-items:
center
;
div {
display: flex;
text-align: center;
margin-left: 10px;
&:first-child {
...
...
@@ -16,8 +19,14 @@ footer {
max-width: 100%;
}
&.startPageFooter {
position: absolute;
bottom: 0;
#info {
display: flex;
flex-direction: column;
p {
margin: 0px;
line-height: 10px;
}
}
}
&.footer-resultpage {
justify-content: center;
...
...
resources/assets/less/metager/start-page.less
View file @
c8d9e97b
@search-bar-width: 1000px;
.modal {
display: none;
}
.mg-panel {
@media(max-width: @search-bar-width) {
...
...
@@ -77,6 +79,7 @@
flex-grow: 1;
input {
border: none;
width: 100%;
height: 40px;
&:focus {
outline-color: rgb(255, 128, 0);
...
...
resources/assets/less/metager/static-pages.less
View file @
c8d9e97b
...
...
@@ -42,13 +42,6 @@ body {
}
}
.wrapper {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
}
ul.startpage {
list-style-type: none;
}
...
...
@@ -474,14 +467,6 @@ a.content.hidden-xs {
color: @a-content-hidden-xs-color;
}
a.navbar-brand {
line-height: 100%!important;
padding: 0;
position: absolute;
z-index: 5;
left: 10px;
}
.logo {
height: 30px!important;
&>h1 {
...
...
@@ -556,13 +541,13 @@ main ul li:not(.lslide) {
margin-top: 10px;
}
fieldset input[type=text] {
/*
fieldset input[type=text] {
width: 100%;
padding-left: 10px;
padding-right: 10px;
border-width: 1px;
overflow: visible;
}
}
*/
main fieldset {
border: 0;
...
...
resources/assets/less/variables-default.less
View file @
c8d9e97b
...
...
@@ -18,9 +18,7 @@ sans-serif;
//** Link hover decoration.
@link-hover-decoration: underline;
@font-size-base: 14px;
@screen-md: 992px;
@container-desktop: (920px + @grid-gutter-width);
@screen-lg: 1440px;
@container-large-desktop: (1370px + @grid-gutter-width);
//** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: 865px;
...
...
@@ -38,4 +36,8 @@ sans-serif;
@screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1);
@grid-gutter-width: 30px;
\ No newline at end of file
@grid-gutter-width: 30px;
/* Other sizes */
@search-bar-width: 1000px;
\ No newline at end of file
resources/views/index.blade.php
View file @
c8d9e97b
@
extends
(
'layouts.indexPage'
)
@
section
(
'title'
,
$title
)
@
section
(
'title'
,
$title
)
@
section
(
'content'
)
<
div
class
=
"modal fade"
id
=
"plugin-modal"
tab
-
index
=
"-1"
role
=
"dialog"
>
...
...
@@ -134,7 +134,7 @@
</
div
>
</
div
>
</
div
>
<
div
id
=
"create-focus-modal"
class
=
"modal fade"
tab
-
index
=
"-1"
role
=
"dialog"
>
<
div
class
=
"modal fade"
id
=
"create-focus-modal"
tab
-
index
=
"-1"
role
=
"dialog"
>
<
div
class
=
"modal-dialog modal-lg"
>
<
div
class
=
"content modal-content"
>
<
div
class
=
"modal-header"
>
...
...
@@ -203,7 +203,10 @@
</
div
>
</
div
>
</
div
>
<
h1
id
=
"mglogo"
><
a
class
=
"hidden-xs"
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
") }}"
>
MetaGer
</
a
></
h1
>
<
div
>
<
h1
id
=
"mglogo"
><
a
class
=
"hidden-xs"
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
") }}"
>
MetaGer
</
a
></
h1
>
</
div
>
<
div
>
<
fieldset
>
<
form
id
=
"searchForm"
method
=
{{
$request
}}
action
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
meta
/
meta
.
ger3
") }}"
accept
-
charset
=
"UTF-8"
>
<
div
class
=
"search-bar"
>
...
...
@@ -251,6 +254,8 @@
</
div
>
</
form
>
</
fieldset
>
</
div
>
<
div
>
<
ul
class
=
"list-inline searchform-bonus hidden"
>
<
li
id
=
"plug"
@
unless
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
||
$browser
===
'Chrome'
||
$browser
===
'Opera'
||
$browser
===
'IE'
||
$browser
===
'Edge'
||
$browser
===
'Safari'
||
$browser
===
'Vivaldi'
)
...
...
@@ -265,6 +270,7 @@
</
li
>
@
endif
</
ul
>
</
div
>
<
script
src
=
"{{ elixir('js/scriptStartPage.js') }}"
></
script
>
@
endsection
...
...
resources/views/layouts/alerts.blade.php
0 → 100644
View file @
c8d9e97b
@
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
View file @
c8d9e97b
@
if
(
$type
===
'startpage'
||
$type
===
'subpage'
)
<
footer
class
=
"{{
$id
}} noprint"
>
<
div
>
<
a
href
=
"https://www.suma-ev.de/"
>
<
img
src
=
"/img/suma_ev_logo-m1-greyscale.png"
alt
=
"SUMA-EV Logo"
></
a
>
<
a
class
=
"image-box"
href
=
"https://www.suma-ev.de/"
>
<
img
src
=
"/img/suma_ev_logo-m1-greyscale.png"
alt
=
"SUMA-EV Logo"
>
</
a
>
</
div
>
<
div
id
=
"info"
>
<
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
>
<
a
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
kontakt
") }}"
>
{{
trans
(
'staticPages.nav5'
)
}}
</
a
>
-
<
a
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
impressum
") }}"
>
{{
trans
(
'staticPages.nav8'
)
}}
</
a
>
</
p
>
<
p
>
{{
trans
(
'staticPages.sumaev.1'
)
}}
<
a
href
=
"https://www.suma-ev.de/"
>
{{
trans
(
'staticPages.sumaev.2'
)
}}
</
a
>
</
p
>
</
div
>
<
div
>
<
a
href
=
"https://www.uni-hannover.de/"
>
<
img
src
=
"/img/luh_metager.png"
alt
=
"LUH Logo"
></
a
>
<
a
class
=
"image-box"
href
=
"https://www.uni-hannover.de/"
>
<
img
src
=
"/img/luh_metager.png"
alt
=
"LUH Logo"
>
</
a
>
</
div
>
</
footer
>
@
elseif
(
$type
===
'resultpage'
)
<
footer
class
=
"footer-resultpage"
>
<
div
>
<
a
class
=
"btn btn-default"
href
=
"/"
>
{
!!
trans
(
'resultPage.startseite'
)
!!
}
</
a
>
</
div
>
<
div
>
<
a
class
=
"btn btn-default"
href
=
"/impressum/"
>
{
!!
trans
(
'resultPage.impressum'
)
!!
}
</
a
>
</
div
>
</
footer
>
@
endif
\ No newline at end of file
resources/views/layouts/header.blade.php
0 → 100644
View file @
c8d9e97b
@
yield
(
'homeIcon'
)
\ No newline at end of file
resources/views/layouts/staticPages.blade.php
View file @
c8d9e97b
...
...
@@ -33,30 +33,25 @@
</head>
<body>
<header>
@
yield('homeIcon
')
@
include('layouts.header
')
</header>
@include('layouts.sidebar', ['id' => 'staticPagesSideBar'])
<div
class=
"wrapper"
>
<main
class=
"mg-panel container"
>
@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
<div
class=
"content"
>
@include('layouts.alerts')
<main>
@yield('content')
</main>
@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"
/>
</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>
</html>
Ghost User
@ghost
mentioned in commit
291101fe
·
Nov 07, 2017
mentioned in commit
291101fe
mentioned in commit 291101fee9123362d719b268a16718b458ea3f10
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment