Skip to content

Commit 1acc772

Browse files
author
Darius Rosendahl
committed
Merge branch 'feature/Update_to_latest_modules' into develop
2 parents 88eaf50 + a0030f1 commit 1acc772

File tree

5 files changed

+40
-22
lines changed

5 files changed

+40
-22
lines changed

‎dist/css/styles.min.css‎

Lines changed: 1 addition & 1 deletion
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: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ <h1>Hello, world!</h1>
5757
<div class="pt pb">
5858
<h2>Heading</h2>
5959
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. </p>
60-
<a href="#">Read more</a>
60+
<a href="#"><i class="fa fa-pied-piper"></i>&nbsp;Read more</a>
6161
</div>
6262
</div>
6363
<div class="b0_12 b3_08">
6464
<div class="pt pb">
6565
<h2>Heading</h2>
6666
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. </p>
67-
<a href="#">Read more</a>
67+
<a href="#"><i class="fa fa-battery-full"></i>&nbsp;Read more</a>
6868
</div>
6969
</div>
7070
<div class="b0_12 b3_08">
7171
<div class="pt pb">
72-
<h2>Heading</h2>
72+
<h2><i class="fa fa-bolt"></i>&nbsp;Heading</h2>
7373
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. </p>
74-
<a href="#">Read more</a>
74+
<a href="#"><i class="fa fa-bolt"></i>&nbsp;Read more</a>
7575
</div>
7676
</div>
7777
</div>
@@ -111,20 +111,36 @@ <h2>Header Level 2</h2>
111111
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p>
112112
</blockquote>
113113

114-
<h3>Header Level 3</h3>
114+
<h3 class="head2">Header Level 3 met .head2 styling</h3>
115115
<ul>
116+
<li>By using .head, .head1, .head2, etc you can use heading styling on any element you want</li>
116117
<li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
117118
<li>Aliquam tincidunt mauris eu risus.</li>
118119
</ul>
119120

120-
<!-- Standard buttons -->
121-
<h2>Standard buttons</h2>
122-
<a href="#" class="btn mb">standard button</a></li>
123-
<a href="#" class="btn-theme01 mb">btn-theme01</a>
124-
<a href="#" class="btn-theme02 mb">btn-theme02</a>
125-
<a href="#" class="btn-theme03 mb">btn-theme03</a>
126-
<a href="#" class="btn-theme04 mb">btn-theme04</a>
127-
<a href="#" class="btn-theme05 mb">btn-theme05</a>
121+
<div class="mb-3x">
122+
<!-- Standard buttons -->
123+
<h2 class="head2">Standard buttons</h2>
124+
<a href="#" class="btn mb">standard button</a></li>
125+
<a href="#" class="btn-theme01 mb">btn-theme01</a>
126+
<a href="#" class="btn-theme02 mb">btn-theme02</a>
127+
<a href="#" class="btn-theme03 mb">btn-theme03</a>
128+
<a href="#" class="btn-theme04 mb">btn-theme04</a>
129+
<a href="#" class="btn-theme05 mb">btn-theme05</a>
130+
</div>
131+
132+
<div class="mb-3x">
133+
<h2 class="head2">Example buttons with icons</h2>
134+
<div class="g mb-3x">
135+
<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>
136+
<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>
137+
<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>
138+
<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>
139+
<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>
140+
<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>
141+
</div>
142+
</div>
143+
</div>
128144
</div>
129145
</div>
130146
</div>

‎package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "castlecss-boilerplate",
3-
"version": "1.0.1",
4-
"description": "Boilerplate for CastleCSS",
3+
"version": "1.1.0",
4+
"description": "HMTL5/CSS Boilerplate with CastleCSS",
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
@@ -11,7 +11,7 @@
1111
"url": "git+https://github.com/CastleCSS/castlecss-boilerplate.git"
1212
},
1313
"keywords": [
14-
"boilerplate",
14+
"boilerplate",
1515
"castlecss",
1616
"castle",
1717
"css",
@@ -28,17 +28,18 @@
2828
},
2929
"homepage": "http://www.castlecss.com",
3030
"dependencies": {
31-
"castlecss-buttons": "^0.4.1",
32-
"castlecss-core": "^2.0.1",
33-
"castlecss-notifications": "^0.3.0"
31+
"castlecss-buttons": "^0.5.0",
32+
"castlecss-core": "^2.1.0",
33+
"castlecss-icons": "^1.0.0",
34+
"castlecss-notifications": "^1.0.0"
3435
},
3536
"devDependencies": {
3637
"autoprefixer": "^6.3.6",
3738
"cssnano": "^3.7.3",
3839
"grunt": "^1.0.1",
3940
"grunt-contrib-watch": "~1.0.0",
4041
"grunt-postcss": "^0.8.0",
41-
"grunt-sass": "^1.0.0",
42+
"grunt-sass": "^2.0.0",
4243
"jit-grunt": "^0.10.0",
4344
"pixrem": "^3.0.0"
4445
}

‎scss/main.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@import "node_modules/castlecss-core/sass/main";
99
@import "node_modules/castlecss-buttons/sass/main";
1010
@import "node_modules/castlecss-notifications/sass/main";
11+
@import "node_modules/castlecss-icons/sass/main";
1112

1213
/* Include your own files below this line
1314
--------------------------------------

0 commit comments

Comments
 (0)