Skip to content

Commit d7982d3

Browse files
Maarten84Maarten84
committed
Merge branch 'develop' into feature/Forms
2 parents a7796aa + 1074053 commit d7982d3

17 files changed

+240
-86
lines changed

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
*.log
22
thumbs.db
3-
4-
# Allow castlecss-core in gitignore
5-
node_modules
6-
!node_modules/castlecss-core
3+
node_modules

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = function(grunt) {
4646

4747
watch: {
4848
scss: {
49-
files: 'scss/**/*.scss',
49+
files: ['scss/**/*.scss', 'node_modules/**/*.scss' ],
5050
tasks: ['sass', 'postcss'],
5151
options: {
5252
spawn: false,

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ Sourcecode for www.castlecss.com and the documentation for [CastleCSS](https://g
77
## How to install
88
- Download or clone this package
99
- Look in the dist/ folder or build if yourself with GruntJS in your terminal: ```npm install``` + ```grunt```
10+
11+
## Roadmap CastleCSS
12+
You can find the roadmap in the [CastleCSS Meta Package](https://github.com/CastleCSS/castlecss/roadmap.md).

‎dist/buttons.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,28 @@ <h1>Buttons</h1>
128128
<a href="#" class="btn-theme05"></a>
129129
<a href="#" class="btn btn-full"></a></pre>
130130
</div>
131+
<h2 class="ta-center ta-left-b3">Example buttons with icons</h2>
132+
<p class="alert">
133+
Note: You need both the castlecss-buttons and castlecss-icons packages or the <a href="https://github.com/CastleCSS/castlecss-boilerplate" target="_blank">castlecss-boilerplate</a> to combine icons and buttons.
134+
</p>
135+
<div class="block p pt-2x" style="background: #eee;">
136+
<div class="g mb-3x">
137+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn btn-full mb"><i class="fa fa-angle-right"></i> Read more</a></div>
138+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme01 btn-full mb"><i class="fa fa-edit"></i> Edit</a></div>
139+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme02 btn-full mb"><i class="fa fa-cloud"></i> Cloud</a></div>
140+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme03 btn-full mb"><i class="fa fa-globe"></i> Globe</a></div>
141+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme04 btn-full mb"><i class="fa fa-spinner fa-spin"></i> Spin</a></div>
142+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme05 btn-full mb"><i class="fa fa-list"></i> List</a></div>
143+
</div>
144+
<pre class="brush: xml;">
145+
<a href="#" class="btn btn-full"><i class="fa fa-angle-right"></i></a>
146+
<a href="#" class="btn-theme01 btn-full"><i class="fa fa-edit"></i></a>
147+
<a href="#" class="btn-theme02 btn-full"><i class="fa fa-cloud"></i> </a>
148+
<a href="#" class="btn-theme03 btn-full"><i class="fa fa-globe"></i> </a>
149+
<a href="#" class="btn-theme04 btn-full"><i class="fa fa-spinner fa-spin"></i></a>
150+
<a href="#" class="btn-theme05 btn-full"><i class="fa fa-list"></i></a>
151+
</pre>
152+
</div>
131153
</div>
132154
</div>
133155
<!-- End main -->

‎dist/css/styles.min.css‎

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

‎dist/css/styles.min.css.map‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/icons.html‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -159,28 +159,29 @@ <h2 class="ta-center ta-left-b3">Example social icons</h2>
159159
<div class="ta-center ta-left-b3 pt pb"><a class="btn" href="http://fontawesome.io/icons#brand" target="_blank"><i class="fa fa-font-awesome"></i>&nbsp;All social icons</a></div>
160160
</div>
161161

162-
163-
<h2>Example buttons with icon</h2>
164-
<p class="alert">
165-
Note: You need castlecss-buttons package or the <a href="https://github.com/CastleCSS/castlecss-boilerplate" target="_blank">castlecss-boilerplate</a> to combine icons and buttons.
166-
</p>
167-
<div class="block p pt-2x" style="background: #eee;">
168-
<div class="g mb-3x">
169-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn btn-full mb"><i class="fa fa-angle-right"></i> Read more</a></div>
170-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme01 btn-full mb"><i class="fa fa-edit"></i> Edit</a></div>
171-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme02 btn-full mb"><i class="fa fa-cloud"></i> Cloud</a></div>
172-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme03 btn-full mb"><i class="fa fa-globe"></i> Globe</a></div>
173-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme04 btn-full mb"><i class="fa fa-spinner fa-spin"></i> Spin</a></div>
174-
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme05 btn-full mb"><i class="fa fa-list"></i> List</a></div>
175-
</div>
176-
<pre class="brush: xml;">
177-
<a href="#" class="btn btn-full"><i class="fa fa-angle-right"></i></a>
178-
<a href="#" class="btn-theme01 btn-full"><i class="fa fa-edit"></i></a>
179-
<a href="#" class="btn-theme02 btn-full"><i class="fa fa-cloud"></i> </a>
180-
<a href="#" class="btn-theme03 btn-full"><i class="fa fa-globe"></i> </a>
181-
<a href="#" class="btn-theme04 btn-full"><i class="fa fa-spinner fa-spin"></i></a>
182-
<a href="#" class="btn-theme05 btn-full"><i class="fa fa-list"></i></a></pre>
183-
</div>
162+
<h2 class="ta-center ta-left-b3">Example buttons with icons</h2>
163+
<p class="alert">
164+
Note: You need both the castlecss-buttons and castlecss-icons packages or the <a href="https://github.com/CastleCSS/castlecss-boilerplate" target="_blank">castlecss-boilerplate</a> to combine icons and buttons.
165+
</p>
166+
<div class="block p pt-2x" style="background: #eee;">
167+
<div class="g mb-3x">
168+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn btn-full mb"><i class="fa fa-angle-right"></i> Read more</a></div>
169+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme01 btn-full mb"><i class="fa fa-edit"></i> Edit</a></div>
170+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme02 btn-full mb"><i class="fa fa-cloud"></i> Cloud</a></div>
171+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme03 btn-full mb"><i class="fa fa-globe"></i> Globe</a></div>
172+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme04 btn-full mb"><i class="fa fa-spinner fa-spin"></i> Spin</a></div>
173+
<div class="b0_12 b2_06 b6_04"><a href="#" class="btn-theme05 btn-full mb"><i class="fa fa-list"></i> List</a></div>
174+
</div>
175+
<pre class="brush: xml;">
176+
<a href="#" class="btn btn-full"><i class="fa fa-angle-right"></i></a>
177+
<a href="#" class="btn-theme01 btn-full"><i class="fa fa-edit"></i></a>
178+
<a href="#" class="btn-theme02 btn-full"><i class="fa fa-cloud"></i> </a>
179+
<a href="#" class="btn-theme03 btn-full"><i class="fa fa-globe"></i> </a>
180+
<a href="#" class="btn-theme04 btn-full"><i class="fa fa-spinner fa-spin"></i></a>
181+
<a href="#" class="btn-theme05 btn-full"><i class="fa fa-list"></i></a>
182+
</pre>
183+
</div>
184+
184185
</div>
185186
</div>
186187
<!-- End main -->

‎dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h1>CastleCSS Framework</h1>
108108
<a class="btn mb-2x" href="installation.html"><i class="fa fa-thumbs-up"></i> Get started</a>
109109
<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>
110110
<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>
111-
<p class="b3_hide">Or watch the <a class="open-documentation" href="?">documentation</a></p>
111+
<p class="hide-b3">Or watch the <a class="open-documentation" href="?">documentation</a></p>
112112
</div>
113113
</div>
114114
</div>

‎dist/notifications.html‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,26 @@ <h1>Notifications / alerts</h1>
112112
<p>Overwrite colors using your own <a href="variables.html">variable.scss</a> or overwrite all notifications/alerts with your own notifications.scss file.</p>
113113
</div>
114114
<div class="block">
115-
<div class="alert mb">Alert</div>
116-
<div class="alert-positive mb">Positive alert</div>
117-
<div class="alert-negative mb">Negative alert</div>
115+
<div class="alert mb">Friendly alert with a <a href="#">link</a></div>
116+
<div class="alert-positive mb">Positive alert with a <a href="#">link</a></div>
117+
<div class="alert-warning mb">Alert with a warning and a <a href="#">link</a></div>
118+
<div class="alert-negative mb">Negative alert and a <a href="#">link</a></div>
118119
<pre class="brush: xml;">
119-
<div class="alert">Alert</div>
120-
<div class="alert-positive">Positive alert</div>
121-
<div class="alert-negative">Negative alert</div></pre>
120+
<div class="alert">...</div>
121+
<div class="alert-warning">...</div>
122+
<div class="alert-positive">...</div>
123+
<div class="alert-negative">...</div></pre>
122124
</div>
123125
<div class="block">
124126
<div class="notify mb">Notification</div>
125127
<div class="notify-positive mb">Positive notification</div>
128+
<div class="notify-warning mb">Warning notification</div>
126129
<div class="notify-negative mb">Negative notificiation</div>
127130
<pre class="brush: xml;">
128-
<div class="notify">Notification</div>
129-
<div class="notify-positive">Positive notification</div>
130-
<div class="notify-negative">Negative notificiation</div></pre>
131+
<div class="notify">...</div>
132+
<div class="notify-warning">...</div>
133+
<div class="notify-positive">...</div>
134+
<div class="notify-negative">...</div></pre>
131135
</div>
132136
</div>
133137
</div>

‎package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "castlecss-docs",
3-
"version": "0.3.1",
3+
"version": "1.0.0",
44
"description": "Documentation website for CastleCSS",
55
"main": "index.js",
66
"scripts": {
@@ -24,9 +24,10 @@
2424
"license": "MIT",
2525
"homepage": "https://www.castlecss.com",
2626
"dependencies": {
27-
"castlecss-buttons": "^0.4.1",
28-
"castlecss-core": "^1.8.1",
29-
"castlecss-notifications": "^0.3.0"
27+
"castlecss-buttons": "^0.5.0",
28+
"castlecss-core": "^2.1.0",
29+
"castlecss-icons": "^1.0.2",
30+
"castlecss-notifications": "^1.0.0"
3031
},
3132
"repository": {
3233
"type": "git",
@@ -37,11 +38,11 @@
3738
"cssnano": "^3.7.3",
3839
"grunt": "^1.0.1",
3940
"grunt-contrib-watch": "~1.0.0",
40-
"grunt-nunjucks-2-html": "^1.0.5",
41+
"grunt-nunjucks-2-html": "^3.0.0",
4142
"grunt-postcss": "^0.8.0",
42-
"grunt-sass": "^1.0.0",
43+
"grunt-sass": "^2.0.0",
4344
"jit-grunt": "^0.10.0",
44-
"nunjucks": "^2.4.2",
45+
"nunjucks": "^3.0.0",
4546
"pixrem": "^3.0.0"
4647
},
4748
"bugs": {

0 commit comments

Comments
 (0)