Skip to content

Master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 30, 2016
Merged

Master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd5fdc6
Merge branch 'release/0.2.0'
dariusrosendahl Nov 23, 2016
359e49e
Hotfix for documentation link on homepage
dariusrosendahl Nov 23, 2016
41cb2b5
Update LICENSE
dariusrosendahl Nov 24, 2016
85652f7
Added font-awomse. Buttons with icons. Text changes. Merge conflicts.
Nov 30, 2016
c05af88
Merge branch 'master' of https://github.com/CastleCSS/castlecss-docs
Nov 30, 2016
789a26a
Version bump
Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 CastleCSS
Copyright (c) 2016 De Nieuwe Zaak

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion dist/css/styles.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "castlecss-docs",
"version": "0.3.0",
"version": "0.3.1",
"description": "Documentation website for CastleCSS",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -34,7 +34,6 @@
},
"devDependencies": {
"autoprefixer": "^6.3.6",
"concat": "0.0.1-security",
"cssnano": "^3.7.3",
"grunt": "^1.0.1",
"grunt-contrib-watch": "~1.0.0",
Expand All @@ -43,8 +42,7 @@
"grunt-sass": "^1.0.0",
"jit-grunt": "^0.10.0",
"nunjucks": "^2.4.2",
"pixrem": "^3.0.0",
"uglify": "^0.1.5"
"pixrem": "^3.0.0"
},
"bugs": {
"url": "https://github.com/CastleCSS/castlecss-docs/issues"
Expand Down
6 changes: 3 additions & 3 deletions views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<div>
<h1>CastleCSS Framework</h1>
<p class="intro">A modular, easy to use SCSS Framework.</p>
<a class="btn-theme02 mb-2x" href="installation.html">Get started</a>
<a class="btn-theme03 mb-2x" target="_blank" href="https://github.com/CastleCSS">Watch on github</a>
<a href="https://github.com/castlecss/castlecss-boilerplate/archive/master.zip" class="btn" aria-label="Download castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-cloud-download"></i> Download boilerplate</a>
<a class="btn mb-2x" href="installation.html"><i class="fa fa-thumbs-up"></i> Get started</a>
<a href="https://github.com/castlecss/castlecss-boilerplate" class="btn-theme03" aria-label="Watch castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-github"></i> Watch on github</a>
<a href="https://github.com/castlecss/castlecss-boilerplate/archive/master.zip" class="btn-theme02" aria-label="Download castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-cloud-download"></i> Download boilerplate</a>
<p class="b3_hide">Or watch the <a class="open-documentation" href="?">documentation</a></p>
</div>
</div>
Expand Down