Skip to content

GitLab

MetaGer
MetaGer
Commit 16dfb70c authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files
Options

Refactoring für less-Dateien

parent f04a638b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 337 deletions
public/css/theme.css.php
View file @ 16dfb70c
<?php
header("Content-type: text/css");
$color = "rgb(255, 128, 0)";
$color = "rgb(255, 128, 0)";
$colorRGBA = "rgba(255, 128, 0, 1)";
if (isset($_GET['r']) && isset($_GET['g']) && isset($_GET['b']) && isset($_GET['a'])) {
$color = "rgb(" . $_GET['r'] . "," . $_GET['g'] . "," . $_GET['b'] . ")";
$color = "rgb(" . $_GET['r'] . "," . $_GET['g'] . "," . $_GET['b'] . ")";
$colorRGBA = "rgba(" . $_GET['r'] . "," . $_GET['g'] . "," . $_GET['b'] . "," . $_GET['a'] . ")";
}
?>
......@@ -18,11 +18,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
border-color: <?=$colorRGBA?>;
}
#mglogo > a {
color: rgb(255,128,0);
}
.logo h1{
color: <?=$color?>;
}
......@@ -42,7 +37,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
.navbar, #navbar-static-pages {
border-bottom: 3px solid <?=$color?>;
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
}
.lSPrev > i, .lSNext > i {
......
resources/assets/less/metager/beitritt.less
View file @ 16dfb70c
......@@ -91,11 +91,6 @@
* {
font-size: 12px!important;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
......
resources/assets/less/metager/general.less
View file @ 16dfb70c
......@@ -55,6 +55,11 @@ body {
}
}
.navbar,
#navbar-static-pages {
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
}
/* General font sizing */
......@@ -97,72 +102,36 @@ p {
/* Logo */
.logo h1,
h1.mg-logo {
.logo {
color: rgb(255, 128, 0);
font-family: Liberation Sans, sans-serif;
font-style: italic;
font-weight: bold;
white-space: nowrap;
}
#mglogo {
color: rgb(255, 128, 0);
#startpage-logo {
.logo;
margin: 0px 0px 45px 0px;
white-space: nowrap;
text-align: center;
&>a {
.logo;
display: block;
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;
border-radius: .25em;
margin: 0 auto;
font-size: 75px;
@media(max-width: @screen-xs-max) {
font-size: 50px;
}
}
}
.metager-logo {
height: 18px;
float: left;
margin: 6px;
}
.metager-searchinput {
height: 30px;
float: left;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857;
color: #555;
background-color: #FFF;
background-image: none;
border: 1px solid #CCC;
margin: 0px;
}
.metager-searchbutton {
height: 30px;
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;
}
.logo {
height: 30px!important;
&>h1 {
#subpage-logo {
padding: 5px 0;
a h1 {
.logo;
font-size: 30px;
margin: 0;
}
}
......@@ -171,8 +140,9 @@ h1.mg-logo {
.mutelink {
&,
&:focus,
&:hover,
&:active,
&:focus,
&:visited {
color: inherit;
}
......@@ -201,77 +171,6 @@ summary {
}
/* New Feature Badge */
.new-feature.badge {
background-color: @new-feature-badge-background-color;
}
/* Box to match Image size */
.imagebox {
display: flex;
a {
display: flex;
}
}
/* Unsorted */
.bold {
font-weight: bold;
}
.noprint {
@media print {
display: none!important;
}
}
.newpage {
page-break-after: always;
}
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;
}
.navbar-brand>div.logo {
height: 100%;
}
}
.modal-content {
border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
-moz-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
}
label a {
color: inherit;
&:hover {
text-decoration: none;
color: inherit;
}
}
button {
border: none;
}
/* Tooltips
*
* Für alle Elemente mit einem "data-tooltip"-Attribut wird ein
......@@ -322,6 +221,9 @@ button {
}
}
/* For Containers that are supposed to split their content up into two columns */
.two-col {
>* {
width: 50%;
......@@ -336,7 +238,7 @@ button {
/* Links */
// Intern, aber anderes Design als die Startseite
// Internal, but design differs from other pages
.inlink {
&:after {
display: inline-block;
......@@ -348,7 +250,7 @@ button {
}
}
// Extern
// External
.outlink {
&:after {
display: inline-block;
......@@ -358,4 +260,52 @@ button {
-webkit-font-smoothing: antialiased;
content: "\f08e";
}
}
/* Little helpers */
.bold {
font-weight: bold;
}
.noprint {
@media print {
display: none!important;
}
}
.newpage {
page-break-after: always;
}
.disabled,
.disabled * {
color: #aaa !important;
cursor: not-allowed !important;
}
.overflow-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Unsorted */
// Currently in use for the plugin modal
.modal-content {
border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
-moz-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
}
label a {
color: inherit;
&:hover {
text-decoration: none;
color: inherit;
}
}
\ No newline at end of file
resources/assets/less/metager/metager.less
View file @ 16dfb70c
......@@ -9,4 +9,5 @@
@import "./footer.less";
@import "./searchbar.less";
@import "./aufruf-winter.less";
@import "./cards.less";
\ No newline at end of file
@import "./cards.less";
@import "./widget.less";
\ No newline at end of file
resources/assets/less/metager/quicktips.less
View file @ 16dfb70c
......@@ -20,9 +20,7 @@
background-color: white;
details:not([open=""]) {
.quicktip-summary p {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.overflow-ellipsis;
}
}
.quicktip-summary {
......@@ -86,10 +84,6 @@
font-size: 14px;
}
}
.gefVon {
float: right;
font-size: 15px;
}
&[type=spruch] {
order: 0;
border-left: 3px solid #070;
......
resources/assets/less/metager/result-page.less
View file @ 16dfb70c
......@@ -4,7 +4,17 @@
@import "./result-saver.less";
@import "./result.less";
@import "./product.less";
//
#header-logo {
z-index: 0;
padding-right: 10px;
h1 {
.logo;
margin: 0px;
font-size: 18px;
display: inline-block;
}
}
body {
&#resultBody {
background-image: inherit;
......@@ -82,16 +92,6 @@ body {
padding: 0px
}
.logo {
height: 35px;
padding: 5px 0;
&>a {
line-height: 100%;
height: 100%;
display: block;
}
}
.input-group-addon {
padding: 0;
}
......@@ -105,15 +105,6 @@ nav .input-group {
padding: 5px 0;
}
.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;
......@@ -145,9 +136,7 @@ a {
}
#spenden {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.overflow-ellipsis;
}
#spruch {
......@@ -178,28 +167,6 @@ a {
border: 1px dotted black;
}
#logo-searchbar-container {
display: flex;
@media (max-width: @screen-xs-max) {
flex-direction: column;
}
}
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
font-style: italic;
margin: 0;
font-weight: bold;
line-height: 1;
white-space: nowrap;
}
p.mg-logo {
font-size: 18px;
display: inline-block;
}
#header-searchbar {
flex-grow: 1;
}
......@@ -280,12 +247,6 @@ p.mg-logo {
}
}
.disabled,
.disabled * {
color: #aaa !important;
cursor: not-allowed !important;
}
#searchplugin {
display: none;
position: fixed;
......@@ -350,14 +311,6 @@ p.mg-logo {
flex-direction: column;
}
#header-logo {
z-index: 0;
padding-right: 10px;
a h1 {
margin: 0px;
}
}
@result-width: 700px;
@quicktip-width: 500px;
@results-margin-left: @resultpage-leftbox-big-screen-margin-left;
......
resources/assets/less/metager/result.less
View file @ 16dfb70c
......@@ -14,9 +14,7 @@
justify-content: space-between;
.result-title {
margin: 0px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
.overflow-ellipsis;
a {
&,
&:active,
......@@ -37,10 +35,8 @@
}
}
.result-link {
.overflow-ellipsis;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: @result-font-small;
width: fit-content;
max-width: 100%;
......
resources/assets/less/metager/specific.less
View file @ 16dfb70c
......@@ -25,15 +25,6 @@ textarea#message {
margin-bottom: 5px;
}
.wikiqtextract {
font-family: Georgia, "Times New Roman", Palatino, Times, serif;
}
.language-textarea {
resize: none;
overflow: hidden;
}
.language-name {
white-space: pre;
}
......@@ -81,14 +72,6 @@ textarea#message {
font-size: 12px;
}
.beitritt-form-group {
text-align: left;
}
.fokus-category {
font-size: 20px;
}
.checkbox {
margin-top: 5px;
margin-bottom: 5px;
......@@ -103,10 +86,6 @@ textarea#message {
font-size: 12px;
}
.wikiqtextract p {
margin-bottom: 0;
}
i.fa {
background-color: transparent;
}
......@@ -199,13 +178,6 @@ main {
}
}
.searchform-bonus {
list-style-type: none;
text-align: center;
margin-left: 0!important;
margin-top: 10px;
}
.panel-title {
font-weight: bold;
}
......
resources/assets/less/metager/start-page.less
View file @ 16dfb70c
/* Startseite */
@search-bar-width: 1000px;
#mglogo {
font-size: 75px;
@media(max-width: @screen-xs-max) {
font-size: 50px;
}
}
.mg-panel {
flex-grow: 1;
display: flex;
......@@ -19,9 +12,6 @@
@media(min-width: @search-bar-width) {
width: @search-bar-width;
}
#mglogo {
margin: 0px 0px 45px 0px;
}
.settings-modal-buttons {
padding: 5px;
button {
......
resources/assets/less/metager/variables.less
View file @ 16dfb70c
@metager-orange: rgb(255,128,0);
@metager-orange: rgb(255, 128, 0);
// General
@color-white: white;
@color-almost-white: mix(@color-white, @color-black, 90%);
......@@ -60,7 +60,6 @@ sans-serif;
@base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
@base-new-feature-badge-background-color: #f80;
/* Unsorted */
......@@ -103,7 +102,6 @@ sans-serif;
@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important;
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@new-feature-badge-background-color: @base-new-feature-badge-background-color;
//
@body-background-color: @result-page-body-background-color;
@hostlabel-a-link-or-visited-color: @result-page-color-white;
......
resources/assets/less/metager/widget.less 0 → 100644
View file @ 16dfb70c
.metager-searchinput {
height: 30px;
float: left;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857;
color: #555;
background-color: #FFF;
background-image: none;
border: 1px solid #CCC;
margin: 0px;
}
.metager-searchbutton {
height: 30px;
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: 18px;
float: left;
margin: 6px;
}
\ No newline at end of file
resources/lang/es/index.php
View file @ 16dfb70c
This diff is collapsed.
resources/views/index.blade.php
View file @ 16dfb70c
......@@ -5,7 +5,7 @@
@section('content')
@include('modals.create-focus-modal')
@include('modals.plugin-modal')
<h1 id="mglogo">
<h1 id="startpage-logo">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a>
</h1>
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
......
resources/views/layouts/researchandtabs.blade.php
View file @ 16dfb70c
<header>
<div id="research-bar">
<div id="header-logo">
<a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">MetaGer</h1></a>
<a class="visible-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">M</h1></a>
<a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<h1>MetaGer</h1>
</a>
<a class="visible-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<h1>M</h1>
</a>
</div>
<div id="header-searchbar">
@include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
......
resources/views/layouts/subPages.blade.php
View file @ 16dfb70c
@extends('layouts.staticPages')
@section('homeIcon')
<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<div class="logo">
<div id="subpage-logo">
<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<h1>MetaGer</h1>
</div>
</a>
</a>
</div>
@endsection
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