Stylelint the SCSS, and re-compress the updated assets

This commit is contained in:
Jonny Barnes 2016-06-20 22:25:05 +01:00
parent cb8e2b38f5
commit b7821146d6
37 changed files with 180 additions and 161 deletions

View file

@ -18,11 +18,11 @@
"prod": "gulp --production",
"dev": "gulp watch",
"lint-staged": "lint-staged",
"stylelint-staged": "stylint --syntax=scss"
"stylelint-staged": "stylelint --syntax=scss"
},
"lint-staged": {
"eslint": "resources/assets/js/*.js",
"stylint-staged": "resources/assets/sass/**/*.scss"
"stylelint-staged": "resources/assets/sass/**/*.scss"
},
"pre-commit": [
"lint-staged"

View file

@ -7,13 +7,14 @@ html {
html {
box-sizing: border-box; }
*, *:before, *:after {
*,
*::before,
*::after {
box-sizing: inherit; }
#topheader {
display: -ms-flexbox;
display: -webkit-box;
display: flex;
-ms-flex-flow: row;
flex-flow: row; }
#topheader a {
@ -28,10 +29,10 @@ nav {
.note {
background-color: #eee8d5;
box-shadow: 0 0 10px 2px #93a1a1;
padding: 0.5em 0.5em;
padding: 0.5em;
margin-top: 1em; }
.note:after {
.note::after {
content: " ";
display: block;
height: 0;
@ -61,7 +62,7 @@ nav {
margin-left: 2em;
margin-right: 2em;
font-size: 0.8em;
padding: 0.5em 0.5em; }
padding: 0.5em; }
.reply-to {
margin-left: 2em;
@ -81,7 +82,6 @@ nav {
white-space: nowrap; }
.mini-h-card img {
height: 1.26em;
display: inline;
border-radius: 2px;
vertical-align: text-bottom; }
@ -156,6 +156,7 @@ article header {
body {
text-rendering: optimizeLegibility;
-webkit-font-feature-settings: "liga";
font-feature-settings: "liga";
font-family: "leitura-news", serif;
font-size: 1.2em; }
@ -170,6 +171,7 @@ h1 {
text-decoration: none; }
nav {
-webkit-font-feature-settings: "dlig";
font-feature-settings: "dlig"; }
article header h1 a {
@ -201,10 +203,14 @@ fieldset {
min-width: 0;
width: 100%; }
input[type="text"], input[type="file"], textarea {
input[type="text"],
input[type="file"],
textarea {
width: 100%; }
input, button, textarea {
input,
button,
textarea {
-webkit-appearance: none;
-moz-appearance: none;
background-color: #002b36;
@ -213,6 +219,7 @@ input, button, textarea {
border-radius: 4px; }
button:hover {
-webkit-transition: 0.5s ease-in-out;
transition: 0.5s ease-in-out;
background-color: #fdf6e3;
color: #002b36; }

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -7,13 +7,14 @@ html {
html {
box-sizing: border-box; }
*, *:before, *:after {
*,
*::before,
*::after {
box-sizing: inherit; }
#topheader {
display: -ms-flexbox;
display: -webkit-box;
display: flex;
-ms-flex-flow: row;
flex-flow: row; }
#topheader a {
@ -28,10 +29,10 @@ nav {
.note {
background-color: #eee8d5;
box-shadow: 0 0 10px 2px #93a1a1;
padding: 0.5em 0.5em;
padding: 0.5em;
margin-top: 1em; }
.note:after {
.note::after {
content: " ";
display: block;
height: 0;
@ -61,7 +62,7 @@ nav {
margin-left: 2em;
margin-right: 2em;
font-size: 0.8em;
padding: 0.5em 0.5em; }
padding: 0.5em; }
.reply-to {
margin-left: 2em;
@ -81,7 +82,6 @@ nav {
white-space: nowrap; }
.mini-h-card img {
height: 1.26em;
display: inline;
border-radius: 2px;
vertical-align: text-bottom; }
@ -156,6 +156,7 @@ article header {
body {
text-rendering: optimizeLegibility;
-webkit-font-feature-settings: "liga";
font-feature-settings: "liga";
font-family: "leitura-news", serif;
font-size: 1.2em; }
@ -170,6 +171,7 @@ h1 {
text-decoration: none; }
nav {
-webkit-font-feature-settings: "dlig";
font-feature-settings: "dlig"; }
article header h1 a {
@ -201,10 +203,14 @@ fieldset {
min-width: 0;
width: 100%; }
input[type="text"], input[type="file"], textarea {
input[type="text"],
input[type="file"],
textarea {
width: 100%; }
input, button, textarea {
input,
button,
textarea {
-webkit-appearance: none;
-moz-appearance: none;
background-color: #002b36;
@ -213,6 +219,7 @@ input, button, textarea {
border-radius: 4px; }
button:hover {
-webkit-transition: 0.5s ease-in-out;
transition: 0.5s ease-in-out;
background-color: #fdf6e3;
color: #002b36; }

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View file

@ -1,12 +1,12 @@
{
"assets/bower/Autolinker.min.js": "assets/bower/Autolinker.min-2cb3468034.js",
"assets/bower/Autolinker.min.js": "assets/bower/Autolinker-2cb3468034.min.js",
"assets/bower/alertify.css": "assets/bower/alertify-1b3c6aa174.css",
"assets/bower/alertify.js": "assets/bower/alertify-84061c87f5.js",
"assets/bower/fetch.js": "assets/bower/fetch-d8a2646ccc.js",
"assets/bower/marked.min.js": "assets/bower/marked.min-c2a88705e2.js",
"assets/bower/marked.min.js": "assets/bower/marked-c2a88705e2.min.js",
"assets/bower/sanitize.css": "assets/bower/sanitize-85919f917a.css",
"assets/bower/store2.min.js": "assets/bower/store2.min-c4daa8f871.js",
"assets/css/global.css": "assets/css/global-f45e4f1fb0.css",
"assets/bower/store2.min.js": "assets/bower/store2-c4daa8f871.min.js",
"assets/css/global.css": "assets/css/global-c8783949cd.css",
"assets/css/projects.css": "assets/css/projects-d945298e4f.css",
"assets/js/form-save.js": "assets/js/form-save-4d4f6e1cb8.js",
"assets/js/links.js": "assets/js/links-c394f9c920.js",

View file

@ -1,12 +1,12 @@
//colours.scss
body {
color: $base03;
color: $base03;
}
header a {
color: $base03;
color: $base03;
}
a {
color: $blue;
color: $blue;
}

View file

@ -1,41 +1,41 @@
//fonts.scss
body {
text-rendering: optimizeLegibility;
font-feature-settings: "liga";
font-family: $font-stack-body;
font-size: 1.2em;
text-rendering: optimizeLegibility;
font-feature-settings: "liga";
font-family: $font-stack-body;
font-size: 1.2em;
}
#topheader h1 {
font-family: $font-stack-body;
font-family: $font-stack-body;
}
h1 {
font-family: $font-stack-headers;
font-family: $font-stack-headers;
}
#topheader a {
text-decoration: none;
text-decoration: none;
}
nav {
font-feature-settings: "dlig";
font-feature-settings: "dlig";
}
article header h1 a {
text-decoration: none;
text-decoration: none;
}
article div a {
text-decoration: none;
text-decoration: none;
}
footer {
font-size: 0.8em;
font-size: 0.8em;
}
.emoji {
width: auto;
height: 1em;
width: auto;
height: 1em;
}

View file

@ -1,45 +1,49 @@
//forms.scss
form {
width: 100%;
width: 100%;
}
fieldset {
min-width: 0;
width: 100%;
min-width: 0;
width: 100%;
}
input[type="text"], input[type="file"], textarea {
width: 100%;
input[type="text"],
input[type="file"],
textarea {
width: 100%;
}
input, button, textarea {
-webkit-appearance: none;
-moz-appearance: none;
background-color: $base03;
color: $base3;
border: 1px solid $base3;
border-radius: 4px;
input,
button,
textarea {
-webkit-appearance: none;
-moz-appearance: none;
background-color: $base03;
color: $base3;
border: 1px solid $base3;
border-radius: 4px;
}
button:hover {
transition: 0.5s ease-in-out;
background-color: $base3;
color: $base03;
transition: 0.5s ease-in-out;
background-color: $base3;
color: $base03;
}
button:disabled {
background-color: $base1;
color: $base03;
background-color: $base1;
color: $base03;
}
input[type="checkbox"] {
-webkit-appearance: checkbox;
-moz-appearance: checkbox;
-webkit-appearance: checkbox;
-moz-appearance: checkbox;
}
#photo {
background: inherit;
color: inherit;
border: none;
background: inherit;
color: inherit;
border: none;
}

View file

@ -1,9 +1,9 @@
//twitter.scss
.twitter-tweet-rendered {
margin-bottom: 0 !important;
margin-bottom: 0 !important;
}
.twitter-tweet-rendered + .note {
margin-top: 0;
margin-top: 0;
}

View file

@ -24,11 +24,11 @@ $green: #859900;
//global styles
html {
background: url('/assets/img/escheresque.png');
background: url('/assets/img/escheresque.png');
}
.map {
height: 150px;
height: 150px;
}
//layout

View file

@ -2,196 +2,197 @@
//boxes
html {
box-sizing: border-box;
box-sizing: border-box;
}
*, *:before, *:after {
box-sizing: inherit;
*,
*::before,
*::after {
box-sizing: inherit;
}
#topheader {
display: flex;
flex-flow: row;
display: flex;
flex-flow: row;
}
#topheader a {
padding: 0.5em 1em;
padding: 0.5em 1em;
}
nav {
padding-top: 0.5em;
padding-top: 0.5em;
}
.social-list {
padding-left: 2em;
padding-left: 2em;
}
.note {
background-color: $base2;
box-shadow: 0 0 10px 2px $base1;
padding: 0.5em 0.5em;
margin-top: 1em;
background-color: $base2;
box-shadow: 0 0 10px 2px $base1;
padding: 0.5em;
margin-top: 1em;
}
.note:after {
content: " ";
display: block;
height: 0;
clear: both;
.note::after {
content: " ";
display: block;
height: 0;
clear: both;
}
.note a {
word-wrap: break-word;
word-wrap: break-word;
}
.note .e-content p:first-child {
margin-top: 0;
margin-top: 0;
}
.note-metadata {
width: 100%;
width: 100%;
}
.social-links {
float: right;
float: right;
}
.social-links a {
text-decoration: none;
text-decoration: none;
}
.icon {
width: auto;
height: 1em;
fill: $blue;
width: auto;
height: 1em;
fill: $blue;
}
.reply {
margin-left: 2em;
margin-right: 2em;
font-size: 0.8em;
padding: 0.5em 0.5em;
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;
margin-left: 2em;
margin-right: 2em;
font-size: 0.8em;
padding-top: 2em;
}
.reply-to + .note {
margin-top: 0.3em;
margin-top: 0.3em;
}
.mini-h-card {
border-radius: 2px;
border: 1px solid $base01;
padding: 0 0.2em;
text-decoration: none;
margin-right: 5px;
white-space: nowrap;
border-radius: 2px;
border: 1px solid $base01;
padding: 0 0.2em;
text-decoration: none;
margin-right: 5px;
white-space: nowrap;
}
.mini-h-card img {
height: 1.26em;
display: inline;
border-radius: 2px;
vertical-align: text-bottom;
display: inline;
border-radius: 2px;
vertical-align: text-bottom;
}
.like-photo {
height: 1.26em;
height: 1.26em;
}
.reply .e-content {
margin-top: 0.5em;
padding-left: 0.5em;
margin-top: 0.5em;
padding-left: 0.5em;
}
.notes-subtitle {
font-size: 1em;
font-size: 1em;
}
.note-photo {
width: 100%;
height: auto;
image-orientation: from-image;
width: 100%;
height: auto;
image-orientation: from-image;
}
//articles
article header {
margin-top: 0.5em;
margin-bottom: 0.8em;
margin-top: 0.5em;
margin-bottom: 0.8em;
}
.post-info {
font-size: 0.8em;
font-style: italic;
margin-top: -0.8em;
font-size: 0.8em;
font-style: italic;
margin-top: -0.8em;
}
//contacts
.contact {
position: relative;
position: relative;
}
.contact-links {
list-style-type: none;
list-style-type: none;
}
.contact img {
height: auto;
width: 2em;
position: absolute;
top: 0;
left: 0;
height: auto;
width: 2em;
position: absolute;
top: 0;
left: 0;
}
.contact-info {
margin-left: 2em;
margin-left: 2em;
}
#map {
height: 300px;
height: 300px;
}
/* media queries */
@media (min-width: 700px) {
main {
margin-left: 10em;
margin-right: 10em;
}
main {
margin-left: 10em;
margin-right: 10em;
}
footer {
margin-left: 13em;
margin-right: 13em;
}
footer {
margin-left: 13em;
margin-right: 13em;
}
.youtube {
width: 640px;
height: 360px;
}
.youtube {
width: 640px;
height: 360px;
}
}
@media (max-width: 699px) {
main {
margin-left: 10px;
margin-right: 10px;
}
main {
margin-left: 10px;
margin-right: 10px;
}
article {
word-wrap: break-word;
}
article {
word-wrap: break-word;
}
footer {
margin-left: 15px;
margin-right: 15px;
}
footer {
margin-left: 15px;
margin-right: 15px;
}
.youtube {
width: 100%;
height: auto;
}
.youtube {
width: 100%;
height: auto;
}
}