Merge branch '286-gulp-fur-less-einrichten' into 'development'

Metager styles laufen jetzt mit less



See merge request !481

public/css/themes/default.css

@@ -6672,6 +6672,534 @@ button.close {
     display: none !important;
   }
 }
+/* 
+
+
+
+
+
+By ID 
+
+
+
+
+
+*/
+#color-chooser {
+  padding: 0;
+}
+#moreInformation {
+  box-shadow: none;
+  margin-top: 5%;
+  text-align: center;
+  -moz-box-shadow: none;
+}
+#mglogo {
+  width: 100%;
+  text-align: center;
+}
+#spruch {
+  margin-bottom: 20px;
+  padding: 5px;
+  line-height: 1.2;
+  color: #070;
+  border-left: 3px solid #070;
+  font-size: 16px;
+  font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+}
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+#color-chooser #standard {
+  background-color: #ffc26b;
+}
+#color-chooser #standardHard {
+  background-color: #ff8000;
+}
+#color-chooser #green {
+  background-color: #b1e2a3;
+}
+#color-chooser #greenHard {
+  background-color: #7faf1b;
+}
+#color-chooser #blue {
+  background-color: #a4c0e6;
+}
+#color-chooser #blueHard {
+  background-color: #025d8c;
+}
+#color-chooser #red {
+  background-color: #ff5c5c;
+}
+#color-chooser #redHard {
+  background-color: #ff0000;
+}
+#color-chooser #pink {
+  background-color: #ffc4f6;
+}
+#color-chooser #pinkHard {
+  background-color: #fe4365;
+}
+#color-chooser #black {
+  background-color: #eeeeee;
+}
+#color-chooser #blackHard {
+  background-color: #323232;
+}
+#mglogo > a {
+  display: block;
+  width: 200px;
+  text-decoration: none;
+  font-size: 1.1em;
+  font-family: Liberation Sans, sans-serif;
+  font-weight: bold;
+  font-style: italic;
+  font-size: 1.0em;
+  line-height: 1;
+  white-space: nowrap;
+  padding: 0.4em 0;
+  border-radius: .25em;
+  margin: 0 auto;
+}
+#sponsors a {
+  font-size: 0.8em;
+}
+#sponsors h2 {
+  font-size: 1.5em;
+}
+#foki label > span {
+  margin-right: 5px;
+}
+#foki label span {
+  background-color: transparent;
+}
+#foki input {
+  visibility: hidden;
+}
+#foki input:checked + label {
+  font-weight: bold;
+  background-color: #e3e3e3;
+}
+#foki input + label {
+  border-radius: 4px;
+  padding: 7px 20px;
+  font-weight: normal;
+}
+#foki input + label:hover {
+  cursor: pointer;
+  background-color: #f6f6f6;
+}
+#color-chooser a {
+  display: block;
+  width: 50px;
+  height: 50px;
+}
+#color-chooser li {
+  width: 50px;
+  margin: 0;
+}
+#moreInformation ul {
+  padding: 0;
+}
+#moreInformation ul li {
+  color: grey;
+}
+#moreInformation > div {
+  font-size: 15px;
+}
+#moreInformation h2 {
+  color: grey;
+  font-size: 25px;
+}
+#moreInformation a:hover {
+  text-decoration: underline;
+}
+#searchForm button {
+  width: 50px;
+  line-height: 100%;
+  height: 28px;
+  border: 0;
+  background-color: transparent;
+  padding: 0;
+}
+li#info {
+  white-space: pre-line;
+}
+main fieldset#foki {
+  margin: 5px 0;
+  text-align: center;
+}
+div#right {
+  background-color: #FFDCC1;
+  border-radius: 5px;
+  padding: 20px;
+  padding-top: 0;
+}
+div#right p {
+  white-space: normal;
+  border-bottom: 1px solid black;
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+}
+div#left {
+  padding-right: 35px;
+}
+textarea#message {
+  height: 200px;
+}
+#anpassen-label a.content {
+  color: inherit;
+}
+#plugin-modal ol > li {
+  margin-bottom: 5px;
+}
+/* 
+
+
+
+
+
+By Class 
+
+
+
+
+
+*/
+.quicktip {
+  margin-bottom: 15px;
+  padding: 10px;
+  line-height: 1.2 !important;
+  font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+  color: #000;
+  border-left: 3px solid #FB0;
+  font-size: 14px;
+}
+.wikiqtextract {
+  font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+}
+.qtheader {
+  font-family: verdana, arial, helvetica, sans-serif;
+}
+.author {
+  float: right !important;
+}
+.language-textarea {
+  resize: none;
+  overflow: hidden;
+}
+.language-name {
+  white-space: pre;
+}
+.navbar-default {
+  background-color: white;
+  border-radius: 0;
+}
+.row {
+  margin-left: 0;
+  margin-right: 0;
+}
+.mg-panel {
+  text-align: left;
+  margin: 0 auto;
+  margin-top: 20px;
+  padding: 10px 20px;
+  margin-bottom: 0;
+  /*! background-color: white; */
+  box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+}
+.input-group-addon {
+  padding: 0;
+}
+.form-group {
+  font-family: sans-serif;
+  font-size: 16px;
+  color: black;
+  background-color: transparent;
+  text-align: center;
+}
+.kontakt-form-group {
+  text-align: left;
+  font-size: 14px;
+}
+.metager-searchinput {
+  height: 30px;
+  padding: 6px 12px;
+  font-size: 14px;
+  line-height: 1.42857;
+  color: #555;
+  background-color: #FFF;
+  background-image: none;
+  border: 1px solid #CCC;
+  border-right: 0px none;
+  border-radius: 4px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  margin: 0px;
+}
+.metager-searchbutton {
+  height: 30px;
+  width: 100px;
+  border-left: 0px none;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border: 1px solid #CCC;
+  padding: 6px 12px;
+  margin: 0px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1;
+  white-space: nowrap;
+  color: #555;
+  text-align: center;
+  background-color: #EEE;
+}
+.metager-logo {
+  height: 30px;
+  float: left;
+  top: -2px;
+  margin-right: 3px;
+}
+.mutelink {
+  color: inherit;
+}
+.dotlist {
+  list-style-type: disc;
+  text-align: left;
+}
+.well-sm {
+  margin: 10px 0px;
+}
+.subheading {
+  font-size: 20px;
+  margin: 20px 0px;
+  white-space: pre-wrap;
+}
+.donation-form-group {
+  text-align: left;
+  font-size: 12px;
+}
+.beitritt-form-group {
+  text-align: left;
+}
+.modal-content {
+  border-radius: 0;
+  box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+}
+.bold {
+  font-weight: bold;
+}
+.settings-btn {
+  margin-top: 25px;
+}
+.fokus-category {
+  font-size: 20px;
+}
+.settings-form-control {
+  width: 200px;
+  margin-top: 10px;
+}
+.bitcoins {
+  text-align: center;
+}
+.checkbox {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+.non-bold {
+  font-weight: normal;
+}
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+.quicktip.aufruf {
+  border-left: 3px solid #FF4000;
+  color: #FF4000;
+}
+.settings-checkbox .settings-glyphicon {
+  margin-left: 5px;
+  font-size: 12px;
+}
+.settings-btn + .settings-btn {
+  margin-left: 10px;
+}
+.wikiqtextract p {
+  margin-bottom: 0;
+}
+footer ul.list-inline {
+  width: 100%;
+}
+span.glyphicon {
+  background-color: transparent;
+}
+a.content.hidden-xs {
+  color: #333;
+}
+a.navbar-brand {
+  line-height: 100%!important;
+  padding: 0;
+}
+nav .navbar-brand > div.logo {
+  height: 100%;
+}
+.dotlist li {
+  margin-bottom: 5px;
+}
+form.contact {
+  max-width: 500px;
+}
+label.select-label {
+  margin-bottom: 0;
+  margin-top: 10px;
+}
+@media print {
+  .noprint {
+    display: none!important;
+  }
+}
+.donation-form-group label {
+  font-weight: bold;
+}
+.quicktip h1 {
+  font-size: 22px;
+  margin-top: 0px;
+}
+/* 
+
+
+
+
+
+By Element 
+
+
+
+
+
+*/
+* {
+  font-family: Liberation Sans, sans-serif;
+}
+section {
+  padding: 10px;
+  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;
+}
+header {
+  position: fixed;
+  background-color: white;
+  z-index: 500;
+  width: 100%;
+  height: 50px;
+}
+address {
+  white-space: pre;
+}
+p {
+  white-space: pre-wrap;
+}
+form {
+  margin: 10px 0px;
+}
+code {
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  word-break: break-word;
+}
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+label a {
+  color: inherit;
+}
+label a:hover {
+  text-decoration: none;
+  color: inherit;
+}
+footer li {
+  width: 33%;
+  text-align: center;
+}
+footer img {
+  max-width: 100%;
+}
+main ul li {
+  margin: 0 10px;
+}
+body ul {
+  list-style-type: none;
+  text-align: center;
+  margin-left: 0!important;
+  margin-top: 10px;
+}
+fieldset input[type=text] {
+  width: 100%;
+  padding-left: 10px;
+  padding-right: 10px;
+  border-width: 1px;
+  overflow: visible;
+}
+main fieldset {
+  border: 0;
+}
+nav h1 {
+  height: 100%;
+  padding-left: 20px;
+  padding-top: 8px;
+  font-family: sans-serif;
+  font-style: italic;
+  margin: 0;
+  font-weight: bold;
+  line-height: 1;
+  white-space: nowrap;
+}
+body > div {
+  /*! background-color: transparent; */
+  padding-top: 70px;
+}
+a:hover {
+  cursor: pointer;
+}
 body {
   background-color: #fafafa;
   background-attachment: fixed;

resources/assets/less/default.less

 @import "./bootstrap/bootstrap.less";
+@import "./metager/metager.less";
 
 body{
 	background-color: rgb(250, 250, 250);

resources/assets/less/metager/metager.less

+/* 
+
+
+
+
+
+By ID 
+
+
+
+
+
+*/
+
+#color-chooser {
+    padding: 0;
+}
+
+#moreInformation {
+    box-shadow: none;
+    margin-top: 5%;
+    text-align: center;
+    -moz-box-shadow: none;
+}
+
+#mglogo {
+    width: 100%;
+    text-align: center;
+}
+
+#spruch {
+    margin-bottom: 20px;
+    padding: 5px;
+    line-height: 1.2;
+    color: #070;
+    border-left: 3px solid #070;
+    font-size: 16px;
+    font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+}
+
+
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+
+#color-chooser #standard {
+    background-color: rgb(255, 194, 107);
+}
+
+#color-chooser #standardHard {
+    background-color: rgb(255, 128, 0);
+}
+
+#color-chooser #green {
+    background-color: rgb(177, 226, 163);
+}
+
+#color-chooser #greenHard {
+    background-color: rgb(127, 175, 27);
+}
+
+#color-chooser #blue {
+    background-color: rgb(164, 192, 230);
+}
+
+#color-chooser #blueHard {
+    background-color: rgb(2, 93, 140);
+}
+
+#color-chooser #red {
+    background-color: rgb(255, 92, 92);
+}
+
+#color-chooser #redHard {
+    background-color: rgb(255, 0, 0);
+}
+
+#color-chooser #pink {
+    background-color: rgb(255, 196, 246);
+}
+
+#color-chooser #pinkHard {
+    background-color: rgb(254, 67, 101);
+}
+
+#color-chooser #black {
+    background-color: rgb(238, 238, 238);
+}
+
+#color-chooser #blackHard {
+    background-color: rgb(50, 50, 50);
+}
+
+#mglogo > a {
+    display: block;
+    width: 200px;
+    text-decoration: none;
+    font-size: 1.1em;
+    font-family: Liberation Sans, sans-serif;
+    font-weight: bold;
+    font-style: italic;
+    font-size: 1.0em;
+    line-height: 1;
+    white-space: nowrap;
+    padding: 0.4em 0;
+    border-radius: .25em;
+    margin: 0 auto;
+}
+
+#sponsors a {
+    font-size: 0.8em;
+}
+
+#sponsors h2 {
+    font-size: 1.5em;
+}
+
+#foki label > span {
+    margin-right: 5px;
+}
+
+#foki label span {
+    background-color: transparent;
+}
+
+#foki input {
+    visibility: hidden;
+}
+
+#foki input:checked + label {
+    font-weight: bold;
+    background-color: #e3e3e3;
+}
+
+#foki input + label {
+    border-radius: 4px;
+    padding: 7px 20px;
+    font-weight: normal;
+}
+
+#foki input + label:hover {
+    cursor: pointer;
+    background-color: #f6f6f6;
+}
+
+#color-chooser a {
+    display: block;
+    width: 50px;
+    height: 50px;
+}
+
+#color-chooser li {
+    width: 50px;
+    margin: 0;
+}
+
+#moreInformation ul {
+    padding: 0;
+}
+
+#moreInformation ul li {
+    color: grey;
+}
+
+#moreInformation > div {
+    font-size: 15px;
+}
+
+#moreInformation h2 {
+    color: grey;
+    font-size: 25px;
+}
+
+#moreInformation a:hover {
+    text-decoration: underline;
+}
+
+#searchForm button {
+    width: 50px;
+    line-height: 100%;
+    height: 28px;
+    border: 0;
+    background-color: transparent;
+    padding: 0;
+}
+
+li#info {
+    white-space: pre-line;
+}
+
+main fieldset#foki {
+    margin: 5px 0;
+    text-align: center;
+}
+
+div#right {
+    background-color: #FFDCC1;
+    border-radius: 5px;
+    padding: 20px;
+    padding-top: 0;
+}
+
+div#right p {
+    white-space: normal;
+    border-bottom: 1px solid black;
+    margin-bottom: 15px;
+    padding-bottom: 15px;
+}
+
+div#left {
+    padding-right: 35px;
+}
+
+textarea#message {
+    height: 200px;
+}
+
+#anpassen-label a.content {
+    color: inherit;
+}
+
+#plugin-modal ol > li {
+    margin-bottom: 5px;
+}
+
+
+/* 
+
+
+
+
+
+By Class 
+
+
+
+
+
+*/
+
+.quicktip {
+    margin-bottom: 15px;
+    padding: 10px;
+    line-height: 1.2 !important;
+    font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+    color: #000;
+    border-left: 3px solid #FB0;
+    font-size: 14px;
+}
+
+.wikiqtextract {
+    font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+}
+
+.qtheader {
+    font-family: verdana, arial, helvetica, sans-serif;
+}
+
+.author {
+    float: right !important;
+}
+
+.language-textarea {
+    resize: none;
+    overflow: hidden;
+}
+
+.language-name {
+    white-space: pre;
+}
+
+.navbar-default {
+    background-color: white;
+    border-radius: 0;
+}
+
+.row {
+    margin-left: 0;
+    margin-right: 0;
+}
+
+.mg-panel {
+    text-align: left;
+    margin: 0 auto;
+    margin-top: 20px;
+    padding: 10px 20px;
+    margin-bottom: 0;
+    /*! 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);
+}
+
+.input-group-addon {
+    padding: 0;
+}
+
+.form-group {
+    font-family: sans-serif;
+    font-size: 16px;
+    color: black;
+    background-color: transparent;
+    text-align: center;
+}
+
+.kontakt-form-group {
+    text-align: left;
+    font-size: 14px;
+}
+
+.metager-searchinput {
+    height: 30px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857;
+    color: #555;
+    background-color: #FFF;
+    background-image: none;
+    border: 1px solid #CCC;
+    border-right: 0px none;
+    border-radius: 4px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    margin: 0px;
+}
+
+.metager-searchbutton {
+    height: 30px;
+    width: 100px;
+    border-left: 0px none;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border: 1px solid #CCC;
+    padding: 6px 12px;
+    margin: 0px;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1;
+    white-space: nowrap;
+    color: #555;
+    text-align: center;
+    background-color: #EEE;
+}
+
+.metager-logo {
+    height: 30px;
+    float: left;
+    top: -2px;
+    margin-right: 3px;
+}
+
+.mutelink {
+    color: inherit;
+}
+
+.dotlist {
+    list-style-type: disc;
+    text-align: left;
+}
+
+.well-sm {
+    margin: 10px 0px;
+}
+
+.subheading {
+    font-size: 20px;
+    margin: 20px 0px;
+    white-space: pre-wrap;
+}
+
+.donation-form-group {
+    text-align: left;
+    font-size: 12px;
+}
+
+.beitritt-form-group {
+    text-align: left;
+}
+
+.modal-content {
+    border-radius: 0;
+    -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);
+}
+
+.bold {
+    font-weight: bold;
+}
+
+.settings-btn {
+    margin-top: 25px;
+}
+
+.fokus-category {
+    font-size: 20px;
+}
+
+.settings-form-control {
+    width: 200px;
+    margin-top: 10px;
+}
+
+.bitcoins {
+    text-align: center;
+}
+
+.checkbox {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.non-bold {
+    font-weight: normal;
+}
+
+
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+
+.quicktip.aufruf {
+    border-left: 3px solid #FF4000;
+    color: #FF4000;
+}
+
+.settings-checkbox .settings-glyphicon {
+    margin-left: 5px;
+    font-size: 12px;
+}
+
+.settings-btn + .settings-btn {
+    margin-left: 10px;
+}
+
+.wikiqtextract p {
+    margin-bottom: 0;
+}
+
+footer ul.list-inline {
+    width: 100%;
+}
+
+span.glyphicon {
+    background-color: transparent;
+}
+
+a.content.hidden-xs {
+    color: #333;
+}
+
+a.navbar-brand {
+    line-height: 100%!important;
+    padding: 0;
+}
+
+nav .navbar-brand > div.logo {
+    height: 100%;
+}
+
+.dotlist li {
+    margin-bottom: 5px;
+}
+
+form.contact {
+    max-width: 500px;
+}
+
+label.select-label {
+    margin-bottom: 0;
+    margin-top: 10px;
+}
+
+@media print {
+    .noprint {
+        display: none!important;
+    }
+}
+
+.donation-form-group label {
+    font-weight: bold;
+}
+
+.quicktip h1 {
+    font-size: 22px;
+    margin-top: 0px;
+}
+
+
+/* 
+
+
+
+
+
+By Element 
+
+
+
+
+
+*/
+
+* {
+    font-family: Liberation Sans, sans-serif;
+}
+
+section {
+    padding: 10px;
+    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);
+    -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;
+    z-index: 500;
+    width: 100%;
+    height: 50px;
+}
+
+address {
+    white-space: pre;
+}
+
+p {
+    white-space: pre-wrap;
+}
+
+form {
+    margin: 10px 0px;
+}
+
+code {
+    white-space: pre-wrap;
+    overflow-wrap: break-word;
+    word-break: break-word;
+}
+
+
+/* 
+
+
+
+
+
+Mixed 
+
+
+
+
+
+*/
+
+label a {
+    color: inherit;
+}
+
+label a:hover {
+    text-decoration: none;
+    color: inherit;
+}
+
+footer li {
+    width: 33%;
+    text-align: center;
+}
+
+footer img {
+    max-width: 100%;
+}
+
+main ul li {
+    margin: 0 10px;
+}
+
+body ul {
+    list-style-type: none;
+    text-align: center;
+    margin-left: 0!important;
+    margin-top: 10px;
+}
+
+fieldset input[type=text] {
+    width: 100%;
+    padding-left: 10px;
+    padding-right: 10px;
+    border-width: 1px;
+    overflow: visible;
+}
+
+main fieldset {
+    border: 0;
+}
+
+nav h1 {
+    margin: 0;
+    height: 100%;
+    padding-left: 20px;
+    padding-top: 8px;
+    font-family: sans-serif;
+    font-style: italic;
+    margin: 0;
+    font-weight: bold;
+    line-height: 1;
+    white-space: nowrap;
+}
+
+body > div {
+    /*! background-color: transparent; */
+    padding-top: 70px;
+}
+
+a:hover {
+    cursor: pointer;
+}
\ No newline at end of file

resources/views/layouts/staticPages.blade.php

@@ -18,7 +18,7 @@
 		<!--<link href="/css/bootstrap.css" rel="stylesheet" />
 		-->
 		<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
-		<link href="/css/style.css" rel="stylesheet" />
+		<!--<link href="/css/style.css" rel="stylesheet" />-->
 		@if (isset($css))
 			@if(is_array($css))
 				@foreach($css as $el)