Skip to content
Snippets Groups Projects
Commit a5baff5a authored by Phil Höfer's avatar Phil Höfer
Browse files

style-fixes und navbar-Umbauten

parent bc090cda
No related branches found
No related tags found
2 merge requests!619Development,!526Resolve "Ergebnisseiten-styles in less-code übernehmen"
...@@ -1581,7 +1581,7 @@ pre code { ...@@ -1581,7 +1581,7 @@ pre code {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.container { .container {
width: 1370px; width: 1170px;
} }
} }
.container-fluid { .container-fluid {
...@@ -7129,13 +7129,13 @@ footer { ...@@ -7129,13 +7129,13 @@ footer {
body { body {
margin: 0; margin: 0;
} }
header { /*header {
position: fixed; position: fixed;
background-color: white; background-color: white;
z-index: 500; z-index: 500;
width: 100%; width: 100%;
height: 50px; height: 50px;
} }*/
address { address {
white-space: pre; white-space: pre;
} }
...@@ -7294,7 +7294,6 @@ nav .input-group { ...@@ -7294,7 +7294,6 @@ nav .input-group {
position: fixed; position: fixed;
top: 0; top: 0;
width: 100%; width: 100%;
height: 60px;
z-index: 500; z-index: 500;
width: 80%; width: 80%;
left: 50%; left: 50%;
...@@ -7675,15 +7674,5 @@ footer a { ...@@ -7675,15 +7674,5 @@ footer a {
.lSNext > span { .lSNext > span {
color: #ff8000; color: #ff8000;
} }
@media (min-width: 1200px) {
.container {
width: 1150px;
}
}
@media (min-width: 1400px) {
.container {
width: 1370px;
}
}
/*# sourceMappingURL=default.css.map */ /*# sourceMappingURL=default.css.map */
This diff is collapsed.
...@@ -42,15 +42,4 @@ ...@@ -42,15 +42,4 @@
.lSPrev > span, .lSNext > span { .lSPrev > span, .lSNext > span {
color: rgb(255, 128, 0); color: rgb(255, 128, 0);
}
@media(min-width: 1200px) {
.container {
width: 1150px;
}
}
@media(min-width: 1400px) {
.container {
width: 1370px;
}
} }
\ No newline at end of file
...@@ -108,7 +108,7 @@ nav .input-group { ...@@ -108,7 +108,7 @@ nav .input-group {
position: fixed; position: fixed;
top: 0; top: 0;
width: 100%; width: 100%;
height: 60px; //height: 60px;
z-index: 500; z-index: 500;
width: 80%; width: 80%;
left: 50%; left: 50%;
......
...@@ -563,13 +563,13 @@ body { ...@@ -563,13 +563,13 @@ body {
margin: 0; margin: 0;
} }
header { /*header {
position: fixed; position: fixed;
background-color: white; background-color: white;
z-index: 500; z-index: 500;
width: 100%; width: 100%;
height: 50px; height: 50px;
} }*/
address { address {
white-space: pre; white-space: pre;
......
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
@body-bg: rgb(250, 250, 250); @body-bg: rgb(250, 250, 250);
@input-border-focus: rgb(255, 128, 0); @input-border-focus: rgb(255, 128, 0);
@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@container-tablet: (720px + @grid-gutter-width);
@container-desktop: (940px + @grid-gutter-width);
@container-large-desktop: (1340px + @grid-gutter-width);
//** Global textual link color. //** Global textual link color.
@link-color: #2A2ADE; @link-color: #2A2ADE;
......
@if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0 && ( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
<div id="searchplugin" class="alert alert-warning alert-dismissible" role="alert" style="">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
<br />
<div style="">
<a href="{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal" target="_blank" rel="noopener" type="button" class="btn btn-info" style="">{!! trans('researchandtabs.plugin.2') !!}</a>
</div>
</div>
@endif
<div class="content-wrapper"> <div class="content-wrapper">
<header id="research"> <header id="research">
<nav> <nav class="navbar navbar-default">
<ul class="list-inline"> <ul class="list-inline">
<li class="hidden-xs hidden-sm pull-left"> <li class="hidden-xs hidden-sm pull-left">
<div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MetaGer</h1></a> <div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MetaGer</h1></a>
...@@ -30,17 +40,6 @@ ...@@ -30,17 +40,6 @@
</li> </li>
</ul> </ul>
</nav> </nav>
</header>
@if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0 && ( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
<div id="searchplugin" class="alert alert-warning alert-dismissible" role="alert" style="">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
<br />
<div style="">
<a href="{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal" target="_blank" rel="noopener" type="button" class="btn btn-info" style="">{!! trans('researchandtabs.plugin.2') !!}</a>
</div>
</div>
@endif
<ul class="nav nav-tabs" id="foki" role="tablist"> <ul class="nav nav-tabs" id="foki" role="tablist">
@if( $metager->getFokus() === "web" ) @if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector"> <li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
...@@ -131,7 +130,7 @@ ...@@ -131,7 +130,7 @@
</li> </li>
@endif @endif
</ul> </ul>
</header>
<div class="tab-content container-fluid"> <div class="tab-content container-fluid">
@if( $metager->getFokus() === "web" ) @if( $metager->getFokus() === "web" )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment