From 80124dde2aae0d8834427f3e6e8ba5b1e2d6b68b Mon Sep 17 00:00:00 2001 From: Horus3 Date: Fri, 2 Dec 2016 21:23:07 +0100 Subject: Maintainable CSS+JS. --- gospeladlershof.de/config.toml | 2 +- gospeladlershof.de/static/css/gc.css.unused | 27 ----- gospeladlershof.de/static/css/theme.css | 174 ++++++++++++++++++++-------- gospeladlershof.de/static/js/js.min.js | 24 ---- 4 files changed, 129 insertions(+), 98 deletions(-) delete mode 100644 gospeladlershof.de/static/css/gc.css.unused delete mode 100644 gospeladlershof.de/static/js/js.min.js diff --git a/gospeladlershof.de/config.toml b/gospeladlershof.de/config.toml index 4693e56..c475f43 100644 --- a/gospeladlershof.de/config.toml +++ b/gospeladlershof.de/config.toml @@ -7,5 +7,5 @@ DisableRSS = 1 language = "de" author = "Maximilian Möhring" enablepiwik = 1 - jsmin = 1 + jsmin = 0 cssmin = 0 diff --git a/gospeladlershof.de/static/css/gc.css.unused b/gospeladlershof.de/static/css/gc.css.unused deleted file mode 100644 index 6a85595..0000000 --- a/gospeladlershof.de/static/css/gc.css.unused +++ /dev/null @@ -1,27 +0,0 @@ -aside -.no-padding -header .header-content .header-content-inner p -header .header-content .header-content-inner p -.service-box -.service-box -.service-box p -.portfolio-box -.portfolio-box .portfolio-box-caption -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category,.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name -.portfolio-box:hover .portfolio-box-caption -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category -.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name -.call-to-action h2 -.text-primary -.no-gutter > [class*='col-'] -.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled.focus,.btn-default[disabled].focus,fieldset[disabled] .btn-default.focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active -.btn-default .badge -.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled.focus,.btn-primary[disabled].focus,fieldset[disabled] .btn-primary.focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active -.btn-primary .badge -selection -selection -.btn-white -.osm-iframe diff --git a/gospeladlershof.de/static/css/theme.css b/gospeladlershof.de/static/css/theme.css index 27bde7b..7183e4b 100644 --- a/gospeladlershof.de/static/css/theme.css +++ b/gospeladlershof.de/static/css/theme.css @@ -1,9 +1,8 @@ /*! - * Creative v1.0.3 (http://startbootstrap.com/template-overviews/creative) + * Start Bootstrap - Creative v3.3.7+1 (http://startbootstrap.com/template-overviews/creative) * Copyright 2013-2016 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE) */ - html, body { height: 100%; @@ -13,7 +12,7 @@ body { font-family: 'Merriweather', 'Helvetica Neue', Arial, sans-serif; } hr { - border-color: #f05f40; + border-color: #F05F40; border-width: 3px; max-width: 50px; } @@ -24,7 +23,7 @@ a { -webkit-transition: all 0.35s; -moz-transition: all 0.35s; transition: all 0.35s; - color: #f05f40; + color: #F05F40; } a:hover, a:focus { @@ -44,7 +43,7 @@ p { margin-bottom: 20px; } .bg-primary { - background-color: #f05f40; + background-color: #F05F40; } .bg-dark { background-color: #222222; @@ -56,6 +55,12 @@ p { section { padding: 100px 0; } +aside { + padding: 50px 0; +} +.no-padding { + padding: 0; +} .navbar-default { background-color: white; border-color: rgba(34, 34, 34, 0.05); @@ -65,7 +70,7 @@ section { transition: all 0.35s; } .navbar-default .navbar-header .navbar-brand { - color: #f05f40; + color: #F05F40; font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif; font-weight: 700; text-transform: uppercase; @@ -74,6 +79,12 @@ section { .navbar-default .navbar-header .navbar-brand:focus { color: #eb3812; } +.navbar-default .navbar-header .navbar-toggle { + font-weight: 700; + font-size: 12px; + color: #222222; + text-transform: uppercase; +} .navbar-default .nav > li > a, .navbar-default .nav > li > a:focus { text-transform: uppercase; @@ -83,11 +94,11 @@ section { } .navbar-default .nav > li > a:hover, .navbar-default .nav > li > a:focus:hover { - color: #f05f40; + color: #F05F40; } .navbar-default .nav > li.active > a, .navbar-default .nav > li.active > a:focus { - color: #f05f40 !important; + color: #F05F40 !important; background-color: transparent; } .navbar-default .nav > li.active > a:hover, @@ -119,7 +130,7 @@ section { border-color: rgba(34, 34, 34, 0.05); } .navbar-default.affix .navbar-header .navbar-brand { - color: #f05f40; + color: #F05F40; font-size: 14px; } .navbar-default.affix .navbar-header .navbar-brand:hover, @@ -132,7 +143,7 @@ section { } .navbar-default.affix .nav > li > a:hover, .navbar-default.affix .nav > li > a:focus:hover { - color: #f05f40; + color: #F05F40; } } header { @@ -144,30 +155,30 @@ header { background-size: cover; -o-background-size: cover; background-position: center; - /*background-image: url('../img/chor16-9.jpg');*/ + /* background-image: url('../img/chor16-9.jpg');*/ text-align: center; color: white; background-color: #333; } -@media (min-width: 1081px) { - header{ - background-image: url('../img/chor16-9.jpg'); - } -} -@media (min-width: 720px) and (max-width: 1080px) { - header{ - background-image: url('../img/chor1080.jpg'); - } -} -@media (min-width: 480px) and (max-width: 719px) { - header{ - background-image: url('../img/chor720.jpg'); - } -} -@media (max-width: 479px) { - header{ - background-image: url('../img/chor480.jpg'); - } + @media (min-width: 1081px) { + header{ + background-image: url('../img/chor16-9.jpg'); + } + } + @media (min-width: 720px) and (max-width: 1080px) { + header{ + background-image: url('../img/chor1080.jpg'); + } + } + @media (min-width: 480px) and (max-width: 719px) { + header{ + background-image: url('../img/chor720.jpg'); + } + } + @media (max-width: 479px) { + header{ + background-image: url('../img/chor480.jpg'); + } } header .header-content { position: relative; @@ -180,6 +191,7 @@ header .header-content .header-content-inner h1 { text-transform: uppercase; margin-top: 0; margin-bottom: 0; + font-size: 30px; } header .header-content .header-content-inner hr { margin: 30px auto; @@ -207,6 +219,9 @@ header .header-content .header-content-inner p { margin-left: auto; margin-right: auto; } + header .header-content .header-content-inner h1 { + font-size: 50px; + } header .header-content .header-content-inner p { font-size: 18px; max-width: 80%; @@ -217,8 +232,77 @@ header .header-content .header-content-inner p { .section-heading { margin-top: 0; } +.service-box { + max-width: 400px; + margin: 50px auto 0; +} +@media (min-width: 992px) { + .service-box { + margin: 20px auto 0; + } +} +.service-box p { + margin-bottom: 0; +} +.portfolio-box { + position: relative; + display: block; + max-width: 650px; + margin: 0 auto; +} +.portfolio-box .portfolio-box-caption { + color: white; + opacity: 0; + display: block; + background: rgba(240, 95, 64, 0.9); + position: absolute; + bottom: 0; + text-align: center; + width: 100%; + height: 100%; + -webkit-transition: all 0.35s; + -moz-transition: all 0.35s; + transition: all 0.35s; +} +.portfolio-box .portfolio-box-caption .portfolio-box-caption-content { + width: 100%; + text-align: center; + position: absolute; + top: 50%; + transform: translateY(-50%); +} +.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category, +.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { + font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif; + padding: 0 15px; +} +.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category { + text-transform: uppercase; + font-weight: 600; + font-size: 14px; +} +.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { + font-size: 18px; +} +.portfolio-box:hover .portfolio-box-caption { + opacity: 1; +} +.portfolio-box:focus { + outline: none; +} +@media (min-width: 768px) { + .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category { + font-size: 16px; + } + .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { + font-size: 22px; + } +} +.call-to-action h2 { + margin: 0 auto 20px; +} .text-primary { - color: #f05f40; + color: #F05F40; } .no-gutter > [class*='col-'] { padding-right: 0; @@ -226,8 +310,8 @@ header .header-content .header-content-inner p { } .btn-default { color: #222222; - background-color: #ffffff; - border-color: #ffffff; + background-color: white; + border-color: white; -webkit-transition: all 0.35s; -moz-transition: all 0.35s; transition: all 0.35s; @@ -265,17 +349,17 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #ffffff; - border-color: #ffffff; + background-color: white; + border-color: white; } .btn-default .badge { - color: #ffffff; + color: white; background-color: #222222; } .btn-primary { - color: #ffffff; - background-color: #f05f40; - border-color: #f05f40; + color: white; + background-color: #F05F40; + border-color: #F05F40; -webkit-transition: all 0.35s; -moz-transition: all 0.35s; transition: all 0.35s; @@ -286,7 +370,7 @@ fieldset[disabled] .btn-default.active { .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - color: #ffffff; + color: white; background-color: #ee4b28; border-color: #ed431f; } @@ -313,12 +397,12 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #f05f40; - border-color: #f05f40; + background-color: #F05F40; + border-color: #F05F40; } .btn-primary .badge { - color: #f05f40; - background-color: #ffffff; + color: #F05F40; + background-color: white; } .btn { font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif; @@ -330,7 +414,6 @@ fieldset[disabled] .btn-primary.active { .btn-xl { padding: 15px 30px; } -/* ::-moz-selection { color: white; text-shadow: none; @@ -349,7 +432,6 @@ img::-moz-selection { color: white; background: transparent; } -*/ body { webkit-tap-highlight-color: #222222; } diff --git a/gospeladlershof.de/static/js/js.min.js b/gospeladlershof.de/static/js/js.min.js deleted file mode 100644 index 9895f43..0000000 --- a/gospeladlershof.de/static/js/js.min.js +++ /dev/null @@ -1,24 +0,0 @@ -/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -/*! -* Email obfuscator script 2.1 by Tim Williams, University of Arizona -* Random encryption key feature by Andrew Moulden, Site Engineering Ltd -* This code is freeware provided these four comment lines remain intact -* A wizard to generate this code is at http://www.jottings.com/obfuscator/ -* Modified by Maximilian Möhring -*/function deobfuscate_contact(t,e,n){for(t=t,e=e,shift=t.length,link="",i=0;i0&&e-1 in t}function i(t,e,n){if(ot.isFunction(e))return ot.grep(t,function(t,i){return!!e.call(t,i,t)!==n});if(e.nodeType)return ot.grep(t,function(t){return t===e!==n});if("string"==typeof e){if(ft.test(e))return ot.filter(e,t,n);e=ot.filter(e,t)}return ot.grep(t,function(t){return ot.inArray(t,e)>=0!==n})}function o(t,e){do t=t[e];while(t&&1!==t.nodeType);return t}function r(t){var e=xt[t]={};return ot.each(t.match(bt)||[],function(t,n){e[n]=!0}),e}function s(){ht.addEventListener?(ht.removeEventListener("DOMContentLoaded",a,!1),t.removeEventListener("load",a,!1)):(ht.detachEvent("onreadystatechange",a),t.detachEvent("onload",a))}function a(){(ht.addEventListener||"load"===event.type||"complete"===ht.readyState)&&(s(),ot.ready())}function l(t,e,n){if(void 0===n&&1===t.nodeType){var i="data-"+e.replace(kt,"-$1").toLowerCase();if(n=t.getAttribute(i),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:Et.test(n)?ot.parseJSON(n):n}catch(o){}ot.data(t,e,n)}else n=void 0}return n}function u(t){var e;for(e in t)if(("data"!==e||!ot.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function c(t,e,n,i){if(ot.acceptData(t)){var o,r,s=ot.expando,a=t.nodeType,l=a?ot.cache:t,u=a?t[s]:t[s]&&s;if(u&&l[u]&&(i||l[u].data)||void 0!==n||"string"!=typeof e)return u||(u=a?t[s]=V.pop()||ot.guid++:s),l[u]||(l[u]=a?{}:{toJSON:ot.noop}),("object"==typeof e||"function"==typeof e)&&(i?l[u]=ot.extend(l[u],e):l[u].data=ot.extend(l[u].data,e)),r=l[u],i||(r.data||(r.data={}),r=r.data),void 0!==n&&(r[ot.camelCase(e)]=n),"string"==typeof e?(o=r[e],null==o&&(o=r[ot.camelCase(e)])):o=r,o}}function d(t,e,n){if(ot.acceptData(t)){var i,o,r=t.nodeType,s=r?ot.cache:t,a=r?t[ot.expando]:ot.expando;if(s[a]){if(e&&(i=n?s[a]:s[a].data)){ot.isArray(e)?e=e.concat(ot.map(e,ot.camelCase)):e in i?e=[e]:(e=ot.camelCase(e),e=e in i?[e]:e.split(" ")),o=e.length;for(;o--;)delete i[e[o]];if(n?!u(i):!ot.isEmptyObject(i))return}(n||(delete s[a].data,u(s[a])))&&(r?ot.cleanData([t],!0):nt.deleteExpando||s!=s.window?delete s[a]:s[a]=null)}}}function f(){return!0}function p(){return!1}function h(){try{return ht.activeElement}catch(t){}}function g(t){var e=Mt.split("|"),n=t.createDocumentFragment();if(n.createElement)for(;e.length;)n.createElement(e.pop());return n}function m(t,e){var n,i,o=0,r=typeof t.getElementsByTagName!==Ct?t.getElementsByTagName(e||"*"):typeof t.querySelectorAll!==Ct?t.querySelectorAll(e||"*"):void 0;if(!r)for(r=[],n=t.childNodes||t;null!=(i=n[o]);o++)!e||ot.nodeName(i,e)?r.push(i):ot.merge(r,m(i,e));return void 0===e||e&&ot.nodeName(t,e)?ot.merge([t],r):r}function v(t){Dt.test(t.type)&&(t.defaultChecked=t.checked)}function y(t,e){return ot.nodeName(t,"table")&&ot.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function b(t){return t.type=(null!==ot.find.attr(t,"type"))+"/"+t.type,t}function x(t){var e=Xt.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function w(t,e){for(var n,i=0;null!=(n=t[i]);i++)ot._data(n,"globalEval",!e||ot._data(e[i],"globalEval"))}function T(t,e){if(1===e.nodeType&&ot.hasData(t)){var n,i,o,r=ot._data(t),s=ot._data(e,r),a=r.events;if(a){delete s.handle,s.events={};for(n in a)for(i=0,o=a[n].length;o>i;i++)ot.event.add(e,n,a[n][i])}s.data&&(s.data=ot.extend({},s.data))}}function C(t,e){var n,i,o;if(1===e.nodeType){if(n=e.nodeName.toLowerCase(),!nt.noCloneEvent&&e[ot.expando]){o=ot._data(e);for(i in o.events)ot.removeEvent(e,i,o.handle);e.removeAttribute(ot.expando)}"script"===n&&e.text!==t.text?(b(e).text=t.text,x(e)):"object"===n?(e.parentNode&&(e.outerHTML=t.outerHTML),nt.html5Clone&&t.innerHTML&&!ot.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===n&&Dt.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===n?e.defaultSelected=e.selected=t.defaultSelected:("input"===n||"textarea"===n)&&(e.defaultValue=t.defaultValue)}}function E(e,n){var i,o=ot(n.createElement(e)).appendTo(n.body),r=t.getDefaultComputedStyle&&(i=t.getDefaultComputedStyle(o[0]))?i.display:ot.css(o[0],"display");return o.detach(),r}function k(t){var e=ht,n=Zt[t];return n||(n=E(t,e),"none"!==n&&n||(Kt=(Kt||ot("