diff --git a/changelog.md b/changelog.md index 8c01b87b..f6b62544 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## Version 0.0.8.5 (2016-07-18) + - Set the size of the textarea in a form better + - Update to latest Guzzle to fix CVE-2016-5385 + ## Version 0.0.8.4 (2016-07-18) - Make the revised non-elixir asset links absolute diff --git a/composer.lock b/composer.lock index 3ecce53a..da7115b0 100644 --- a/composer.lock +++ b/composer.lock @@ -527,27 +527,27 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.2.0", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d094e337976dff9d8e2424e8485872194e768662" + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", - "reference": "d094e337976dff9d8e2424e8485872194e768662", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427", "shasum": "" }, "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" }, "type": "library", "extra": { @@ -585,7 +585,7 @@ "rest", "web service" ], - "time": "2016-03-21 20:02:09" + "time": "2016-07-15 17:22:37" }, { "name": "guzzlehttp/promises", @@ -1390,16 +1390,16 @@ }, { "name": "league/flysystem", - "version": "1.0.24", + "version": "1.0.25", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b" + "reference": "a76afa4035931be0c78ca8efc6abf3902362f437" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437", + "reference": "a76afa4035931be0c78ca8efc6abf3902362f437", "shasum": "" }, "require": { @@ -1412,7 +1412,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpunit/phpunit": "~4.8 || ~5.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1469,7 +1469,7 @@ "sftp", "storage" ], - "time": "2016-06-03 19:11:39" + "time": "2016-07-18 12:22:57" }, { "name": "league/flysystem-aws-s3-v3", @@ -2440,16 +2440,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "4.5.0", + "version": "4.7.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "8ba0ded185ee7c3c36d3ebb531a881f17950677d" + "reference": "c914f9e32c5a69301dab9fb8b17f2b2a579a24d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/8ba0ded185ee7c3c36d3ebb531a881f17950677d", - "reference": "8ba0ded185ee7c3c36d3ebb531a881f17950677d", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/c914f9e32c5a69301dab9fb8b17f2b2a579a24d6", + "reference": "c914f9e32c5a69301dab9fb8b17f2b2a579a24d6", "shasum": "" }, "require": { @@ -2496,7 +2496,7 @@ "media", "spatie" ], - "time": "2016-07-09 13:49:32" + "time": "2016-07-18 07:56:41" }, { "name": "spatie/pdf-to-image", diff --git a/public/assets/css/global.css b/public/assets/css/global.css index 5da3c3cd..3bc3ee09 100644 --- a/public/assets/css/global.css +++ b/public/assets/css/global.css @@ -1,3 +1,3 @@ -html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:-ms-flexbox;display:flex;-ms-flex-flow:row;flex-flow:row}#topheader a{padding:0.5em 1em}#topheader h1{font-size:1em;margin:0}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em;fill:#268bd2}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}article h1{font-size:1.2em;margin-bottom:0}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}code{font-family:"Operator Mono","Monaco","Inconsolata",monospace;font-weight:200}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} +html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:-ms-flexbox;display:flex;-ms-flex-flow:row;flex-flow:row}#topheader a{padding:0.5em 1em}#topheader h1{font-size:1em;margin:0}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em;fill:#268bd2}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}article h1{font-size:1.2em;margin-bottom:0}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}code{font-family:"Operator Mono","Monaco","Inconsolata",monospace;font-weight:200}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px;font-size:1em}textarea{font-size:1.2em}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} /*# sourceMappingURL=maps/global.css.map */ diff --git a/public/assets/css/global.css.br b/public/assets/css/global.css.br index 98698a20..a0f3474b 100644 Binary files a/public/assets/css/global.css.br and b/public/assets/css/global.css.br differ diff --git a/public/assets/css/global.css.gz b/public/assets/css/global.css.gz index b1bb4821..03f3d4b6 100644 Binary files a/public/assets/css/global.css.gz and b/public/assets/css/global.css.gz differ diff --git a/public/assets/css/maps/global.css.map b/public/assets/css/maps/global.css.map index 1ffcfb9f..0207776e 100644 --- a/public/assets/css/maps/global.css.map +++ b/public/assets/css/maps/global.css.map @@ -1 +1 @@ -{"version":3,"sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"names":[],"mappings":"AA0BA,KACI,6CAAe,CAClB,KAGG,YAAc,CACjB,KC5BG,qBAAuB,CAC1B,qBAKG,kBAAoB,CACvB,WAGG,oBAAA,AACA,aAAA,kBAAA,AAAe,aAAA,CAClB,aAGG,iBAAmB,CACtB,cAGG,cACA,QAAU,CACb,IAGG,iBAAmB,CACtB,aAGG,gBAAkB,CACrB,MAGG,yBACA,gCACA,cACA,cAAgB,CACnB,aAGG,YACA,cACA,SACA,UAAY,CACf,QAGG,oBAAsB,CACzB,+BAGG,YAAc,CACjB,eAGG,UAAY,CACf,cAGG,WAAa,CAChB,gBAGG,oBAAsB,CACzB,MAGG,WACA,WACA,YDnDe,CCoDlB,OAGG,gBACA,iBACA,gBACA,aAAe,CAClB,UAGG,gBACA,iBACA,gBACA,eAAiB,CACpB,gBAGG,gBAAkB,CACrB,aAGG,kBACA,yBACA,gBACA,qBACA,iBACA,kBAAoB,CACvB,iBAGG,WACA,kBACA,0BAA4B,CAC/B,YAGG,aAAe,CAClB,kBAGG,iBACA,kBAAoB,CACvB,gBAGG,aAAe,CAClB,YAGG,WACA,YACA,4BAA8B,CACjC,eAKG,iBACA,mBAAqB,CACxB,WAGG,gBACA,eAAiB,CACpB,WAGG,gBACA,kBACA,iBAAmB,CACtB,SAIG,iBAAmB,CACtB,eAGG,oBAAsB,CACzB,aAGG,YACA,UACA,kBACA,MACA,MAAQ,CACX,cAGG,eAAiB,CACpB,KAGG,YAAc,CACjB,0BAIG,KACI,iBACA,iBAAmB,CACtB,OAGG,iBACA,iBAAmB,CACtB,SAGG,YACA,YAAc,CACjB,CAGL,0BACI,KACI,iBACA,iBAAmB,CACtB,QAGG,oBAAsB,CACzB,OAGG,iBACA,iBAAmB,CACtB,SAGG,WACA,WAAa,CAChB,CC5ML,KACI,kCACA,6BACA,iCACA,eAAiB,CACpB,KAGG,6DACA,eAAiB,CACpB,cAGG,gCFZmC,CEatC,GAGG,gCFfsC,CEgBzC,aAGG,oBAAsB,CACzB,IAGG,4BAA8B,CACjC,oBAGG,oBAAsB,CACzB,cAGG,oBAAsB,CACzB,OAGG,eAAiB,CACpB,OAGG,WACA,UAAY,CACf,KC3CG,aHMe,CGLlB,SAGG,aHEe,CGDlB,EAGG,aHWe,CGVlB,KCRG,UAAY,CACf,SAGG,YACA,UAAY,CACf,+CAKG,UAAY,CACf,sBAKG,wBACA,qBACA,yBACA,cACA,yBACA,iBAAmB,CACtB,aAGG,4BACA,yBACA,aJvBe,CIwBlB,gBAGG,yBACA,aJ5Be,CI6BlB,uBAGG,4BACA,wBAA0B,CAC7B,OAGG,mBACA,cACA,WAAa,CAChB,wBC7CG,0BAA4B,CAC/B,8BAGG,YAAc,CACjB","file":"global.css","sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n$font-stack-code: \"Operator Mono\", \"Monaco\", \"Inconsolata\", monospace;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\n//boxes\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\n#topheader h1 {\n font-size: 1em;\n margin: 0;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n fill: $blue;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\narticle h1 {\n font-size: 1.2em;\n margin-bottom: 0;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\ncode {\n font-family: $font-stack-code;\n font-weight: 200;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"names":[],"mappings":"AA0BA,KACI,6CAAe,CAClB,KAGG,YAAc,CACjB,KC7BG,qBAAuB,CAC1B,qBAKG,kBAAoB,CACvB,WAGG,oBAAA,AACA,aAAA,kBAAA,AAAe,aAAA,CAClB,aAGG,iBAAmB,CACtB,cAGG,cACA,QAAU,CACb,IAGG,iBAAmB,CACtB,aAGG,gBAAkB,CACrB,MAKG,yBACA,gCACA,cACA,cAAgB,CACnB,aAGG,YACA,cACA,SACA,UAAY,CACf,QAGG,oBAAsB,CACzB,+BAGG,YAAc,CACjB,eAGG,UAAY,CACf,cAGG,WAAa,CAChB,gBAGG,oBAAsB,CACzB,MAGG,WACA,WACA,YDpDe,CCqDlB,OAGG,gBACA,iBACA,gBACA,aAAe,CAClB,UAGG,gBACA,iBACA,gBACA,eAAiB,CACpB,gBAGG,gBAAkB,CACrB,aAGG,kBACA,yBACA,gBACA,qBACA,iBACA,kBAAoB,CACvB,iBAGG,WACA,kBACA,0BAA4B,CAC/B,YAGG,aAAe,CAClB,kBAGG,iBACA,kBAAoB,CACvB,gBAGG,aAAe,CAClB,YAGG,WACA,YACA,4BAA8B,CACjC,eAKG,iBACA,mBAAqB,CACxB,WAGG,gBACA,eAAiB,CACpB,WAGG,gBACA,kBACA,iBAAmB,CACtB,SAIG,iBAAmB,CACtB,eAGG,oBAAsB,CACzB,aAGG,YACA,UACA,kBACA,MACA,MAAQ,CACX,cAGG,eAAiB,CACpB,KAGG,YAAc,CACjB,0BAIG,KACI,iBACA,iBAAmB,CACtB,OAGG,iBACA,iBAAmB,CACtB,SAGG,YACA,YAAc,CACjB,CAGL,0BACI,KACI,iBACA,iBAAmB,CACtB,QAGG,oBAAsB,CACzB,OAGG,iBACA,iBAAmB,CACtB,SAGG,WACA,WAAa,CAChB,CC7ML,KACI,kCACA,6BACA,iCACA,eAAiB,CACpB,KAGG,6DACA,eAAiB,CACpB,cAGG,gCFZmC,CEatC,GAGG,gCFfsC,CEgBzC,aAGG,oBAAsB,CACzB,IAGG,4BAA8B,CACjC,oBAGG,oBAAsB,CACzB,cAGG,oBAAsB,CACzB,OAGG,eAAiB,CACpB,OAGG,WACA,UAAY,CACf,KC3CG,aHMe,CGLlB,SAGG,aHEe,CGDlB,EAGG,aHWe,CGVlB,KCRG,UAAY,CACf,SAGG,YACA,UAAY,CACf,+CAKG,UAAY,CACf,sBAKG,wBACA,qBACA,yBACA,cACA,yBACA,kBACA,aAAe,CAClB,SAGG,eAAiB,CACpB,aAGG,4BACA,yBACA,aJ5Be,CI6BlB,gBAGG,yBACA,aJjCe,CIkClB,uBAGG,4BACA,wBAA0B,CAC7B,OAGG,mBACA,cACA,WAAa,CAChB,wBClDG,0BAA4B,CAC/B,8BAGG,YAAc,CACjB","file":"global.css","sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n$font-stack-code: \"Operator Mono\", \"Monaco\", \"Inconsolata\", monospace;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\n#topheader h1 {\n font-size: 1em;\n margin: 0;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n// notes\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n fill: $blue;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\narticle h1 {\n font-size: 1.2em;\n margin-bottom: 0;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\ncode {\n font-family: $font-stack-code;\n font-weight: 200;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n font-size: 1em;\n}\n\ntextarea {\n font-size: 1.2em; //textarea doesn’t resize with the rest\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/resources/assets/sass/components/forms.scss b/resources/assets/sass/components/forms.scss index c488f703..94833eb5 100644 --- a/resources/assets/sass/components/forms.scss +++ b/resources/assets/sass/components/forms.scss @@ -24,6 +24,11 @@ textarea { color: $base3; border: 1px solid $base3; border-radius: 4px; + font-size: 1em; +} + +textarea { + font-size: 1.2em; //textarea doesn’t resize with the rest } button:hover { diff --git a/resources/assets/sass/layout.scss b/resources/assets/sass/layout.scss index ed697f48..11e0da6c 100644 --- a/resources/assets/sass/layout.scss +++ b/resources/assets/sass/layout.scss @@ -1,6 +1,5 @@ //layout.scss -//boxes html { box-sizing: border-box; } @@ -33,6 +32,8 @@ nav { padding-left: 2em; } +// notes + .note { background-color: $base2; box-shadow: 0 0 10px 2px $base1;