Skip to content

Commit d6ae14a

Browse files
committed
Merge branch 'develop'
2 parents faa6666 + 552fdeb commit d6ae14a

File tree

19 files changed

+149
-49
lines changed

19 files changed

+149
-49
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v2.0.0
2+
## 02/18/2016
3+
4+
1. [](#bugfix)
5+
* Change the template structures
6+
17
# v1.1.2
28
## 02/15/2016
39

blueprints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Medium
2-
version: 1.1.2
2+
version: 2.0.0
33
description: Medium is a simple and modern blogging theme based on Medium's design language, built for Grav CMS.
44
icon: globe
55
author:

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grav-theme-medium",
3-
"version": "1.1.2",
3+
"version": "2.0.0",
44
"authors": [
55
"Matthew Blode"
66
],

dist/images/avatar.png

1.47 KB
Loading

dist/images/favicon.ico

5.06 KB
Binary file not shown.

dist/styles/app.css

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,15 +1307,15 @@ dl {
13071307

13081308
blockquote {
13091309
margin: 0 0 1rem;
1310-
padding: 0.5625rem 1.25rem 0 1.1875rem;
1311-
border-left: 2px solid #333; }
1310+
padding: 0;
1311+
border-left: none; }
13121312
blockquote, blockquote p {
13131313
line-height: 1.6;
13141314
color: #333; }
13151315

13161316
cite {
13171317
display: block;
1318-
font-size: 0.8125rem;
1318+
font-size: 1rem;
13191319
color: #808080; }
13201320
cite:before {
13211321
content: '\2014 \0020'; }
@@ -3849,6 +3849,9 @@ img {
38493849
.hr--small {
38503850
margin-top: 0; }
38513851

3852+
.pad--10 {
3853+
padding-top: 10px; }
3854+
38523855
body {
38533856
font-size: 120%; }
38543857

@@ -3875,12 +3878,10 @@ h5 {
38753878
button {
38763879
font-family: -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif; }
38773880

3878-
blockquote {
3879-
font-style: italic; }
3880-
38813881
pre {
38823882
background: #efefef;
3883-
margin-bottom: 16px; }
3883+
margin-bottom: 16px;
3884+
padding: 5px; }
38843885

38853886
date,
38863887
.footer--text,
@@ -3903,6 +3904,39 @@ date,
39033904
.dark:hover {
39043905
color: #00ab6b; }
39053906

3907+
blockquote > p {
3908+
padding: 15px;
3909+
border-left: 3px solid #333; }
3910+
3911+
blockquote > blockquote > blockquote {
3912+
margin: 0; }
3913+
blockquote > blockquote > blockquote p {
3914+
padding: 15px; }
3915+
blockquote > blockquote > blockquote > p {
3916+
border-left: 3px solid #00ab6b;
3917+
color: #00ab6b; }
3918+
blockquote > blockquote > blockquote > p a {
3919+
color: #00ab6b;
3920+
text-decoration: underline; }
3921+
blockquote > blockquote > blockquote > blockquote > p {
3922+
border-left: 3px solid #ffae00;
3923+
color: #ffae00; }
3924+
blockquote > blockquote > blockquote > blockquote > p a {
3925+
color: #ffae00;
3926+
text-decoration: underline; }
3927+
blockquote > blockquote > blockquote > blockquote > blockquote > p {
3928+
border-left: 3px solid #ec5840;
3929+
color: #ec5840; }
3930+
blockquote > blockquote > blockquote > blockquote > blockquote > p a {
3931+
color: #ec5840;
3932+
text-decoration: underline; }
3933+
blockquote > blockquote > blockquote > blockquote > blockquote > blockquote > p {
3934+
border-left: 5px solid #3adb76;
3935+
color: #3adb76; }
3936+
blockquote > blockquote > blockquote > blockquote > blockquote > blockquote > p a {
3937+
color: #00ab6b;
3938+
text-decoration: underline; }
3939+
39063940
.infinite-scroll {
39073941
margin: 0; }
39083942

@@ -4009,7 +4043,6 @@ date,
40094043
width: auto !important; }
40104044

40114045
.profile {
4012-
margin-bottom: 40px;
40134046
margin-top: 40px;
40144047
padding: 0; }
40154048

dist/styles/app.min.css

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grav-theme-medium",
3-
"version": "1.1.2",
3+
"version": "2.0.0",
44
"description": "Medium is a simple and modern blogging theme based on Medium's design language, built for Grav CMS.",
55
"main": "gulpfile.js",
66
"devDependencies": {},

src/images/avatar.png

8.69 KB
Loading

src/styles/base/_defaults.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ $value in $button-sizes {
2323
.hr--small {
2424
margin-top: 0;
2525
}
26+
27+
.pad--10 {
28+
padding-top: 10px;
29+
}

0 commit comments

Comments
 (0)