Skip to content

Commit

Permalink
design tweak, SCSS linting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenhowells committed May 29, 2017
1 parent 9304de1 commit 1e7e8a8
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 44 deletions.
2 changes: 1 addition & 1 deletion _includes/main.min.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion _scss/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
padding: 6px;
width: 100%;
border-radius: $radius;

&:focus {
outline: none;
outline: none;
}
}
14 changes: 9 additions & 5 deletions _scss/_globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ $date-font: "Whitney SSm A", "Whitney SSm B", system, -apple-system, BlinkMacSys
$footnotes: "Whitney SSm A", "Whitney SSm B", system, -apple-system, BlinkMacSystemFont, Avenir, sans-serif;

// Colors
$accent-color: #f135a6;
$body-font-color: #555555;
$body-bg-color: #ffffff;
$accent-color: #3784b8;
$body-font-color: #555;
$body-bg-color: #fff;
$bg-contrast: #efefef;

// Dimensions
Expand All @@ -18,12 +18,12 @@ $radius: 4px;

// Grid
$small-grid: (
gutter: 0px,
gutter: 0,
media: 200px,
);

$medium-grid: (
gutter: 0px,
gutter: 0,
media: 600px,
);

Expand All @@ -39,18 +39,22 @@ $x-large-grid: (

@mixin page-box {
@include grid-column;

@include grid-media($small-grid) {
@include grid-column(12);
@include grid-push(0);
}

@include grid-media($medium-grid) {
@include grid-column(10);
@include grid-push(1);
}

@include grid-media($large-grid) {
@include grid-column(8);
@include grid-push(2);
}

@include grid-media($x-large-grid) {
@include grid-column(6);
@include grid-push(3);
Expand Down
76 changes: 62 additions & 14 deletions _scss/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
html, body {
html,
body {
height: 100%;
box-sizing: border-box;
}

*, *:before, *:after {
*,
*::before,
*::after {
box-sizing: inherit;
}

Expand All @@ -12,7 +15,7 @@ html, body {
margin-bottom: -100px;
}

.page-wrap:after {
.page-wrap::after {
content: "";
display: block;
height: $footer-height;
Expand All @@ -21,27 +24,53 @@ html, body {
ul {
margin: 0;
padding: 0;

li {
list-style: circle;
}
}

h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
margin-bottom: 12px;
margin-top: 12px;
}

article {
@include grid-container;
margin-bottom:120px;

h1, h2, h3, h4, h5, h6, p, ol, ul, table, blockquote, .archive-list, .search, video {
margin-bottom: 120px;

h1,
h2,
h3,
h4,
h5,
h6,
p,
ol,
ul,
table,
blockquote,
.archive-list,
.search,
video {
@include page-box;

padding-left: 10px;
padding-right: 10px;
}

p, ul, ol, blockquote, table, pre {
p,
ul,
ol,
blockquote,
table,
pre {
margin-bottom: 12px;
margin-top: 12px;
}
Expand All @@ -61,31 +90,38 @@ article {

pre code {
@include page-box;

overflow-x: auto;
padding: 12px 10px;
}

p code, li code {
p code,
li code {
border: 1px #e0e0e0 solid;
padding: 4px;
border-radius: $radius;
}

blockquote {
border-left: 4px solid $accent-color;
p, ul, ol {

p,
ul,
ol {
width: 100%;
float: none;
margin-left: 0;
}
}

.link_icon {
border: 0;
margin-left: 12px;
}
}

.post-meta, .post-meta-link {
.post-meta,
.post-meta-link {
display: block;
padding-bottom: 4px;
margin-bottom: 20px;
Expand All @@ -105,21 +141,24 @@ article {
img {
max-width: 100%;
opacity: 1;
transition: opacity .3s ease-in;
transition: opacity 0.3s ease-in;
display: block;
margin-left: auto;
margin-right: auto;

&.small-img {
transform: scale(0.5);
}
}

.archive-list {
margin: 0 0 60px 0;
margin: 0 0 60px;

* {
margin-left: 0;
padding-left: 0;
}

h3 {
width: 100%;
margin-top: 0;
Expand All @@ -131,6 +170,7 @@ img {
margin-top: 12px;
margin-bottom: 24px;
}

.explanation {
width: 100%;
overflow: hidden;
Expand All @@ -144,10 +184,12 @@ img {
ol {
border-top: 1px dashed #eaeaea;
padding-top: 12px;
padding-left: 0px;
padding-left: 0;
list-style-position: inside;

li {
padding: 0 10px;

p {
margin: 0 0 20px;
width: 100%;
Expand All @@ -161,19 +203,25 @@ img {

footer {
@include grid-container;

height: $footer-height;
background-color: $body-font-color;
padding-top: 16px;
p, ul {

p,
ul {
@include page-box;
}

p {
margin-top: 0;
padding: 0 10px;
}

ul {
padding: 0 10px;
margin-bottom: 4px;

li {
list-style: none;
display: inline-block;
Expand Down
7 changes: 6 additions & 1 deletion _scss/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
.nav {
padding-left: 0 !important;
padding-right: 0 !important;
margin: 12px 0 20px 0 !important;
margin: 12px 0 20px !important;

.logo {
margin-bottom: 12px;

.nav-logo {
padding-left: 10px !important;
}
}

ul {
float: left !important;
clear: left;
width: 100%;
border-top: 1px solid #eaeaea;
background: #fafafa;
padding-left: 10px;

li {
&:first-child {
a {
Expand All @@ -25,6 +29,7 @@
}
}
}

article {
li {
margin-left: 20px;
Expand Down
9 changes: 8 additions & 1 deletion _scss/_nav.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
nav {
@include grid-container;

.nav {
@include page-box;

padding-left: 10px;
padding-right: 10px;
margin: 60px 0;
border-bottom: 1px solid #eaeaea;
border-bottom: 4px solid $body-font-color;

.logo {
display: inline-block;
float: left;

.nav-logo {
padding: 0 12px 0 0;
}
}

ul {
float: right;

li {
list-style: none;
display: inline-block;

a {
padding: 0 10px;
}
Expand Down
5 changes: 5 additions & 0 deletions _scss/_pagination.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
.pager {
@include grid-container;

margin-bottom: 80px;

ul {
@include page-box;

padding-left: 10px;
padding-right: 10px;

li {
list-style: none;

a {
background: $body-font-color;
padding: 14px;
Expand Down
Loading

0 comments on commit 1e7e8a8

Please sign in to comment.