Commit a0455023 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '481-darstellung-der-mobilen-version-reparieren-verbessern' into 'development'

Resolve "Darstellung der mobilen Version reparieren / verbessern"

Closes #481

See merge request !830
parents 28c1cf5c 6d2f375c
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-357d27fe23.js",
"js/scriptStartPage.js": "js/scriptStartPage-a59b8ddf71.js",
"js/scriptStartPage.js": "js/scriptStartPage-fa42bed8ca.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
......@@ -7105,6 +7105,12 @@ By Class
background-color: white;
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
}
@media (max-width: 768px) {
.mg-panel {
margin: 0px;
box-shadow: none;
}
}
.input-group-addon {
padding: 0;
}
......@@ -7229,9 +7235,6 @@ Mixed
margin-left: 5px;
font-size: 12px;
}
.settings-btn + .settings-btn {
margin-left: 10px;
}
.wikiqtextract p {
margin-bottom: 0;
}
......@@ -7355,9 +7358,6 @@ footer li {
footer img {
max-width: 100%;
}
main ul li:not(.lslide) {
margin: 0 10px;
}
.searchform-bonus {
list-style-type: none;
text-align: center;
......@@ -7414,7 +7414,6 @@ body > div {
display: block;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
padding-top: 0;
}
......@@ -7543,17 +7542,26 @@ a:hover {
color: red;
}
/* Hier der Style für unsere Tabliste */
#foki {
.resultpage-foki,
.foki {
background-color: white;
}
#foki li a {
.resultpage-foki li,
.foki li {
margin: 0px 10px;
}
.resultpage-foki li a,
.foki li a {
color: grey;
padding: 5px 5px;
}
#foki li.active a {
.resultpage-foki li.active a,
.foki li.active a {
color: black;
background-color: white;
}
#foki li.active span + span {
.resultpage-foki li.active span + span,
.foki li.active span + span {
display: inline!important;
}
#spenden {
......@@ -7844,33 +7852,49 @@ footer a {
#anpassen-label a {
color: #333;
}
.focus {
margin: 0px;
.startpage-foki,
.foki {
display: -webkit-box;
display: flex;
flex-wrap: wrap;
-webkit-box-pack: center;
justify-content: center;
}
.focus ~ .focus {
margin-left: 10px;
.startpage-foki *,
.foki * {
margin: 0px 5px;
}
.startpage-foki * ~ *,
.foki * ~ * {
margin-left: 5px;
}
.startpage-foki input,
.foki input {
visibility: hidden;
}
#foki input + .custom-focus-label {
.startpage-foki input + .custom-focus-label,
.foki input + .custom-focus-label {
border-radius: 7px 0px 0px 7px;
}
#foki input + .custom-focus-label + .custom-focus-edit {
.startpage-foki input + .custom-focus-label + .custom-focus-edit,
.foki input + .custom-focus-label + .custom-focus-edit {
margin-left: 5px;
display: inline-block;
border-radius: 0px 7px 7px 0px;
}
#foki {
display: -webkit-box;
display: flex;
flex-wrap: wrap;
}
#foki label > span {
.startpage-foki label > span,
.foki label > span {
margin-right: 5px;
}
#foki label span {
.startpage-foki label span,
.foki label span {
background-color: transparent;
}
#foki input {
visibility: hidden;
.focus {
margin: 0px;
}
.focus ~ .focus {
margin-left: 10px;
}
.focus-radio:checked + .focus-label,
.focus-radio:checked + .focus-label + .focus-edit {
......@@ -7897,6 +7921,15 @@ footer a {
#settings-btn > * {
vertical-align: middle;
}
.searchform-bonus li {
margin: 5px;
}
.settings-modal-buttons {
padding: 5px;
}
.settings-modal-buttons button {
margin: 5px;
}
#settingsButtons {
display: -webkit-box;
display: flex;
......@@ -7910,6 +7943,9 @@ footer a {
color: white;
margin-right: auto;
}
.settings-btn {
margin: 5px;
}
/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
......
This diff is collapsed.
This diff is collapsed.
#map, #map div{
display:flex;
margin:0;
#map,
#map div {
display: flex;
margin: 0;
}
.nav-tabs > li > a {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
.nav-tabs>li>a {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.tab-content {
padding-top: 10px;
}
.hostlabel a:link, .hostlabel a:visited {
.hostlabel a:link,
.hostlabel a:visited {
color: #FFFFFF;
}
......@@ -29,11 +31,11 @@ border-radius: 0;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
padding-top: 0;
}
/* Hier der Style für unsere Suchleiste */
.navbar-resultpage {
......@@ -41,7 +43,7 @@ border-radius: 0;
left: initial;
margin-bottom: 0px;
}
@media (max-width: @screen-xs-max) {
.navbar-resultpage {
right: 0px!important;
......@@ -67,16 +69,16 @@ border-radius: 0;
.navbar-resultpage .logo {
padding-top: 0px;
}
.navbar-resultpage .input-group {
margin: 0px 5px;
}
.dense-col {
padding: 0px
}
/* Logo */
.logo {
......@@ -84,7 +86,7 @@ border-radius: 0;
padding: 5px 0;
}
.logo > a {
.logo>a {
line-height: 100%;
height: 100%;
display: block;
......@@ -120,15 +122,14 @@ nav .input-group {
vertical-align: middle;
}*/
#research nav ul > li {
width: 20%;
//height: 45px;
#research nav ul>li {
width: 20%; //height: 45px;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul > li.visible-xs {
#research nav ul>li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
......@@ -176,9 +177,8 @@ body {
background-color: rgba(2, 93, 140, .03);
}
a#donation:hover {}
a#donation, a#donation:visited {
a#donation,
a#donation:visited {
color: inherit;
}
......@@ -198,21 +198,22 @@ a:hover {
/* Hier der Style für unsere Tabliste */
#foki {
background-color: white;
}
#foki li a {
color: grey;
}
#foki li.active a {
color: black;
.resultpage-foki, .foki {
background-color: white;
}
#foki li.active span + span {
display: inline!important;
li {
margin: 0px 10px;
}
li a {
color: grey;
padding: 5px 5px;
}
li.active a {
color: black;
background-color: white;
}
li.active span+span {
display: inline!important;
}
}
#spenden {
......@@ -228,11 +229,11 @@ a:hover {
color: #333333;
}
#spruch > p {
#spruch>p {
margin-bottom: 0;
}
#spruch > p + p {
#spruch>p+p {
margin-top: 4px;
}
......@@ -244,13 +245,13 @@ a:hover {
width: 100%
}
.result > .number {
.result>.number {
font-size: 15px;
line-height: 1;
text-align: right;
}
.result > .resultInformation {
.result>.resultInformation {
border-radius: 5px;
}
......@@ -281,11 +282,11 @@ a:hover {
float: left;
}
.result .link > div {
.result .link>div {
white-space: nowrap;
}
.result .link > span {
.result .link>span {
white-space: nowrap;
margin: 0 5px;
}
......@@ -295,19 +296,20 @@ a:hover {
float: left;
}
/*
.result .link:hover {
cursor: pointer;
}*/
.result .link .options > a {
.result .link .options>a {
color: #333;
display: block;
padding-left: 5px;
padding-right: 5px;
}
.result .link .options > a > span {
.result .link .options>a>span {
font-size: 10px;
}
......@@ -353,7 +355,7 @@ a:hover {
color: #333;
}
.result .result-image > img {
.result .result-image>img {
height: 100px;
padding: 10px;
}
......@@ -379,22 +381,22 @@ a:hover {
margin: 0!important;
}
.result .image > img {
.result .image>img {
max-width: 100%;
}
.options-list > li:hover {
.options-list>li:hover {
background-color: lightgrey;
}
.options-list > li > a {
.options-list>li>a {
color: #333;
white-space: nowrap;
display: block;
padding: 5px 14px;
}
.options-list > li input[type=submit] {
.options-list>li input[type=submit] {
width: 100%;
background-color: transparent;
border: 0;
......@@ -445,7 +447,7 @@ footer a {
margin-top: 20px;
}
.loader > img {
.loader>img {
width: 30px;
}
......@@ -462,12 +464,12 @@ footer a {
width: 25%;
}
#searchplugin > div {
#searchplugin>div {
text-align: center;
padding-top: 5px;
}
#searchplugin > div > a {
#searchplugin>div>a {
color: white;
}
......@@ -523,7 +525,8 @@ footer a {
overflow: visible!important;
}
.lSPrev > span, .lSNext > span {
.lSPrev>span,
.lSNext>span {
background-color: black;
padding: 5px;
}
......@@ -545,4 +548,4 @@ footer a {
padding-left: 0;
padding-right: 0;
}
}
}
\ No newline at end of file
#settingsButtons {
display: flex;
flex-wrap: wrap;
a, input {
margin-top: 25px;
}
display: flex;
flex-wrap: wrap;
a,
input {
margin-top: 25px;
}
}
#settings-abort-btn {
color: white;
margin-right: auto;
color: white;
margin-right: auto;
}
.settings-btn {
margin: 5px;
}
\ No newline at end of file
@foki-edge-rounding: 7px;
#about-us a:visited {
color: @link-color;
}
#anpassen-label a {
color: #333;
}
.focus {
margin: 0px;
}
.focus ~ .focus {
margin-left: 10px;
}
#foki input + .custom-focus-label {
border-radius: @foki-edge-rounding 0px 0px @foki-edge-rounding;
}
#foki input + .custom-focus-label + .custom-focus-edit {
margin-left: 5px;
display: inline-block;
border-radius: 0px @foki-edge-rounding @foki-edge-rounding 0px;
color: #333;
}
#foki {
display: flex;
flex-wrap: wrap;
}
#foki label > span {
margin-right: 5px;
.startpage-foki, .foki{
display: flex;
flex-wrap: wrap;
justify-content: center;
* {
margin: 0px 5px;
}
*~* {
margin-left: 5px;
}
input {
visibility: hidden;
&+.custom-focus-label {
border-radius: @foki-edge-rounding 0px 0px @foki-edge-rounding;
}
&+.custom-focus-label+.custom-focus-edit {
margin-left: 5px;
display: inline-block;
border-radius: 0px @foki-edge-rounding @foki-edge-rounding 0px;
}
}
label {
&>span {
margin-right: 5px;
}
& span {
background-color: transparent;
}
}
}
#foki label span {
background-color: transparent;
.focus {
margin: 0px;
}
#foki input {
visibility: hidden;
.focus~.focus {
margin-left: 10px;
}
.focus-radio:checked {
& + .focus-label, & + .focus-label + .focus-edit {
background-color: #e3e3e3;
&+.focus-label,
&+.focus-label+.focus-edit {
background-color: #e3e3e3;
}
}
.focus-label, .focus-edit {
margin: 0px;
.focus-label,
.focus-edit {
margin: 0px;
border-radius: 7px;
padding: 7px;
font-weight: normal;
}
.focus:hover {
.focus-label, .focus-edit {
cursor: pointer;
background-color: #e3e3e3;
}
.focus-label,
.focus-edit {
cursor: pointer;
background-color: #e3e3e3;
}
}
#addFocusBtn {
margin-left: 10px;
margin-left: 10px;
}
#settings-btn {
margin-left: auto;
& > * {
vertical-align: middle;
}
margin-left: auto;
&>* {
vertical-align: middle;
}
}
.searchform-bonus {
li {
margin: 5px;
}
}
.settings-modal-buttons {
padding: 5px;
button {
margin: 5px
}
}
\ No newline at end of file
......@@ -431,6 +431,10 @@ By Class
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
@media (max-width: 768px) {
margin: 0px;
box-shadow: none;
}
}
.input-group-addon {
......@@ -583,10 +587,6 @@ Mixed
font-size: 12px;
}
.settings-btn + .settings-btn {
margin-left: 10px;
}
.wikiqtextract p {
margin-bottom: 0;
}
......@@ -739,10 +739,6 @@ footer img {
max-width: 100%;
}
main ul li:not(.lslide) {
margin: 0 10px;
}
.searchform-bonus {
list-style-type: none;
text-align: center;
......
......@@ -153,7 +153,7 @@
<input id="focus-name" type="text" name="focus-name" placeholder="@lang('index.focus-creator.name-placeholder')">
<input id="original-id" type="hidden" name="original-id" value="">
</div>
<div class="pull-right">
<div class="settings-modal-buttons pull-right">
<button class="delete-focus-btn btn btn-danger">
@lang('index.focus-creator.delete')
</button>
......@@ -190,7 +190,7 @@
</div>
@endforeach
<div class="clearfix">
<div class="pull-right">
<div class="settings-modal-buttons pull-right">
<button class="delete-focus-btn btn btn-danger">
@lang('index.focus-creator.delete')
</button>
......@@ -205,7 +205,7 @@
</div>
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<!-- Create the focus selection and options -->
<div id="foki">
<div id="foki" class="startpage-foki">
<div class="focus">
<input id="web" class="focus-radio hide" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
<label id="web-label" class="focus-label" for="web">
......@@ -251,12 +251,16 @@
</label>
</div>
@endif
<button id="addFocusBtn" class="btn btn-default hide">
<div id="addFocusBtnDiv">
<button id="addFocusBtn" class="btn btn-default hide">
<i class="fa fa-plus" aria-hidden="true"></i>
</button>
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
</button>
</div>
<div>
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
<i class="fa fa-cog" aria-hidden="true"></i>
</a>
</a>
</div>
</div>
<fieldset>
<form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
......@@ -298,11 +302,6 @@
</div>
</div>
</form>
<div class="visible-xs">
<a class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
<i class="fa fa-cog" aria-hidden="true"></i>
</a>
</div>
</fieldset>
<ul class="list-inline searchform-bonus">
<li><a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" rel="noopener" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}"><i class="fa fa-shopping-bag" aria-hidden="true"></i> {{ trans('index.conveyor') }}</a></li>
......@@ -311,9 +310,8 @@
@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
class="hidden"
@endunless
>
<a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
</li>
><a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><span class="glyphicon glyphicon-log-in"></span> {{ trans('index.plugin') }}</a></li>
<li><a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a></li>
</ul>
<script src="{{ elixir('js/lib.js') }}"></script>
<script src="{{ elixir('js/scriptStartPage.js') }}"></script>
......
......@@ -35,7 +35,7 @@
</div>
</div>
</nav>
<ul class="nav nav-tabs" id="foki" role="tablist">
<ul id="foki" class=" resultpage-foki nav nav-tabs" role="tablist">
@if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
......
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