Skip to content

Commit 7a5793c

Browse files
committed
Merge branch 'feature/remove-sample-files' into develop
2 parents 58a59d7 + 035081f commit 7a5793c

File tree

172 files changed

+75
-5243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+75
-5243
lines changed

CHANGELOG renamed to CHANGELOG.md

File renamed without changes.

README

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,14 @@
1-
---
2-
permalink: /about/
3-
title: "About"
4-
excerpt: "Minimal Mistakes is a flexible two-column Jekyll theme."
5-
layouts_gallery:
6-
- url: mm-layout-splash.png
7-
image_path: mm-layout-splash.png
8-
alt: "splash layout example"
9-
- url: mm-layout-single-meta.png
10-
image_path: mm-layout-single-meta.png
11-
alt: "single layout with comments and related posts"
12-
- url: mm-layout-archive.png
13-
image_path: mm-layout-archive.png
14-
alt: "archive layout example"
15-
modified: 2016-04-14T10:26:26-04:00
16-
---
17-
18-
{% include base_path %}
1+
# Minimal Mistakes Jekyll Theme
192

203
Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your personal site, blog, or portfolio on GitHub or self-hosting on your own server. As the name implies --- styling is purposely minimalistic to be enhanced and customized by you :smile:.
214

225
The theme includes responsive layouts (`single`, `archive`, and `splash` pages) that look great on mobile and desktop browsers.
236

24-
{% include gallery id="layouts_gallery" caption="Examples of included layouts `splash`, `single`, and `archive`." %}
7+
![mm-layout-examples](https://cloud.githubusercontent.com/assets/1376749/14541626/dac474f4-0258-11e6-83f6-40e752028222.png)
258

26-
[Install the Theme]({{ base_path }}/docs/quick-start-guide/){: .btn .btn--success .btn--large}
9+
## [Installation and Setup](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/) / [Preview the Theme](https://mmistakes.github.io/minimal-mistakes/)
2710

28-
## Notable Features
11+
### Notable Features
2912

3013
- Compatible with GitHub Pages
3114
- Several layout options (single, archive, splash pages)
@@ -34,7 +17,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
3417
- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, and custom)
3518
- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom)
3619

37-
## Demo Pages
20+
#### Demo Pages
3821

3922
| Name | Description |
4023
| ------------------------------------------- | ----------------------------------------------------- |
@@ -48,26 +31,26 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
4831

4932
For even more demo pages check the [posts archive][year-archive].
5033

51-
[header-image-post]: {{ base_path }}{% post_url 2012-03-15-layout-header-image-text-readability %}
52-
[gallery-post]: {{ base_path }}{% post_url 2010-09-09-post-gallery %}
53-
[html-tags-post]: {{ base_path }}{% post_url 2013-01-11-markup-html-tags-and-formatting %}
54-
[syntax-post]: {{ base_path }}{% post_url 2013-08-16-markup-syntax-highlighting %}
55-
[sample-collection]: {{ base_path }}/recipes/chocolate-chip-cookies/
56-
[categories-archive]: {{ base_path }}/categories/
57-
[tags-archive]: {{ base_path }}/tags/
58-
[year-archive]: {{ base_path }}/year-archive/
34+
[header-image-post]: https://mmistakes.github.io/minimal-mistakes/layout-header-image-text-readability/
35+
[gallery-post]: https://mmistakes.github.io/minimal-mistakes/post%20formats/post-gallery/
36+
[html-tags-post]: https://mmistakes.github.io/minimal-mistakes/markup/markup-html-tags-and-formatting/
37+
[syntax-post]: https://mmistakes.github.io/minimal-mistakes/markup-syntax-highlighting/
38+
[sample-collection]: https://mmistakes.github.io/minimal-mistakes/recipes/chocolate-chip-cookies/
39+
[categories-archive]: https://mmistakes.github.io/minimal-mistakes/categories/
40+
[tags-archive]: https://mmistakes.github.io/minimal-mistakes/tags/
41+
[year-archive]: https://mmistakes.github.io/minimal-mistakes/year-archive/
5942

6043
---
6144

62-
## Credits
45+
### Credits
6346

64-
### Icons + Demo Images:
47+
#### Icons + Demo Images:
6548

6649
- [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam)
6750
- [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
6851
- [Unsplash](https://unsplash.com/)
6952

70-
### Other:
53+
#### Other:
7154

7255
- [Jekyll](http://jekyllrb.com/)
7356
- [jQuery](http://jquery.com/)
@@ -81,4 +64,24 @@ For even more demo pages check the [posts archive][year-archive].
8164

8265
---
8366

84-
Minimal Mistakes is designed, developed, and maintained by Michael Rose. Just another boring, tattooed, designer from Buffalo New York.
67+
The MIT License (MIT)
68+
69+
Copyright (c) 2016 Michael Rose
70+
71+
Permission is hereby granted, free of charge, to any person obtaining a copy
72+
of this software and associated documentation files (the "Software"), to deal
73+
in the Software without restriction, including without limitation the rights
74+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
75+
copies of the Software, and to permit persons to whom the Software is
76+
furnished to do so, subject to the following conditions:
77+
78+
The above copyright notice and this permission notice shall be included in all
79+
copies or substantial portions of the Software.
80+
81+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
82+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
83+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
84+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
85+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
86+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
87+
SOFTWARE.

_config.dev.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

_config.yml

Lines changed: 26 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,52 @@
77

88
# Site Settings
99
locale : "en-US"
10-
title : "Minimal Mistakes"
10+
title : "Site Title"
1111
title_separator : "-"
12-
name : &name "Michael Rose"
13-
description : &description "A flexible Jekyll theme for your blog or site with a minimalist aesthetic."
14-
url : # the base hostname & protocol for your site e.g. "//github.io.mmistakes"
15-
baseurl : "/minimal-mistakes" # the subpath of your site, e.g. "/blog"
16-
gh_repo : "https://github.com/mmistakes/minimal-mistakes"
12+
name : "Your Name"
13+
description : "An amazing website."
14+
url : # the base hostname & protocol for your site e.g. "https://github.io.mmistakes"
15+
baseurl : # the subpath of your site, e.g. "/blog"
16+
gh_repo :
1717
teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
18-
breadcrumbs : true # true, false (default)
19-
words_per_minute : 200
18+
# breadcrumbs : false # true, false (default)
19+
# words_per_minute : 200
2020
comments:
21-
provider : "disqus" # false (default), "disqus", "facebook", "google-plus", custom"
21+
provider : # false (default), "disqus", "facebook", "google-plus", custom"
2222
disqus:
23-
shortname : "mmistakes-dev" # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
23+
shortname : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
2424
facebook:
2525
# https://developers.facebook.com/docs/plugins/comments
2626
appid :
2727
num_posts : # 5 (default)
2828
colorscheme : # "light" (default), "dark"
2929

3030
# SEO Related
31-
google_site_verification : "UQj93ERU9zgECodaaXgVpkjrFn9UrDMEzVamacSoQ8Y"
31+
google_site_verification :
3232
bing_site_verification :
3333
alexa_site_verification :
3434
yandex_site_verification :
3535

3636
# Social Sharing
3737
twitter:
38-
username : &twitter "mmistakes"
38+
username :
3939
facebook:
40-
username : &facebook "michaelrose"
40+
username :
4141
app_id :
4242
publisher :
43-
og_image : "site-logo.png" # Open Graph/Twitter default site image
43+
og_image : # Open Graph/Twitter default site image
4444
# For specifying social profiles
4545
# - https://developers.google.com/structured-data/customize/social-profiles
4646
social:
4747
type : # Person or Organization (defaults to Person)
4848
name : # If the user or organization name differs from the site's name
4949
links: # An array of links to social media profiles
50-
- "https://twitter.com/mmistakes"
51-
- "https://facebook.com/michaelrose"
5250

5351
# Analytics
5452
analytics:
55-
provider : "google-universal" # false (default), "google", "google-universal", "custom"
53+
provider : false # false (default), "google", "google-universal", "custom"
5654
google:
57-
tracking_id : "UA-2011187-3"
55+
tracking_id :
5856

5957
# Google AdSense
6058
google_ad_client :
@@ -63,30 +61,30 @@ google_ad_slot :
6361

6462
# Site Author
6563
author:
66-
name : *name
64+
name : "Your Name"
6765
avatar : "bio-photo.jpg"
68-
bio : *description
69-
location : "Buffalo, NY"
70-
email : *email
71-
uri : "https://mademistakes.com"
66+
bio : "I am an amazing person."
67+
location : "Somewhere"
68+
email :
69+
uri :
7270
bitbucket :
7371
codepen :
7472
dribbble :
7573
flickr :
76-
facebook : *facebook
74+
facebook :
7775
foursquare :
78-
github : "mmistakes"
76+
github :
7977
google_plus :
8078
keybase :
81-
instagram : "mmistakes"
79+
instagram :
8280
lastfm :
8381
linkedin :
8482
pinterest :
8583
soundcloud :
8684
stackoverflow : # http://stackoverflow.com/users/123456/username
8785
steam :
8886
tumblr :
89-
twitter : *twitter
87+
twitter :
9088
vine :
9189
weibo :
9290
xing :
@@ -147,85 +145,11 @@ kramdown:
147145
enable_coderay: false
148146

149147

150-
# Collections
151-
collections:
152-
docs:
153-
output: true
154-
permalink: /:collection/:path/
155-
recipes:
156-
output: true
157-
permalink: /:collection/:path/
158-
pets:
159-
output: true
160-
permalink: /:collection/:path/
161-
portfolio:
162-
output: true
163-
permalink: /:collection/:path/
164-
165-
166-
# Defaults
167-
defaults:
168-
# _posts
169-
- scope:
170-
path: ""
171-
type: posts
172-
values:
173-
layout: single
174-
author_profile: true
175-
read_time: true
176-
comments: true
177-
share: true
178-
related: true
179-
# _pages
180-
- scope:
181-
path: ""
182-
type: pages
183-
values:
184-
layout: single
185-
author_profile: true
186-
# _docs
187-
- scope:
188-
path: ""
189-
type: docs
190-
values:
191-
layout: single
192-
read_time: false
193-
author_profile: false
194-
share: false
195-
comments: false
196-
# _recipes
197-
- scope:
198-
path: ""
199-
type: recipes
200-
values:
201-
layout: single
202-
author_profile: true
203-
share: true
204-
comments: true
205-
# _pets
206-
- scope:
207-
path: ""
208-
type: pets
209-
values:
210-
layout: single
211-
author_profile: true
212-
share: true
213-
comment: true
214-
# _portfolio
215-
- scope:
216-
path: ""
217-
type: portfolio
218-
values:
219-
layout: single
220-
author_profile: false
221-
share: true
222-
223-
224148
# Outputting
225149
permalink: /:categories/:title/
226150
paginate: 5 # amount of posts to show
227151
paginate_path: /page:num/
228-
timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
152+
timezone: # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
229153

230154

231155
# Plugins
@@ -235,8 +159,6 @@ gems:
235159
- jekyll-gist
236160
- jekyll-feed
237161
- jemoji
238-
- jekyll-redirect-from
239-
# - jekyll-archives
240162

241163
# mimic GitHub Pages with --safe
242164
whitelist:
@@ -245,7 +167,6 @@ whitelist:
245167
- jekyll-gist
246168
- jekyll-feed
247169
- jemoji
248-
- jekyll-redirect-from
249170

250171

251172
# Archives

_data/authors.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)