Commit 1f37f8fb authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '483-style-und-funktionsfehler-nach-merge-beheben' into 'development'

Resolve "Style und Funktionsfehler nach Merge beheben"

Closes #483

See merge request !843
parents 86a7c40d 9250b688
......@@ -6,3 +6,4 @@ Homestead.json
Homestead.yaml
.env
.orig
.vscode
\ No newline at end of file
#!/bin/bash
rm -R public/build/
gulp -production
\ No newline at end of file
This diff is collapsed.
......@@ -384,7 +384,7 @@ function addFocus (focus, active = false) {
// create <a> icon
var focusElementIcon = document.createElement('i')
focusElementIcon.classList.add('fa')
focusElementIcon.classList.add('fa-cog')
focusElementIcon.classList.add('fa-star')
focusElementIcon.setAttribute('aria-hidden', 'true')
// create <span> focusname
var focusElementName = document.createElement('span')
......
......@@ -49,8 +49,16 @@ function setActionListeners () {
$('#addFocusBtn').click(function () {
showFocusCreateDialog('')
})
$('.save-focus-btn').click(saveFocus)
$('.delete-focus-btn').click(deleteFocus)
$('.save-focus-btn').click(saveFocus);
$('.delete-focus-btn').click(deleteFocus);
$('#focus-name').keyup(function (event) {
if (event.keyCode == 13) {
$('#save-focus-btn').click()
}
})
$('#create-focus-modal').on('shown.bs.modal', function () {
$('#focus-name').focus()
})
}
function setSettings () {
......
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-e3ad18a4a0.js",
"js/scriptStartPage.js": "js/scriptStartPage-f63fab5e8d.js",
"js/scriptResultPage.js": "js/scriptResultPage-f8cfabc6d9.js",
"js/scriptStartPage.js": "js/scriptStartPage-be605a6afa.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
* {
font-family: Liberation Sans, sans-serif;
}
.hostlabel a:link, .hostlabel a:visited {
color: #FFFFFF;
}
.hostlabel {
display: none;
position: relative;
margin-top: -14px;
background-color: #333;
}
.img:hover .hostlabel {
display: block;
}
.row {
margin: 10px 15px;
margin-top: 0;
}
.nav-tabs > li.active {}
nav-tabs > li.active {
border-bottom: 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 */
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
}
.alert ul {
list-style-type: none;
padding-left: 49px;
}
/* Logo */
.logo {
height: 35px;
padding: 5px 0;
}
.logo > a {
line-height: 100%;
height: 100%;
display: block;
}
#research ul.list-inline {
margin-left: 0;
width: 100%;
}
@media (max-width: 767px) {
#research .visible-xs {
display: inline-block!important;
}
}
.input-group-addon {
padding: 0;
}
input#eingabeTop {
height: 35px;
}
nav .input-group {
height: 35px;
padding: 5px 0;
}
header nav {
height: 100%;
display: table;
}
header ul {
height: 100%;
vertical-align: middle;
display: table-row;
}
header li.pull-left.visible-xs {
float: left !important;
width: auto;
}
header li.pull-right {
width: 100% !important;
float: none !important;
display: table-cell;
}
#research nav ul > li {
width: 20%;
height: 45px;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul > li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul li + li + li {
width: 80%;
}
#research {
background-color: white;
position: fixed;
top: 0;
width: 100%;
height: 55px;
z-index: 500;
width: 80%;
left: 50%;
margin-left: -40%;
}
.logo h1 {
font-family: Liberation Sans, sans-serif;
font-style: italic;
margin: 0;
font-weight: bold;
line-height: 1;
white-space: nowrap;
}
#search {
background-color: inherit;
border: 0;
width: 50px;
height: 100%;
}
#reSearch a {
color: black;
}
.content-wrapper {
width: 80%;
margin: 0 auto;
padding-top: 60px;
/* padding: 10px; */
background-color: white;
-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);
}
#helpButton {
color: black;
}
body {
height: 100%;
background-image: inherit;
background-color: rgba(2, 93, 140, .03);
}
a:link {
color: #0000FF;
font-size: 12px;
}
a#donation:hover {}
a#donation, a#donation:visited {
color: inherit;
}
a#donation:hover {
color: red;
}
a:visited {
color: #792ea1;
}
a:hover {
text-decoration: none;
color: red;
}
/* Hier der Style für unsere Tabliste */
#foki {
background-color: white;
}
#foki a {
color: grey;
}
#foki li.active a {
color: black;
background-color: white;
}
#foki li.active a i + span {
display: inline!important;
margin-left: 5px;
}
#foki li a i + span {
margin-left: 5px;
}
/* Hier der Style für unseren Spruch */
#spruch {
padding: 10px;
margin-bottom: 0;
padding-bottom: 10px;
padding-left: 65px;
color: green;
font-weight: bold;
}
#spenden {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
#spruch .author {
font-size: 80%;
font-weight: normal;
font-style: italic;
color: #333333;
}
#spruch > p {
margin-bottom: 0;
}
#spruch > p + p {
margin-top: 4px;
}
/* Hier der Style für die einzelnen Ergebnisboxen */
p.link > a {
white-space: nowrap;
max-width: 50%;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding-right: 5px;
}
.result {
margin-bottom: 10px;
width: 100%
}
.result > .number {
font-size: 15px;
line-height: 1;
text-align: right;
}
.result > .resultInformation {
border-radius: 5px;
}
.result .title {
color: black;
text-decoration: none;
font-size: 14px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
line-height: 1.1;
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
}
.result.ad .title {
color: green;
}
.result .link {
font-size: 13px;
margin: 0;
line-height: 1.5;
}
.result .link-link {
white-space: nowrap;
max-width: 60%;
overflow: hidden;
text-overflow: ellipsis;
float: left;
}
.result:not(.ad) .link > div {
white-space: nowrap;
}
.result:not(.ad) .link > span {
white-space: nowrap;
margin: 0 5px;
}
.result:not(.ad) .link .options {
color: #333;
float: left;
}
.result:not(.ad) .link:hover {
cursor: pointer;
}
.result:not(.ad) .link .options > a {
color: #333;
display: block;
padding-left: 5px;
padding-right: 5px;
}
.result:not(.ad) .link .options > a > span {
font-size: 10px;
}
.result .description {
margin-bottom: 3px;
color: black;
font-size: 14px;
line-height: 1.3;
clear: both;
}
.result .description p {
margin: 0;
margin-bottom: 4px;
}
.result .description img {
margin: 5px;
margin-left: 0;
margin-right: 15px;
height: auto;
width: auto;
max-width: 120px;
max-height: 200px
}
.result.ad .description {
color: green;
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.result:not(.ad) .hoster {
font-size: 13px;
margin: 0;
color: #777;
margin-right: 10px;
white-space: nowrap;
}
.result:not(.ad) .hoster a {
color: #333;
}
.result .result-image > img {
height: 100px;
padding: 10px;
}
.result .proxy {
font-size: 13px;
margin-top: 0;
white-space: nowrap;
}
.result .partnershop-info {
font-size: 13px;
margin-top: 0;
margin-left: 10px;
}
.result .proxy img {
margin-bottom: 0px;
margin-right: 2px
}
.description-container {
margin: 0!important;
}
.result .image > img {
max-width: 100%;
}
.options-list > li:hover {
background-color: lightgrey;
}
.options-list > li > a {
color: #333;
white-space: nowrap;
display: block;
padding: 5px 14px;
}
.options-list > li input[type=submit] {
width: 100%;
background-color: transparent;
border: 0;
margin: 5px 0;
}
.container-fluid {
padding-top: 15px;
padding-bottom: 15px;
background-color: white;
}
#quicktips iframe {
width: 100%;
height: 1000px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
}
/* Hier der Style für die Bilder */
#fit-width .masonry {
margin: 0 auto;
}
.item {
width: 150px;
text-align: center;
margin-bottom: 10px;
}
#container {
margin: 10px auto;
}
/* Hier der Style für die Werbeboxen */
.result.ad .hoster {
color: green;
}
/* Style für den Footer */
footer {
text-align: center;
}
footer a {
color: black!important;
}
/* Ein resetter für Floats */
.clearfix {
clear: both;
}
/* Placeholder für ladende Tabs */
.loader {
text-align: center;
margin-top: 20px;
}
.loader > img {
width: 30px;
}
.pager {
text-align: center;
}
#searchplugin {
display: none;
position: fixed;
top: 50px;
right: 10px;
z-index: 501;
width: 25%;
}
#searchplugin > div {
text-align: center;
padding-top: 5px;
}
#searchplugin > div > a {
color: white;
}
@media(min-width: 768px) {
#searchplugin {
display: initial;
}
}
.product {
text-align: center;
border: 1px dotted lightgrey;
padding: 5px;
max-width: 150px;
}
.product a {
color: #333;
}
.product .price {
position: relative;
top: 20px;
background-color: rgba(255, 255, 255, 0.9);
color: #333;
text-align: left;
width: 80px;
font-weight: bold;
}
.product .title {
font-size: 12px;
font-weight: bold;
text-align: left;
max-height: 31px;
overflow: hidden;
margin-bottom: 4px;
}
.product .shop {
font-size: 10px;
text-align: left;
color: green;