jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'release/0.0.8.5'

Browse source
This commit is contained in:
Jonny Barnes 2016-07-18 16:52:42 +01:00
commit 187342de3c
8 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog.md
View file

@ -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

42
composer.lock generated
View file

@ -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",

2
public/assets/css/global.css vendored
View file

@ -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 */

BIN
public/assets/css/global.css.br
View file

Binary file not shown.

BIN
public/assets/css/global.css.gz
View file

Binary file not shown.

2
public/assets/css/maps/global.css.map
View file

File diff suppressed because one or more lines are too long

5
resources/assets/sass/components/forms.scss vendored
View file

@ -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 {

3
resources/assets/sass/layout.scss vendored
View file

@ -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;