From c8cbe6010249edbe81d0f940b35575ddefef196d Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 12 Feb 2019 14:54:29 +0100 Subject: [PATCH 01/73] Try to fix font awesome --- assets/css/ie8.css | 219 +++++++++++++--------------------- assets/css/ie9.css | 124 ++++++++----------- assets/css/main.css | 64 ++++++---- assets/sass/libs/_mixins.scss | 8 +- templates/layout.html | 16 +-- 5 files changed, 192 insertions(+), 239 deletions(-) diff --git a/assets/css/ie8.css b/assets/css/ie8.css index be2b4aa..2ebd742 100644 --- a/assets/css/ie8.css +++ b/assets/css/ie8.css @@ -1,163 +1,116 @@ -/* - Solid State by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +/* + Solid State by HTML5 UP + html5up.net | @ajlkn + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) */ - /* Basic */ - - body { - -ms-behavior: url("assets/js/backgroundsize.min.htc"); - } +body { + -ms-behavior: url("assets/js/backgroundsize.min.htc"); } /* Type */ +h1.major, h2.major, h3.major, h4.major, h5.major, h6.major { + border-bottom: solid 2px #ffffff; } - h1.major, h2.major, h3.major, h4.major, h5.major, h6.major { - border-bottom: solid 2px #ffffff; - } +blockquote { + border-left: solid 4px #ffffff; } - blockquote { - border-left: solid 4px #ffffff; - } +code { + border: solid 2px #ffffff; } - code { - border: solid 2px #ffffff; - } - - hr { - border-bottom: solid 2px #ffffff; - } +hr { + border-bottom: solid 2px #ffffff; } /* Button */ - - input[type="submit"], - input[type="reset"], - input[type="button"], - button, - .button { - position: relative; - -ms-behavior: url("assets/js/ie/PIE.htc"); - border: solid 2px #ffffff; - } - - input[type="submit"].special, - input[type="reset"].special, - input[type="button"].special, - button.special, - .button.special { - border: 0; - } +input[type="submit"], +input[type="reset"], +input[type="button"], +button, +.button { + position: relative; + -ms-behavior: url("assets/js/ie/PIE.htc"); + border: solid 2px #ffffff; } + input[type="submit"].special, + input[type="reset"].special, + input[type="button"].special, + button.special, + .button.special { + border: 0; } /* Form */ - - input[type="text"], - input[type="password"], - input[type="email"], - input[type="tel"], - select, - textarea { - position: relative; - -ms-behavior: url("assets/js/ie/PIE.htc"); - background: transparent; - border: solid 2px #ffffff; - } +input[type="text"], +input[type="password"], +input[type="email"], +input[type="tel"], +select, +textarea { + position: relative; + -ms-behavior: url("assets/js/ie/PIE.htc"); + background: transparent; + border: solid 2px #ffffff; } /* Table */ +table tbody tr { + border: solid 1px #ffffff; + border-left: 0; + border-right: 0; } - table tbody tr { - border: solid 1px #ffffff; - border-left: 0; - border-right: 0; - } +table.alt tbody tr td { + border: solid 1px #ffffff; + border-left-width: 0; + border-top-width: 0; } + table.alt tbody tr td:first-child { + border-left-width: 1px; } - table.alt tbody tr td { - border: solid 1px #ffffff; - border-left-width: 0; - border-top-width: 0; - } +table.alt tbody tr:first-child td { + border-top-width: 1px; } - table.alt tbody tr td:first-child { - border-left-width: 1px; - } +table.alt thead { + border-bottom: 0; } - table.alt tbody tr:first-child td { - border-top-width: 1px; - } - - table.alt thead { - border-bottom: 0; - } - - table.alt tfoot { - border-top: 0; - } +table.alt tfoot { + border-top: 0; } /* Features */ - - .features article { - -ms-behavior: url("assets/js/ie/PIE.htc"); - position: relative; - width: 44%; - } - - .features article .image { - margin-top: 0; - margin-left: 0; - width: 100%; - } +.features article { + -ms-behavior: url("assets/js/ie/PIE.htc"); + position: relative; + width: 44%; } + .features article .image { + margin-top: 0; + margin-left: 0; + width: 100%; } /* Menu */ - - #menu { - background: #2e3141; - } - - #menu h2 { - border-bottom: solid 2px #ffffff; - } +#menu { + background: #2e3141; } + #menu h2 { + border-bottom: solid 2px #ffffff; } /* Header */ - - #header { - background-color: #353849; - } +#header { + background-color: #353849; } /* Wrapper */ - - .wrapper { - margin: 0; - } - - .wrapper:before, .wrapper:after { - display: none; - } - - .wrapper.spotlight .image { - -ms-behavior: url("assets/js/ie/PIE.htc"); - } - - .wrapper.spotlight .image img { - position: relative; - -ms-behavior: url("assets/js/ie/PIE.htc"); - } +.wrapper { + margin: 0; } + .wrapper:before, .wrapper:after { + display: none; } + .wrapper.spotlight .image { + -ms-behavior: url("assets/js/ie/PIE.htc"); } + .wrapper.spotlight .image img { + position: relative; + -ms-behavior: url("assets/js/ie/PIE.htc"); } /* Banner */ +#banner .logo .icon { + border: solid 2px #ffffff; + -ms-behavior: url("assets/js/ie/PIE.htc"); } - #banner .logo .icon { - border: solid 2px #ffffff; - -ms-behavior: url("assets/js/ie/PIE.htc"); - } - - #banner h2 { - border-bottom: solid 2px #ffffff; - } +#banner h2 { + border-bottom: solid 2px #ffffff; } /* Footer */ - - #footer .inner .copyright { - border-top: solid 2px #ffffff; - } - - #footer .inner .copyright li { - border-left: solid 2px #ffffff; - } \ No newline at end of file +#footer .inner .copyright { + border-top: solid 2px #ffffff; } + #footer .inner .copyright li { + border-left: solid 2px #ffffff; } diff --git a/assets/css/ie9.css b/assets/css/ie9.css index 214b972..7fb1949 100644 --- a/assets/css/ie9.css +++ b/assets/css/ie9.css @@ -1,89 +1,65 @@ -/* - Solid State by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +/* + Solid State by HTML5 UP + html5up.net | @ajlkn + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) */ - /* Basic */ - - body { - background-color: #2e3141; - background-image: url("../../images/bg.jpg"); - background-size: cover; - background-attachment: fixed; - background-position: center; - } - - body:before { - background: rgba(46, 49, 65, 0.8); - content: ''; - display: block; - height: 100%; - left: 0; - position: fixed; - top: 0; - width: 100%; - } - - body > * { - position: relative; - z-index: 1; - } +body { + background-color: #2e3141; + background-image: url("../../images/bg.jpg"); + background-size: cover; + background-attachment: fixed; + background-position: center; } + body:before { + background: rgba(46, 49, 65, 0.8); + content: ''; + display: block; + height: 100%; + left: 0; + position: fixed; + top: 0; + width: 100%; } + body > * { + position: relative; + z-index: 1; } /* Features */ - - .features article { - display: inline-block; - width: 45%; - } +.features article { + display: inline-block; + width: 45%; } /* Menu */ - - #menu .inner { - margin: 4em auto; - } +#menu .inner { + margin: 4em auto; } /* Wrapper */ +#wrapper > header { + background: none !important; } - #wrapper > header { - background: none !important; - } +.wrapper.spotlight .inner { + text-align: left !important; } - .wrapper.spotlight .inner { - text-align: left !important; - } +.wrapper.spotlight .image { + display: inline-block; + margin: 0 3em 2em 0 !important; + vertical-align: middle; + width: 24%; } - .wrapper.spotlight .image { - display: inline-block; - margin: 0 3em 2em 0 !important; - vertical-align: middle; - width: 24%; - } - - .wrapper.spotlight .content { - display: inline-block; - vertical-align: middle; - width: 70%; - } +.wrapper.spotlight .content { + display: inline-block; + vertical-align: middle; + width: 70%; } /* Banner */ - - #banner { - background: none !important; - } +#banner { + background: none !important; } /* Footer */ - - #footer { - background: none !important; - } - - #footer .inner form { - display: inline-block; - width: 45%; - } - - #footer .inner .contact { - display: inline-block; - width: 45%; - } \ No newline at end of file +#footer { + background: none !important; } + #footer .inner form { + display: inline-block; + width: 45%; } + #footer .inner .contact { + display: inline-block; + width: 45%; } diff --git a/assets/css/main.css b/assets/css/main.css index 26e494d..f018606 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1069,12 +1069,9 @@ a { margin: 0 0 2em 0; text-transform: uppercase; } a.special:not(.button):before { - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - text-transform: none !important; } + font-family: "Font Awesome 5 Free"; + font-weight: 400; + } a.special:not(.button):before { -moz-transition: background-color 0.2s ease-in-out; -webkit-transition: background-color 0.2s ease-in-out; @@ -1262,11 +1259,16 @@ textarea { display: block; position: relative; } .select-wrapper:before { + font-family: "Font Awesome 5 Free"; + /* updated font-family */ + font-weight: 400; + /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; + /* font-family: "Font Awesome 5 Free"; + font-style: normal; + font-weight: normal; +*/ text-transform: none !important; } .select-wrapper:before { color: rgba(255, 255, 255, 0.125); @@ -1324,11 +1326,16 @@ input[type="radio"] { position: relative; } input[type="checkbox"] + label:before, input[type="radio"] + label:before { + font-family: "Font Awesome 5 Free"; + /* updated font-family */ + font-weight: 400; + /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; + /* font-family: "Font Awesome 5 Free"; + font-style: normal; + font-weight: normal; +*/ text-transform: none !important; } input[type="checkbox"] + label:before, input[type="radio"] + label:before { @@ -1401,11 +1408,16 @@ input[type="radio"] + label:before { border-bottom: none; position: relative; } .icon:before { + font-family: "Font Awesome 5 Free"; + /* updated font-family */ + font-weight: 400; + /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; + /* font-family: "Font Awesome 5 Free"; + font-style: normal; + font-weight: normal; +*/ text-transform: none !important; } .icon > .label { display: none; } @@ -1543,11 +1555,16 @@ ul { padding: 0 0 0 3.25em; position: relative; } ul.contact li:before { + font-family: "Font Awesome 5 Free"; + /* updated font-family */ + font-weight: 400; + /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; + /* font-family: "Font Awesome 5 Free"; + font-style: normal; + font-weight: normal; +*/ text-transform: none !important; } ul.contact li:before { border-radius: 100%; @@ -1880,11 +1897,16 @@ button, box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.125); padding: 0 1.35em; } #header nav a[href="#menu"]:before { + font-family: "Font Awesome 5 Free"; + /* updated font-family */ + font-weight: 400; + /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; + /* font-family: "Font Awesome 5 Free"; + font-style: normal; + font-weight: normal; +*/ text-transform: none !important; } #header nav a[href="#menu"]:before { content: '\f0c9'; } diff --git a/assets/sass/libs/_mixins.scss b/assets/sass/libs/_mixins.scss index d4bf3c8..056b082 100644 --- a/assets/sass/libs/_mixins.scss +++ b/assets/sass/libs/_mixins.scss @@ -11,12 +11,14 @@ content: $content; } + font-family: "Font Awesome 5 Free"; /* updated font-family */ + font-weight: 400; /* regular style/weight */ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-family: FontAwesome; +/* font-family: "Font Awesome 5 Free"; font-style: normal; font-weight: normal; - text-transform: none !important; +*/ text-transform: none !important; } @@ -395,4 +397,4 @@ } -} \ No newline at end of file +} diff --git a/templates/layout.html b/templates/layout.html index 3998cce..9a15041 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -86,14 +86,14 @@
- - {% block body %}{% endblock %} -