Skip to content

GitLab

Commit 87362f0d authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'manual-merge-branch-for-483' into 'development' 

Manually transferred changes from 483

See merge request !846
parents eaf67a08 b720de2e
Expand all Hide whitespace changes
Inline Side-by-side
public/build/css/themes/default.css.map
View file @ 87362f0d
This diff is collapsed.
public/css/styleResultPage.css
View file @ 87362f0d
......@@ -218,11 +218,11 @@ a:hover {
background-color: white;
}
#foki li.active span + span {
#foki li.active a i + span {
display: inline!important;
margin-left: 5px;
}
/* Hier der Style für unseren Spruch */
#spruch {
......
public/css/theme.css.php
View file @ 87362f0d
......@@ -25,7 +25,7 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
-webkit-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
-moz-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
// border-color: <?=$colorRGBA?>;
border-color: <?=$colorRGBA?>;
}
#mglogo > a {
background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%);
......
public/css/themes/default.css
View file @ 87362f0d
......@@ -7238,9 +7238,6 @@ Mixed
.wikiqtextract p {
margin-bottom: 0;
}
footer ul.list-inline {
width: 100%;
}
i.fa {
background-color: transparent;
}
......@@ -7307,11 +7304,6 @@ section {
box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
}
footer {
margin-top: 8%;
bottom: 0;
width: 100%;
}
body {
margin: 0;
}
......@@ -7351,13 +7343,6 @@ label a:hover {
text-decoration: none;
color: inherit;
}
footer li {
width: 33%;
text-align: center;
}
footer img {
max-width: 100%;
}
.searchform-bonus {
list-style-type: none;
text-align: center;
......@@ -7388,6 +7373,21 @@ nav h1 {
body > div {
padding-top: 70px;
}
footer {
margin: 30px 0px;
bottom: 0;
width: 100%;
}
footer ul.list-inline {
width: 100%;
}
footer li {
width: 33%;
text-align: center;
}
footer img {
max-width: 100%;
}
#map,
#map div {
display: -webkit-box;
......@@ -7865,14 +7865,6 @@ footer a {
-webkit-box-pack: center;
justify-content: center;
}
.startpage-foki *,
.foki * {
margin: 0px 5px;
}
.startpage-foki * ~ *,
.foki * ~ * {
margin-left: 5px;
}
.startpage-foki input,
.foki input {
visibility: hidden;
......@@ -7887,10 +7879,6 @@ footer a {
display: inline-block;
border-radius: 0px 7px 7px 0px;
}
.startpage-foki label > span,
.foki label > span {
margin-right: 5px;
}
.startpage-foki label span,
.foki label span {
background-color: transparent;
......@@ -7917,13 +7905,13 @@ footer a {
cursor: pointer;
background-color: #e3e3e3;
}
#addFocusBtn {
#addFocusBtnDiv {
margin-left: 10px;
}
#settings-btn {
margin-left: auto;
#settingsBtnDiv {
margin-left: 10px;
}
#settings-btn > * {
#settingsBtnDiv > * {
vertical-align: middle;
}
.searchform-bonus li {
......
public/css/themes/default.css.map
View file @ 87362f0d
This diff is collapsed.
resources/assets/less/metager/start-page.less
View file @ 87362f0d
......@@ -11,12 +11,6 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
* {
margin: 0px 5px;
}
*~* {
margin-left: 5px;
}
input {
visibility: hidden;
&+.custom-focus-label {
......@@ -29,9 +23,6 @@
}
}
label {
&>span {
margin-right: 5px;
}
& span {
background-color: transparent;
}
......@@ -69,12 +60,12 @@
}
}
#addFocusBtn {
#addFocusBtnDiv {
margin-left: 10px;
}
#settings-btn {
margin-left: auto;
#settingsBtnDiv {
margin-left: 10px;
&>* {
vertical-align: middle;
}
......
resources/assets/less/metager/static-pages.less
View file @ 87362f0d
#spruch .author {
font-size: 14px;
color: #888;
......@@ -13,6 +11,7 @@ ul.startpage {
list-style-type: none;
}
/*
......@@ -28,14 +27,15 @@ By ID
*/
#gutscheine > a {
#gutscheine>a {
display: inline-block;
}
#gutscheine > a:first-child{
#gutscheine>a:first-child {
padding-right: 0;
}
#gutscheine > a:first-child + a{
#gutscheine>a:first-child+a {
padding-left: 0;
}
......@@ -69,28 +69,30 @@ nav.navbar-resultpage {
position: absolute;
}
nav.navbar-resultpage > ul > li {
nav.navbar-resultpage>ul>li {
padding-left: 0;
padding-right: 0;
}
#navbar-static-pages{
#navbar-static-pages {
z-index: 4;
width: 100%;
}
nav.navbar-resultpage > ul > li > a:not(.metager-navbar-toggle) {
nav.navbar-resultpage>ul>li>a:not(.metager-navbar-toggle) {
display: block;
padding: 10px;
color:#777;
color: #777;
}
nav.navbar-resultpage > ul > li.active > a, a.metager-dropdown-toggle:hover, a.metager-dropdown-toggle:focus {
nav.navbar-resultpage>ul>li.active>a,
a.metager-dropdown-toggle:hover,
a.metager-dropdown-toggle:focus {
background-color: #e7e7e7;
}
nav.navbar-resultpage > ul.list-inline {
margin-bottom:0;
nav.navbar-resultpage>ul.list-inline {
margin-bottom: 0;
}
ul.metager-dropdown-menu {
......@@ -116,7 +118,7 @@ ul.metager-dropdown-menu {
transition: max-height 1s ease;
}
.metager-dropdown-menu > li > a {
.metager-dropdown-menu>li>a {
display: block;
padding: 3px 20px;
clear: both;
......@@ -126,13 +128,16 @@ ul.metager-dropdown-menu {
white-space: nowrap;
}
.metager-dropdown-menu > li > a:hover {
.metager-dropdown-menu>li>a:hover {
text-decoration: none;
color: #262626;
background-color: #f5f5f5;
}
a.metager-dropdown-toggle:hover + ul.metager-dropdown-menu, a.metager-dropdown-toggle:focus + ul.metager-dropdown-menu, ul.metager-dropdown-menu:hover, #gutscheine > a:first-child:hover + a + ul.metager-dropdown-menu {
a.metager-dropdown-toggle:hover+ul.metager-dropdown-menu,
a.metager-dropdown-toggle:focus+ul.metager-dropdown-menu,
ul.metager-dropdown-menu:hover,
#gutscheine>a:first-child:hover+a+ul.metager-dropdown-menu {
max-height: 1000px;
padding: 5px 0;
border: 1px solid rgba(0, 0, 0, 0.15);
......@@ -162,17 +167,17 @@ a.metager-dropdown-toggle:hover + ul.metager-dropdown-menu, a.metager-dropdown-t
background-color: #ddd;
}
@media (max-width: 979px){
@media (max-width: 979px) {
#metager-static-nav-list {
width: 100%;
max-height: 40px;
overflow:hidden;
overflow: hidden;
transition: max-height 1s ease;
}
#metager-static-nav-list:target {
max-height: 1000px;
}
#metager-static-nav-list > li{
#metager-static-nav-list>li {
display: initial;
}
ul.metager-dropdown-menu {
......@@ -189,11 +194,10 @@ a.metager-dropdown-toggle:hover + ul.metager-dropdown-menu, a.metager-dropdown-t
}
}
@media (min-width: 980px){
.metager-navbar-toggle{
@media (min-width: 980px) {
.metager-navbar-toggle {
display: none;
}
}
......@@ -260,7 +264,7 @@ Mixed
background-color: rgb(50, 50, 50);
}
#mglogo > a {
#mglogo>a {
display: block;
width: 200px;
text-decoration: none;
......@@ -303,7 +307,7 @@ Mixed
color: grey;
}
#moreInformation > div {
#moreInformation>div {
font-size: 15px;
}
......@@ -360,7 +364,7 @@ textarea#message {
color: inherit;
}
#plugin-modal ol > li {
#plugin-modal ol>li {
margin-bottom: 5px;
}
......@@ -591,10 +595,6 @@ Mixed
margin-bottom: 0;
}
footer ul.list-inline {
width: 100%;
}
i.fa {
background-color: transparent;
}
......@@ -611,14 +611,15 @@ a.navbar-brand {
left: 10px;
}
nav .navbar-brand > div.logo {
nav .navbar-brand>div.logo {
height: 100%;
}
.logo {
height: 30px!important;
}
.logo > h1 {
.logo>h1 {
font-size: 30px;
}
......@@ -677,16 +678,11 @@ section {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
}
footer {
margin-top: 8%;
bottom: 0;
width: 100%;
}
body {
margin: 0;
}
/*header {
position: fixed;
background-color: white;
......@@ -730,15 +726,6 @@ label a:hover {
color: inherit;
}
footer li {
width: 33%;
text-align: center;
}
footer img {
max-width: 100%;
}
.searchform-bonus {
list-style-type: none;
text-align: center;
......@@ -771,6 +758,22 @@ nav h1 {
white-space: nowrap;
}
body > div {
body>div {
padding-top: 70px;
}
footer {
margin: 30px 0px;
bottom: 0;
width: 100%;
ul.list-inline {
width: 100%;
}
li {
width: 33%;
text-align: center;
}
img {
max-width: 100%;
}
}
\ No newline at end of file
resources/views/datenschutz.blade.php
View file @ 87362f0d
......@@ -22,19 +22,19 @@
<li>{!! trans('datenschutz.policy.19') !!}</li>
</ul>
<h2>{!! trans('datenschutz.twitter') !!}</h2>
<pre><p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
&gt; MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
<p>&gt; 8.4.2014 Stiftung Datenschutz @DS_Stiftung
&gt; Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
&gt; Suchmaschine aus #Hannover</p>
<p>&gt; 8.4.2014 Markus Käkenmeister @markus2009
&gt; Suchmaschine ohne Tracking</p>
<p>&gt; 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics Nice; anonymous Search and find
&gt; with MetaGer</p>
<p>&gt; 7.4.2014 Anfahrer @anfahrer
&gt; Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
&gt; Ergebnisse via Proxy</p>
<p>&gt; 8.4.2014 stupidit&eacute; pue @dummheitstinkt
&gt; wow, is this the MetaGer I used in the end 90s in internet cafes???
&gt; "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre>
<pre><p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
&gt; MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
<p>&gt; 8.4.2014 Stiftung Datenschutz @DS_Stiftung
&gt; Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
&gt; Suchmaschine aus #Hannover</p>
<p>&gt; 8.4.2014 Markus Käkenmeister @markus2009
&gt; Suchmaschine ohne Tracking</p>
<p>&gt; 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics Nice; anonymous Search and find
&gt; with MetaGer</p>
<p>&gt; 7.4.2014 Anfahrer @anfahrer
&gt; Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
&gt; Ergebnisse via Proxy</p>
<p>&gt; 8.4.2014 stupidit&eacute; pue @dummheitstinkt
&gt; wow, is this the MetaGer I used in the end 90s in internet cafes???
&gt; "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre>
@endsection
resources/views/index.blade.php
View file @ 87362f0d
......@@ -256,7 +256,7 @@
<i class="fa fa-plus" aria-hidden="true"></i>
</button>
</div>
<div>
<div id="settingsBtnDiv">
<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>
......
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