Skip to content
This repository has been archived by the owner on Jan 10, 2018. It is now read-only.

Commit

Permalink
Merge branch 'release/2.3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
mmistakes committed Sep 15, 2016
2 parents 1d29519 + 1de64ae commit 2e9dc3c
Show file tree
Hide file tree
Showing 13 changed files with 285 additions and 136 deletions.
13 changes: 12 additions & 1 deletion _sass/_archives.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,43 @@
margin: 0;
padding: 0;
list-style-type: none;

li {
padding: 8px 0;
border-bottom: 1px solid lighten($black,80);
border-bottom: 1px solid rgba($black,.10);
@include font-size(18,no);
@include clearfix;

> a {
border-bottom-width: 0; /* remove underlines from items in post indexes */
}
}

a > span {
float: right;
}

.entry-date {
@include font-size(14,no);
text-transform: uppercase;
display: none;

@include media($medium) {
display: inline;
}
}

/* post excerpt */
.excerpt {
display: block;
float: none;
@include font-size(14, no, 16);

@include media($medium) {
width: 70%;
}

@include media($large) {
width: 60%;
}
Expand All @@ -58,20 +66,23 @@
padding: 4px 0;
overflow: hidden;
@include clearfix;

&.inline li {
float: left;
@include font-size(14);
line-height: 2.5;
}

a {
padding: 4px 6px;
margin: 2px;
background-color: lighten($black, 90);
@include rounded(4px);
text-decoration: none;

span {
vertical-align: super;
@include font-size(10);
}
}
}
}
41 changes: 26 additions & 15 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,27 @@ h1, h2, h3, h4, h5, h6 {
font-family: $heading-font;
text-rendering: optimizeLegibility; // Fix the character spacing for headings
}

h1 {
@include font-size(36);
}

h2 {
@include font-size(32);
}

h3 {
@include font-size(28);
}

h4 {
@include font-size(24);
}

h5 {
@include font-size(20);
}

h6 {
@include font-size(18);
}
Expand All @@ -90,16 +96,20 @@ ins {
a {
text-decoration: none;
color: $link-color;

&:visited {
color: lighten($link-color, 20);
}

&:hover {
color: darken($link-color, 20);
}

&:focus {
outline: thin dotted;
color: darken($link-color, 20);
}

&:hover,
&:active {
outline: 0;
Expand All @@ -111,13 +121,13 @@ a {
========================================================================== */

hr {
display: block;
margin: 1em 0;
padding: 0;
height: 1px;
border: 0;
border-top: 1px solid #ccc;
border-bottom: 1px solid #fff;
display: block;
margin: 1em 0;
padding: 0;
height: 1px;
border: 0;
border-top: 1px solid #ccc;
border-bottom: 1px solid #fff;
}

/*
Expand All @@ -129,16 +139,20 @@ figure {
padding-top: 10px;
padding-bottom: 10px;
@include clearfix;

img {
margin-bottom: 10px;
}

a {

img {
@include transform(translateY(0));
-webkit-transition-duration: 0.25s;
-moz-transition-duration: 0.25s;
-o-transition-duration: 0.25s;
opacity: 0.7;

&:hover {
@include transform(translateY(-5px));
@include box-shadow(0 0 10px rgba($black, .20));
Expand All @@ -162,9 +176,9 @@ figcaption {
}



// Tables
// --------------------------------------------------

table {
width: 100%;
}
Expand All @@ -182,17 +196,16 @@ blockquote {
}





// Code
// --------------------------------------------------

tt, code, kbd, samp, pre {
font-family: $code-font;
}

p,
li {

code {
@include font-size(14);
font-family: $code-font;
Expand All @@ -204,18 +217,16 @@ li {
@include rounded(3px);
}
}

pre {
@include font-size(14);
overflow-x: auto;
}





// Global Transition
// ---------------------------------------------------

b, i, strong, em, blockquote, p, q, span, figure, img, h1, h2, header, input, a, .highlight {
@include transition(all .2s ease);
@include transition(all 0.2s ease);
}
2 changes: 2 additions & 0 deletions _sass/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
color: $white;
border: 2px solid $black !important;
border-radius: $border-radius;

&:visited {
color: $white;
}

&:hover {
background-color: $white;
color: $black;
Expand Down
3 changes: 3 additions & 0 deletions _sass/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@include font-size(14);
font-style: italic;
color: lighten($text-color,20);

a {
color: lighten($text-color,20);
}
Expand All @@ -21,8 +22,10 @@

.social-icons {
margin: 1em 0 2em;

a {
padding: 4px 8px;

&:hover {
color: $black;
}
Expand Down
Loading

0 comments on commit 2e9dc3c

Please sign in to comment.