From 26c4bc82d6c507147449257e4910ae5819260fdb Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 16 Mar 2019 21:48:54 +0000 Subject: [PATCH] Some redesign work, that didnt actually use grid Squashed commit of the following: commit 1701a33d313d0969b061c8a87734395312045d9a Author: Jonny Barnes Date: Sat Mar 16 18:44:29 2019 +0000 Try and get security checker working again commit 2f81f28419304cad1678c6ee054eb3c8782fa082 Author: Jonny Barnes Date: Sat Mar 16 18:38:41 2019 +0000 Make sure aaron's profile pic is saved commit 8a78aeec9c648a647fcb5d778b3003df5c3f653e Author: Jonny Barnes Date: Sat Mar 16 18:16:16 2019 +0000 Lets push out the new style as is commit a8015907d44370600ae3711605f96c4e3a637fca Author: Jonny Barnes Date: Fri Mar 15 21:31:19 2019 +0000 More design work commit 12cb6e1bfc23ca9591e5348ebc6e49614d686722 Author: Jonny Barnes Date: Sun Mar 10 16:00:30 2019 +0000 Updating CSS styles for design v2 --- .travis.yml | 2 +- database/seeds/ContactsTableSeeder.php | 9 ++++ public/assets/css/app.css | 2 +- public/assets/css/app.css.map | 2 +- public/assets/img/iwc.svg | 66 +++++++++++++++++++++++++ resources/sass/_admin-form.scss | 6 --- resources/sass/_articles.scss | 5 +- resources/sass/_base-font.scss | 10 ---- resources/sass/_base.scss | 22 +++++++++ resources/sass/_bio.scss | 5 ++ resources/sass/_border-box.scss | 14 ------ resources/sass/_bridgy-links.scss | 6 --- resources/sass/_colors.scss | 16 ------ resources/sass/_contacts-page.scss | 14 ------ resources/sass/_footer.scss | 25 ++++++---- resources/sass/_form.scss | 15 ------ resources/sass/_header.scss | 18 ------- resources/sass/_hovercard.scss | 42 ---------------- resources/sass/_likes.scss | 5 -- resources/sass/_main.scss | 25 ++++++---- resources/sass/_mapbox.scss | 26 +--------- resources/sass/_notes.scss | 41 +++++---------- resources/sass/_pagination.scss | 7 +-- resources/sass/_projects.scss | 5 -- resources/sass/_site-header.scss | 25 ++++++++++ resources/sass/_styles.scss | 19 ------- resources/sass/_syndication.scss | 16 ++++++ resources/sass/_tags.scss | 49 ------------------ resources/sass/_variables.scss | 4 -- resources/sass/app.scss | 35 +++---------- resources/views/master.blade.php | 6 +-- resources/views/templates/bio.blade.php | 60 +++++++++++----------- 32 files changed, 237 insertions(+), 365 deletions(-) create mode 100644 public/assets/img/iwc.svg delete mode 100644 resources/sass/_admin-form.scss delete mode 100644 resources/sass/_base-font.scss create mode 100644 resources/sass/_base.scss create mode 100644 resources/sass/_bio.scss delete mode 100644 resources/sass/_border-box.scss delete mode 100644 resources/sass/_bridgy-links.scss delete mode 100644 resources/sass/_colors.scss delete mode 100644 resources/sass/_contacts-page.scss delete mode 100644 resources/sass/_form.scss delete mode 100644 resources/sass/_header.scss delete mode 100644 resources/sass/_hovercard.scss delete mode 100644 resources/sass/_likes.scss delete mode 100644 resources/sass/_projects.scss create mode 100644 resources/sass/_site-header.scss delete mode 100644 resources/sass/_styles.scss create mode 100644 resources/sass/_syndication.scss delete mode 100644 resources/sass/_tags.scss delete mode 100644 resources/sass/_variables.scss diff --git a/.travis.yml b/.travis.yml index 15a9c137..68f0d9fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,4 +67,4 @@ script: - php vendor/bin/phpunit - php phpcs.phar #- php artisan dusk - - php vendor/bin/security-checker security:check --end-point=http://security.sensiolabs.org/check_lock + - php vendor/bin/security-checker security:check diff --git a/database/seeds/ContactsTableSeeder.php b/database/seeds/ContactsTableSeeder.php index 2708d912..c5f6a1f8 100644 --- a/database/seeds/ContactsTableSeeder.php +++ b/database/seeds/ContactsTableSeeder.php @@ -2,6 +2,7 @@ use App\Models\Contact; use Illuminate\Database\Seeder; +use Illuminate\FileSystem\FileSystem; class ContactsTableSeeder extends Seeder { @@ -24,5 +25,13 @@ class ContactsTableSeeder extends Seeder 'homepage' => 'https://aaronparecki.com', 'facebook' => '123456', ]); + $fs = new FileSystem(); + if (!$fs->exists(public_path('assets/profile-images/aaronparecki.com'))) { + $fs->makeDirectory(public_path('assets/profile-images/aaronparecki.com')); + } + $fs->copy( + base_path('tests/aaron.png'), + public_path('assets/profile-images/aaronparecki.com/image') + ); } } diff --git a/public/assets/css/app.css b/public/assets/css/app.css index 211226c7..2a0f4c41 100644 --- a/public/assets/css/app.css +++ b/public/assets/css/app.css @@ -1,2 +1,2 @@ -html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}html{font-size:10px;font-family:"filson-soft", serif}a.u-syndication{text-decoration:none}#topheader{display:flex;flex-flow:row;align-items:center;width:100%;min-height:5rem}#topheader h1{font-size:2rem;padding:0 2rem}#topheader nav{font-size:2rem}main{display:flex;flex-direction:column;align-items:stretch;max-width:512px;margin:0 auto;padding:0 0.5rem;font-size:2rem}.top-space{padding-top:2rem}.h-entry pre code{padding:1.5rem 2rem;border-radius:4px}.mini-h-card{position:relative}.mini-h-card .p-name{position:relative}.mini-h-card:hover .p-name{z-index:100}.hovercard{position:absolute;flex-direction:row;justify-content:space-between;align-items:flex-end;background:white;width:30rem;left:-10px;top:-10px;z-index:50;padding:2rem 1rem 1rem;border-radius:2px;box-shadow:3px 3px 2px 1px #101314;display:none}.mini-h-card:hover .hovercard{display:flex}.mini-h-card .social-icon{width:auto;height:2rem}.mini-h-card .u-photo{height:10rem}.note{display:flex;flex-direction:column;font-size:2rem}.note img{max-width:100%;max-height:80vh}.note-metadata{display:flex;flex-direction:row;justify-content:space-between}.icon{width:auto;height:1em}.note pre code{padding:1.5rem 2rem;border-radius:4px}.pagination{display:flex;flex-direction:row;justify-content:space-evenly;font-size:2rem;list-style-type:none}main .contact{font-size:2rem;display:flex;flex-direction:row-reverse;justify-content:space-between;margin-top:2rem}.contact .u-photo{width:auto;height:8rem}#projects{font-size:2rem}body>div.h-card{max-width:512px;margin:0 auto;font-size:1.5rem}footer{max-width:512px;margin:0 auto;display:flex;flex-direction:column;align-items:center}.admin-form{margin-top:2rem;margin-bottom:2rem}.form{display:flex;flex-direction:column}.form>div{display:flex;flex-direction:column}div.form-row{flex-direction:row}.u-like-of{margin-top:1rem}.p-bridgy-twitter-content,.p-bridgy-facebook-content{display:none}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}.map{height:200px}.mapboxgl-ctrl-logo{border-bottom:none}.marker{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAAsTAAALEwEAmpwYAAACxFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMyaeDAAAA63RSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8wMTIzNDU2Nzg5Ozw9Pj9AQUJERUZHSElKS05PUlNVVldYWVpbXF1fYGFiY2RmZ2hpa2xtbm9wcXJzdHV2d3h5ent8fX+AgYKDhIWGh4iJiouMjo+QkZOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqutrq+xsrO0tbe4ubq7vL2+v8DBwsPExcbHyMnKy8zP0NHS09TV1tfY2drb3N3f4OHi4+Tl5ujp6uvs7e7v8PHy8/T19vf4+fr7/P3+xn8cLwAAB2BJREFUGBntwYtjlWUdB/Dvuwtjo23CGPcxtlGAFhgWFCINSZciCYGKwLSbMwuQi4lgbkSTgYOAiYEI5a0JmQhRAYKBgmzJbSwgGTDYxs45nO8/0d0Mzu897+V53kv1+QD/9z8jd9T9ize/tfdw04VY+9mjf9hV/1xFWXEKQiV11Nytp5nIlfdq781HOBRWvHaBZuLvPVuWhoDLmbkjTgvOVN+CABu/qZ2WHZrTA4Fk3L2X9lxa2geBkzLlIO3rqBmIYBl/mM5ElmUjOPpuonPNkxEQqRUX6cqbn0EQFL1Dtzor4L9JF6jAK93hr4zlVOP4aPhpwH6qEvkO/DPsJBWqhF++9BGVqkuDL8raqNgvs+CDSVEqtysLniu9Qg3q0+Cxz7dSixcMeKrkNDVZCi/1PEptHoV3jDeoT3QMPDOXtnTEaEdTHjwyJkpLLm+rmjGm4IY0ILPXsImz1zXQmnoDnshrogVHnhiTjmv0v2/LFVowG554iUldXjEaid1Qvo9JRYfDAxOYzPlFeTAxYSeT+a0B7TIaaS72k1wkcfsRJjEd2i2gud+PQHJd5rXT1Nnu0KyonWauPpECS246TFPPQbMNNHN6PKzKep5mrg6BViUxmmgohA3zaaYOWv2UJvblw5ZZMcqihdBoQCdl+7Nh09Q4ZSuh0bOUNebDtgrKrvSFNjltFJ0ZBAeWUrYE2syg6OoEOJG6k6ITBnTZQdFiONPvLEWl0KQwTsm+VDg0kaJ10GQBJVe/AMdeo6Q1E3ocoWQlnBvUTskUaDGIkkt5cOFpStZDixmULIUb+W0UnIQWGyjo6ANXqikZDB2aKaiDO4VxCsqhwRBKSuHSDgpeggYzKThhwKWZFDRDgx9TUAW3cqIU5EC91ym4A67tpuCLUK+RiUW6wbUlFNwH5dKjTOx3cO92Cp6CckMpqIV7vSnYAuXupOBRKHCeib0D5e6loAwK7GFiR6DcTAo+CwW2MLFmKFdBQSEUWMvEWqHcQgp6QIFqJhY3oFolBRlQYDEFn4Jq1RRkQ4GlFORBtSUU9IMCtRRkQLW5FAyBAhuZWATKPUzBGCiwjYn9GcrdRcGDUOA4E9sP5YZS8Azcy4wzsc1QLiPOxF6FeyMo+BHUO8bEzhpw7VsUTId6L1PwObj2CwqGQ735FDwCt4xzTKwjDeqVUbAdbo2lYC806ElBfCBcWkNBDXQ4RME8uNP1AgVfhw4rKTiaClemU9IbOkymZBrcSGmg4ANo0YeS9w24MJmSWuhxgJKpcC79MCX3QI9nKPlTDhybTUkkG3qMo6gaThVcpuRtaJJ2kZLYWDhjbKPoB9Dl5xSd6glH5lN2E3SZRtkbKXBgXIyiRmiTG6GsBvYNO0dZJfTZShMLYdeAkzQxGvqU08xjsKfgA5poNqBPrxjNVBmw4cYmmqmBTr+mqZ9lwrLSFpq6FTrNormDQ2FNyg+v0tRJAzp176S5y+UGLCjaziSqoNfrTGb3zUgmY2E7kxkJvb7BpGJrSmAm7YE/MqkGaJbVyuRiG0dCkv3NY7RgAXRbR0ven1OA66Xf+WI7rYgXQrdxtKqxdvKwdHwsf+zcX7XRorehnXGMNkQb33x5fc3qTfV7WmjHg9BvEfVry4Z+xXFq9wK88Ba1uw1emErdGuCJri3UbA68sZx6RXvDG8Op1yvwyh5qdQe8Mp06HTXglcwWajQH3qmmPp358M5Q6rMJXtpObW6DlyZRlwPwVFoTNSmHtxZQj/NZ8FavTmqxDF7bQB3iJfDaKOpQD+/tpgZfhfemUL1D8EHaKSr3EPzwOFVryYIf8tqpWCX8sYpqRQvgj6FxKvUi/FJPpW6BX8ZTpZ3wz7tU6G74536q02jAP+mnqMzD8NP3qcqZrvBTzkUqshD+qqIabXnwV/8IlVgOv9VRhVgR/HZjnApsgv9epQI3w39fpntbEQS/oWulCIK76NZeBMMBunQPgmEq3TlsIBhSP6QrDyAoyunG8TQERZdmuvBtBMf36NyZTARHt4/o2OMIkoV0qiUHQZJ7gQ49iWBZQmdaeyBYel6mI5UImmV0or0XgqZvBx2oRvDU0L4r/RA8Azpp2woE0Sra1VmAICqM0KZVCKa1tCc6CMFUEqUtaxFUdbQjWoSgGhyjDWsRXM/TumgxgmtwjJatQ5Ctp1XREgTZ4BgtWodgq6M10WIEW3GUlqxB0K2lFZFBCLqiCC1YjeBbzeQ6ByL4BnYyqRUIg5VMpqM/wqB/B5OoRjhU01xbH4RD7zaaqkJYVNJMax7CIq+VJp5CeCyirCUX4ZF7jqJ5CJO5lJzphjDJOk1BBcLlESbWlIFwyTjJhB5C2MxiIh+mI2zSGpjANITPFF7vYArCx3iX15mIMPoar7UH4bSL1/gKwulW/qdtCKt6flJ8JMJqRJyfsBnhtZH/Fv00wqs4wo/VIsyW81/a+iHMel3iPz2NcHuS/3AuF+GWfZZ/9xjC7rv8mxMZCLsuR/lX0xF+U0geTEH4GfvIMvw3KOV2aPcXaWsyKghlwmgAAAAASUVORK5CYII=);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}body{background-color:var(--brwhite);color:var(--black)}#topheader{background-color:var(--black);color:var(--white)}a,a:visited{color:var(--blue)}html{text-rendering:optimizeLegibility;overflow-wrap:break-word;-webkit-font-kerning:normal;font-kerning:normal}h1 a{text-decoration:none}#topheader a{text-decoration:none}.tags{margin:0;overflow:hidden;padding:0}.tags li{float:left;list-style-type:none}.tag,.tag:visited{background:var(--white);border-radius:3px 0 0 3px;color:var(--black);display:inline-block;height:2.6rem;line-height:2.6rem;padding:0 2rem 0 1rem;position:relative;margin:0 1rem 1rem 0;text-decoration:none;transition:color 0.2s}.tag::after{background:var(--brwhite);border-bottom:1.3rem solid transparent;border-left:1rem solid var(--white);border-top:1.3rem solid transparent;content:'';position:absolute;right:0;top:0}.tag:hover{background-color:var(--red);color:var(--black)}.tag:hover::after{border-left-color:var(--red)} +html{font-family:montserrat, sans-serif;font-weight:300;font-style:normal;font-size:20px}h1{font-family:bebas-neue, sans-serif;font-weight:400;font-style:normal}code{font-family:"Operator Mono", monospace}#topheader{display:flex;width:100vw;flex-direction:column;align-items:center;background-color:var(--black)}#topheader a{color:var(--white);text-decoration:none}#topheader h1{margin-top:0;padding-top:1rem;font-size:3rem}#topheader nav{padding-bottom:1rem;font-size:1.5rem}main{display:flex;flex-direction:column;align-items:center;background-color:var(--white);color:var(--black)}main a{color:var(--blue);text-decoration:none}main .h-entry{margin:3rem 0}.pagination{display:flex;flex-direction:row;align-items:center;justify-content:space-around;list-style-type:none;width:40rem}.personal-bio{width:40rem}article.h-entry{width:40rem}.h-entry .note{width:40rem}@media screen and (max-width: 40rem){.h-entry .note{width:95vw}.h-entry .note .e-content img{width:100%}}footer{display:flex;flex-direction:column;align-items:center;background-color:var(--white);color:var(--black)}footer a{color:var(--blue);text-decoration:none}footer form:first-child{margin-bottom:1rem}footer p{margin-bottom:0}.map{height:200px}.note-metadata{display:flex;flex-direction:row;justify-content:space-between}.note-metadata .social-links{flex-direction:row}.note-metadata .social-links svg{height:1em;width:auto}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}} /*# sourceMappingURL=app.css.map */ \ No newline at end of file diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map index 515dd533..97f202f1 100644 --- a/public/assets/css/app.css.map +++ b/public/assets/css/app.css.map @@ -1 +1 @@ -{"version":3,"sources":["../../../resources/sass/_border-box.scss","../../../resources/sass/_base-font.scss","../../../resources/sass/_header.scss","../../../resources/sass/_variables.scss","../../../resources/sass/_main.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_hovercard.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_contacts-page.scss","../../../resources/sass/_projects.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_admin-form.scss","../../../resources/sass/_form.scss","../../../resources/sass/_likes.scss","../../../resources/sass/_bridgy-links.scss","../../../resources/sass/_emoji.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_colors.scss","../../../resources/sass/_styles.scss","../../../resources/sass/_tags.scss"],"names":[],"mappings":"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","file":"app.css"} \ No newline at end of file +{"version":3,"sources":["../../../resources/sass/_base.scss","../../../resources/sass/_site-header.scss","../../../resources/sass/_main.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_bio.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_syndication.scss","../../../resources/sass/_emoji.scss"],"names":[],"mappings":"AAGA,KACI,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CAClB,cAAe,CAClB,GAGG,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CACrB,KAGG,sCAAuC,CAC1C,WCfG,YAAa,CACb,WAAY,CACZ,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CALlC,aAQQ,kBAAmB,CACnB,oBAAqB,CAT7B,cAaQ,YAAa,CACb,gBAAiB,CACjB,cAAe,CAfvB,eAmBQ,mBAAoB,CACpB,gBAAiB,CACpB,KCpBD,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,OAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,cAaQ,aAAc,CACjB,YCbD,YAAa,CACb,kBAAmB,CACnB,kBAAmB,CACnB,4BAA6B,CAC7B,oBAAqB,CACrB,WHaa,CGZhB,cCNG,WJkBa,CIjBhB,gBCDG,WLkBa,CKjBhB,eCDG,WNkBa,CMjBhB,qCAGG,eACI,UAAW,CADf,8BAKY,UAAW,CACd,CCXb,OACI,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,SAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,wBAaQ,kBAAmB,CAb3B,SAiBQ,eAAgB,CACnB,KCjBD,YAAa,CAChB,eCDG,YAAa,CACb,kBAAmB,CACnB,6BAA8B,CAHlC,6BAMQ,kBAAmB,CAN3B,iCASY,UAAW,CACX,UAAW,CACd,2BCRL,iBAAkB,CACrB,gFAIG,iBAAkB,CAClB,aAAc,CACd,SAAU,CACV,YAAa,CACb,MAAO,CACP,oBAAqB,CACrB,wBAA2C,CAC3C,mBAAoB,CACpB,mCAAgD,CAChD,wBAAyB,CACzB,iCAAqC,CACrC,UAA6B,CAC7B,aAAc,CACd,yCAAW,CAAX,iCAAkC,CACrC,2BAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAhBvD,mBAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC","file":"app.css"} \ No newline at end of file diff --git a/public/assets/img/iwc.svg b/public/assets/img/iwc.svg new file mode 100644 index 00000000..8ad3f06d --- /dev/null +++ b/public/assets/img/iwc.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/sass/_admin-form.scss b/resources/sass/_admin-form.scss deleted file mode 100644 index beb5d813..00000000 --- a/resources/sass/_admin-form.scss +++ /dev/null @@ -1,6 +0,0 @@ -//admin-form.scss - -.admin-form { - margin-top: 2rem; - margin-bottom: 2rem; -} diff --git a/resources/sass/_articles.scss b/resources/sass/_articles.scss index cfa07bb6..72095a8e 100644 --- a/resources/sass/_articles.scss +++ b/resources/sass/_articles.scss @@ -1,6 +1,5 @@ //articles.scss -.h-entry pre code { - padding: 1.5rem 2rem; - border-radius: 4px; +article.h-entry { + width: $mainWidth; } diff --git a/resources/sass/_base-font.scss b/resources/sass/_base-font.scss deleted file mode 100644 index 3cd3072c..00000000 --- a/resources/sass/_base-font.scss +++ /dev/null @@ -1,10 +0,0 @@ -//base-font.scss - -html { - font-size: 10px; - font-family: "filson-soft", serif; -} - -a.u-syndication { - text-decoration: none; -} diff --git a/resources/sass/_base.scss b/resources/sass/_base.scss new file mode 100644 index 00000000..4996c3f5 --- /dev/null +++ b/resources/sass/_base.scss @@ -0,0 +1,22 @@ +// _base.scss + +// Fonts +html { + font-family: montserrat, sans-serif; + font-weight: 300; + font-style: normal; + font-size: 20px; +} + +h1 { + font-family: bebas-neue, sans-serif; + font-weight: 400; + font-style: normal; +} + +code { + font-family: "Operator Mono", monospace; +} + +// Variables +$mainWidth: 40rem; diff --git a/resources/sass/_bio.scss b/resources/sass/_bio.scss new file mode 100644 index 00000000..be6ee095 --- /dev/null +++ b/resources/sass/_bio.scss @@ -0,0 +1,5 @@ +// bio.scss + +.personal-bio { + width: $mainWidth; +} diff --git a/resources/sass/_border-box.scss b/resources/sass/_border-box.scss deleted file mode 100644 index 65cd66b6..00000000 --- a/resources/sass/_border-box.scss +++ /dev/null @@ -1,14 +0,0 @@ -//border-box.scss - -//use universal box sizing with inheritance -//from https://css-tricks.com/box-sizing/ - -html { - box-sizing: border-box; -} - -*, -*::before, -*::after { - box-sizing: inherit; -} diff --git a/resources/sass/_bridgy-links.scss b/resources/sass/_bridgy-links.scss deleted file mode 100644 index edb925d2..00000000 --- a/resources/sass/_bridgy-links.scss +++ /dev/null @@ -1,6 +0,0 @@ -// bridgy-links.scss - -.p-bridgy-twitter-content, -.p-bridgy-facebook-content { - display: none; -} diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss deleted file mode 100644 index 9ba406df..00000000 --- a/resources/sass/_colors.scss +++ /dev/null @@ -1,16 +0,0 @@ -//colors.scss - -body { - background-color: var(--brwhite); - color: var(--black); -} - -#topheader { - background-color: var(--black); - color: var(--white); -} - -a, -a:visited { - color: var(--blue); -} diff --git a/resources/sass/_contacts-page.scss b/resources/sass/_contacts-page.scss deleted file mode 100644 index 4e409adc..00000000 --- a/resources/sass/_contacts-page.scss +++ /dev/null @@ -1,14 +0,0 @@ -//contacts-page.scss - -main .contact { - font-size: 2rem; - display: flex; - flex-direction: row-reverse; - justify-content: space-between; - margin-top: 2rem; -} - -.contact .u-photo { - width: auto; - height: 8rem; -} diff --git a/resources/sass/_footer.scss b/resources/sass/_footer.scss index e527e6aa..e3a78419 100644 --- a/resources/sass/_footer.scss +++ b/resources/sass/_footer.scss @@ -1,15 +1,22 @@ -//footer.scss - -body > div.h-card { - max-width: $body-width; - margin: 0 auto; - font-size: 1.5rem; -} +// footer.scss footer { - max-width: $body-width; - margin: 0 auto; display: flex; flex-direction: column; align-items: center; + background-color: var(--white); + color: var(--black); + + a { + color: var(--blue); + text-decoration: none; + } + + form:first-child { + margin-bottom: 1rem; + } + + p { + margin-bottom: 0; + } } diff --git a/resources/sass/_form.scss b/resources/sass/_form.scss deleted file mode 100644 index 09a06592..00000000 --- a/resources/sass/_form.scss +++ /dev/null @@ -1,15 +0,0 @@ -//form.scss - -.form { - display: flex; - flex-direction: column; -} - -.form > div { - display: flex; - flex-direction: column; -} - -div.form-row { - flex-direction: row; -} diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss deleted file mode 100644 index 5c6563c4..00000000 --- a/resources/sass/_header.scss +++ /dev/null @@ -1,18 +0,0 @@ -//header.scss - -#topheader { - display: flex; - flex-flow: row; - align-items: center; - width: 100%; - min-height: $header-height; -} - -#topheader h1 { - font-size: 2rem; - padding: 0 2rem; -} - -#topheader nav { - font-size: 2rem; -} diff --git a/resources/sass/_hovercard.scss b/resources/sass/_hovercard.scss deleted file mode 100644 index 72a72ae9..00000000 --- a/resources/sass/_hovercard.scss +++ /dev/null @@ -1,42 +0,0 @@ -//hovercard.scss - -.mini-h-card { - position: relative; -} - -.mini-h-card .p-name { - position: relative; -} - -.mini-h-card:hover .p-name { - z-index: 100; -} - -.hovercard { - position: absolute; - flex-direction: row; - justify-content: space-between; - align-items: flex-end; - background: white; - width: 30rem; - left: -10px; - top: -10px; - z-index: 50; - padding: 2rem 1rem 1rem; - border-radius: 2px; - box-shadow: 3px 3px 2px 1px hsla(190, 11%, 7%, 1); - display: none; -} - -.mini-h-card:hover .hovercard { - display: flex; -} - -.mini-h-card .social-icon { - width: auto; - height: 2rem; -} - -.mini-h-card .u-photo { - height: 10rem; -} diff --git a/resources/sass/_likes.scss b/resources/sass/_likes.scss deleted file mode 100644 index 0954872a..00000000 --- a/resources/sass/_likes.scss +++ /dev/null @@ -1,5 +0,0 @@ -//likes.scss - -.u-like-of { - margin-top: 1rem; -} diff --git a/resources/sass/_main.scss b/resources/sass/_main.scss index 5beededf..a7ced3a8 100644 --- a/resources/sass/_main.scss +++ b/resources/sass/_main.scss @@ -1,16 +1,21 @@ -//main.scss +// main.scss main { display: flex; flex-direction: column; - align-items: stretch; - max-width: $body-width; - margin: 0 auto; - padding: 0 0.5rem; - font-size: 2rem; + align-items: center; + background-color: var(--white); + color: var(--black); + + a { + color: var(--blue); + text-decoration: none; + } + + .h-entry { + margin: 3rem 0; + } } -// add some padding to the top for pages that need it -.top-space { - padding-top: 2rem; -} +@import "pagination"; +@import "bio"; diff --git a/resources/sass/_mapbox.scss b/resources/sass/_mapbox.scss index f50b2921..a21d9c7c 100644 --- a/resources/sass/_mapbox.scss +++ b/resources/sass/_mapbox.scss @@ -1,29 +1,5 @@ -// mapbox.scss +//mapbox.scss .map { height: 200px; } - -.mapboxgl-ctrl-logo { - border-bottom: none; -} - -.marker { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAAsTAAALEwEAmpwYAAACxFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMyaeDAAAA63RSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8wMTIzNDU2Nzg5Ozw9Pj9AQUJERUZHSElKS05PUlNVVldYWVpbXF1fYGFiY2RmZ2hpa2xtbm9wcXJzdHV2d3h5ent8fX+AgYKDhIWGh4iJiouMjo+QkZOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqutrq+xsrO0tbe4ubq7vL2+v8DBwsPExcbHyMnKy8zP0NHS09TV1tfY2drb3N3f4OHi4+Tl5ujp6uvs7e7v8PHy8/T19vf4+fr7/P3+xn8cLwAAB2BJREFUGBntwYtjlWUdB/Dvuwtjo23CGPcxtlGAFhgWFCINSZciCYGKwLSbMwuQi4lgbkSTgYOAiYEI5a0JmQhRAYKBgmzJbSwgGTDYxs45nO8/0d0Mzu897+V53kv1+QD/9z8jd9T9ize/tfdw04VY+9mjf9hV/1xFWXEKQiV11Nytp5nIlfdq781HOBRWvHaBZuLvPVuWhoDLmbkjTgvOVN+CABu/qZ2WHZrTA4Fk3L2X9lxa2geBkzLlIO3rqBmIYBl/mM5ElmUjOPpuonPNkxEQqRUX6cqbn0EQFL1Dtzor4L9JF6jAK93hr4zlVOP4aPhpwH6qEvkO/DPsJBWqhF++9BGVqkuDL8raqNgvs+CDSVEqtysLniu9Qg3q0+Cxz7dSixcMeKrkNDVZCi/1PEptHoV3jDeoT3QMPDOXtnTEaEdTHjwyJkpLLm+rmjGm4IY0ILPXsImz1zXQmnoDnshrogVHnhiTjmv0v2/LFVowG554iUldXjEaid1Qvo9JRYfDAxOYzPlFeTAxYSeT+a0B7TIaaS72k1wkcfsRJjEd2i2gud+PQHJd5rXT1Nnu0KyonWauPpECS246TFPPQbMNNHN6PKzKep5mrg6BViUxmmgohA3zaaYOWv2UJvblw5ZZMcqihdBoQCdl+7Nh09Q4ZSuh0bOUNebDtgrKrvSFNjltFJ0ZBAeWUrYE2syg6OoEOJG6k6ITBnTZQdFiONPvLEWl0KQwTsm+VDg0kaJ10GQBJVe/AMdeo6Q1E3ocoWQlnBvUTskUaDGIkkt5cOFpStZDixmULIUb+W0UnIQWGyjo6ANXqikZDB2aKaiDO4VxCsqhwRBKSuHSDgpeggYzKThhwKWZFDRDgx9TUAW3cqIU5EC91ym4A67tpuCLUK+RiUW6wbUlFNwH5dKjTOx3cO92Cp6CckMpqIV7vSnYAuXupOBRKHCeib0D5e6loAwK7GFiR6DcTAo+CwW2MLFmKFdBQSEUWMvEWqHcQgp6QIFqJhY3oFolBRlQYDEFn4Jq1RRkQ4GlFORBtSUU9IMCtRRkQLW5FAyBAhuZWATKPUzBGCiwjYn9GcrdRcGDUOA4E9sP5YZS8Azcy4wzsc1QLiPOxF6FeyMo+BHUO8bEzhpw7VsUTId6L1PwObj2CwqGQ735FDwCt4xzTKwjDeqVUbAdbo2lYC806ElBfCBcWkNBDXQ4RME8uNP1AgVfhw4rKTiaClemU9IbOkymZBrcSGmg4ANo0YeS9w24MJmSWuhxgJKpcC79MCX3QI9nKPlTDhybTUkkG3qMo6gaThVcpuRtaJJ2kZLYWDhjbKPoB9Dl5xSd6glH5lN2E3SZRtkbKXBgXIyiRmiTG6GsBvYNO0dZJfTZShMLYdeAkzQxGvqU08xjsKfgA5poNqBPrxjNVBmw4cYmmqmBTr+mqZ9lwrLSFpq6FTrNormDQ2FNyg+v0tRJAzp176S5y+UGLCjaziSqoNfrTGb3zUgmY2E7kxkJvb7BpGJrSmAm7YE/MqkGaJbVyuRiG0dCkv3NY7RgAXRbR0ven1OA66Xf+WI7rYgXQrdxtKqxdvKwdHwsf+zcX7XRorehnXGMNkQb33x5fc3qTfV7WmjHg9BvEfVry4Z+xXFq9wK88Ba1uw1emErdGuCJri3UbA68sZx6RXvDG8Op1yvwyh5qdQe8Mp06HTXglcwWajQH3qmmPp358M5Q6rMJXtpObW6DlyZRlwPwVFoTNSmHtxZQj/NZ8FavTmqxDF7bQB3iJfDaKOpQD+/tpgZfhfemUL1D8EHaKSr3EPzwOFVryYIf8tqpWCX8sYpqRQvgj6FxKvUi/FJPpW6BX8ZTpZ3wz7tU6G74536q02jAP+mnqMzD8NP3qcqZrvBTzkUqshD+qqIabXnwV/8IlVgOv9VRhVgR/HZjnApsgv9epQI3w39fpntbEQS/oWulCIK76NZeBMMBunQPgmEq3TlsIBhSP6QrDyAoyunG8TQERZdmuvBtBMf36NyZTARHt4/o2OMIkoV0qiUHQZJ7gQ49iWBZQmdaeyBYel6mI5UImmV0or0XgqZvBx2oRvDU0L4r/RA8Azpp2woE0Sra1VmAICqM0KZVCKa1tCc6CMFUEqUtaxFUdbQjWoSgGhyjDWsRXM/TumgxgmtwjJatQ5Ctp1XREgTZ4BgtWodgq6M10WIEW3GUlqxB0K2lFZFBCLqiCC1YjeBbzeQ6ByL4BnYyqRUIg5VMpqM/wqB/B5OoRjhU01xbH4RD7zaaqkJYVNJMax7CIq+VJp5CeCyirCUX4ZF7jqJ5CJO5lJzphjDJOk1BBcLlESbWlIFwyTjJhB5C2MxiIh+mI2zSGpjANITPFF7vYArCx3iX15mIMPoar7UH4bSL1/gKwulW/qdtCKt6flJ8JMJqRJyfsBnhtZH/Fv00wqs4wo/VIsyW81/a+iHMel3iPz2NcHuS/3AuF+GWfZZ/9xjC7rv8mxMZCLsuR/lX0xF+U0geTEH4GfvIMvw3KOV2aPcXaWsyKghlwmgAAAAASUVORK5CYII=); - background-size: contain; - width: 20px; - height: 20px; -} - -.map-menu { - position: absolute; - top: 0; - left: 0; - background: white; - padding: 0.4rem; -} - -.map-menu label { - margin-left: 3px; - margin-right: 3px; -} diff --git a/resources/sass/_notes.scss b/resources/sass/_notes.scss index dde2c313..1760f7f7 100644 --- a/resources/sass/_notes.scss +++ b/resources/sass/_notes.scss @@ -1,34 +1,17 @@ -//notes.scss +// notes.scss -//the hovercard that is displayed in notes -@import "hovercard"; - -.note { - display: flex; - flex-direction: column; - font-size: 2rem; +.h-entry .note { + width: $mainWidth; } -.note img { - max-width: 100%; - max-height: 80vh; -} +@media screen and (max-width: $mainWidth) { + .h-entry .note { + width: 95vw; -.note-metadata { - display: flex; - flex-direction: row; - justify-content: space-between; + .e-content { + img { + width: 100%; + } + } + } } - -.icon { - width: auto; - height: 1em; -} - -.note pre code { - padding: 1.5rem 2rem; - border-radius: 4px; -} - -//style the pagination links -@import "pagination"; diff --git a/resources/sass/_pagination.scss b/resources/sass/_pagination.scss index e33b3230..f4edc216 100644 --- a/resources/sass/_pagination.scss +++ b/resources/sass/_pagination.scss @@ -1,9 +1,10 @@ -//pagination.scss +// pagination.scss .pagination { display: flex; flex-direction: row; - justify-content: space-evenly; - font-size: 2rem; + align-items: center; + justify-content: space-around; list-style-type: none; + width: $mainWidth; } diff --git a/resources/sass/_projects.scss b/resources/sass/_projects.scss deleted file mode 100644 index e7505a98..00000000 --- a/resources/sass/_projects.scss +++ /dev/null @@ -1,5 +0,0 @@ -//projects.scss - -#projects { - font-size: 2rem; -} diff --git a/resources/sass/_site-header.scss b/resources/sass/_site-header.scss new file mode 100644 index 00000000..6ead7f56 --- /dev/null +++ b/resources/sass/_site-header.scss @@ -0,0 +1,25 @@ +// site-header.scss + +#topheader { + display: flex; + width: 100vw; + flex-direction: column; + align-items: center; + background-color: var(--black); + + a { + color: var(--white); + text-decoration: none; + } + + h1 { + margin-top: 0; + padding-top: 1rem; + font-size: 3rem; + } + + nav { + padding-bottom: 1rem; + font-size: 1.5rem; + } +} diff --git a/resources/sass/_styles.scss b/resources/sass/_styles.scss deleted file mode 100644 index 6a34274d..00000000 --- a/resources/sass/_styles.scss +++ /dev/null @@ -1,19 +0,0 @@ -//styles.scss - -html { - text-rendering: optimizeLegibility; - //text-decoration-skip-ink: auto; - overflow-wrap: break-word; - font-kerning: normal; -} - -h1 a { - text-decoration: none; -} - -#topheader a { - text-decoration: none; -} - -// tags -@import "tags"; diff --git a/resources/sass/_syndication.scss b/resources/sass/_syndication.scss new file mode 100644 index 00000000..5649a76a --- /dev/null +++ b/resources/sass/_syndication.scss @@ -0,0 +1,16 @@ +//syndication.scss + +.note-metadata { + display: flex; + flex-direction: row; + justify-content: space-between; + + .social-links { + flex-direction: row; + + svg { + height: 1em; + width: auto; + } + } +} diff --git a/resources/sass/_tags.scss b/resources/sass/_tags.scss deleted file mode 100644 index c568687b..00000000 --- a/resources/sass/_tags.scss +++ /dev/null @@ -1,49 +0,0 @@ -//tags.scss - -//sourced from https://codepen.io/wbeeftink/pen/dIaDH - -.tags { - margin: 0; - overflow: hidden; - padding: 0; -} - -.tags li { - float: left; - list-style-type: none; -} - -.tag, -.tag:visited { - background: var(--white); - border-radius: 3px 0 0 3px; - color: var(--black); - display: inline-block; - height: 2.6rem; - line-height: 2.6rem; - padding: 0 2rem 0 1rem; - position: relative; - margin: 0 1rem 1rem 0; - text-decoration: none; - transition: color 0.2s; -} - -.tag::after { - background: var(--brwhite); - border-bottom: 1.3rem solid transparent; - border-left: 1rem solid var(--white); - border-top: 1.3rem solid transparent; - content: ''; - position: absolute; - right: 0; - top: 0; -} - -.tag:hover { - background-color: var(--red); - color: var(--black); -} - -.tag:hover::after { - border-left-color: var(--red); -} diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss deleted file mode 100644 index f22c7928..00000000 --- a/resources/sass/_variables.scss +++ /dev/null @@ -1,4 +0,0 @@ -//variables.scss - -$body-width: 512px; -$header-height: 5rem; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 283e3d7d..430baa62 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,37 +1,18 @@ // app.scss -//variables used elsewhere -@import "variables"; - -//border-box -@import "border-box"; - -//base font styles -@import "base-font"; - -//layouts -@import "header"; +// General styles +@import "base"; +@import "site-header"; @import "main"; @import "articles"; @import "notes"; -@import "contacts-page"; -@import "projects"; @import "footer"; -@import "admin-form"; -@import "form"; -@import "likes"; -//hide the custom bridgy posse content -@import "bridgy-links"; - -//style the emoji alt-text (a11y) -@import "emoji"; - -//style the mapbox maps +// Mapbox styles @import "mapbox"; -//apply colors -@import "colors"; +// The syndication links at the end of notes +@import "syndication"; -//apply styles -@import "styles"; +// Accessible emoji +@import "emoji"; diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index aa669acf..eb6f86b7 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -7,7 +7,7 @@ - + @@ -41,9 +41,9 @@
@yield('content') -
@section('bio') @show + @@ -59,7 +59,7 @@

The code for {{ config('app.longurl') }} can be found on GitHub.

:

Built with love: Colophon

-

+

Indie Web Camp logo

@if (config('app.piwik') === true) diff --git a/resources/views/templates/bio.blade.php b/resources/views/templates/bio.blade.php index 722a668b..63a16f37 100644 --- a/resources/views/templates/bio.blade.php +++ b/resources/views/templates/bio.blade.php @@ -1,32 +1,32 @@ @section('bio') -
-

My name is Jonny Barnes, and - - jonnybarnes.uk - is my site. I’m from - - Manchester, - UK - .

-

I am active to varying degrees on several - silos:

- -

My usual online nickname is normally - jonnybarnes for other services. I also syndicate my content - to the IndieWeb friendly site - micro.blog. - Here’s a - profile pic. I also have a - PGP - key, with fingerprint. You can email me - at jonny at my domain, or message me on - XMPP.

-
+
+

My name is Jonny Barnes, and + + jonnybarnes.uk + is my site. I’m from + + Manchester, + UK + .

+

I am active to varying degrees on several + silos:

+ +

My usual online nickname is normally + jonnybarnes for other services. I also syndicate my content + to the IndieWeb friendly site + micro.blog. + Here’s a + profile pic. I also have a + PGP + key, with fingerprint. You can email me + at jonny at my domain, or message me on + XMPP.

+
@stop