Skip to content

Commit 1451ed9

Browse files
author
Darius Rosendahl
committed
Merge branch 'release/Release_for_1.0'
2 parents ef29199 + 6ccde5e commit 1451ed9

40 files changed

+5301
-4589
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: 3 additions & 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,
@@ -64,6 +64,8 @@ module.exports = function(grunt) {
6464
render: {
6565
options: {
6666
paths: ['views'],
67+
trimBlock: true,
68+
lstripBlocks: true,
6769
data: grunt.file.readJSON('templates-data.json')
6870
},
6971
files: [

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/about.html

Lines changed: 155 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,176 @@
11
<!DOCTYPE html>
22
<html>
33

4-
<head>
5-
<title>About - CastleCSS</title>
6-
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
7-
8-
<link rel="stylesheet" href="css/styles.min.css" />
9-
<link rel="stylesheet" href="https://opensource.keycdn.com/fontawesome/4.6.3/font-awesome.min.css " />
10-
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css' />
11-
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js" type="text/javascript"></script>
13-
14-
</head>
15-
16-
<body>
17-
<!-- Google Tag Manager -->
4+
<head>
5+
<title>About - CastleCSS</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
7+
<link rel="stylesheet" href="css/styles.min.css" />
8+
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css' />
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js" type="text/javascript"></script>
10+
</head>
11+
12+
<body>
13+
14+
<!-- Google Tag Manager -->
1815
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX"
1916
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
2017
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
2118
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
2219
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
2320
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
2421
})(window,document,'script','dataLayer','GTM-N85PTX');</script>
25-
<div id="wrapper" class="wrapper">
22+
23+
<div id="wrapper" class="wrapper ">
2624

2725
<div class="g full-height">
2826

2927
<!-- Side -->
3028
<div class="b0_12 b4_08 b5_06 b6_04">
31-
<!-- End Google Tag Manager -->
32-
<header id="header" class="nav-container p-3x">
29+
<!-- End Google Tag Manager -->
30+
<header id="header" class="nav-container">
3331
<div class="nav-label">menu</div>
34-
<a class="nav-logo" href="index.html"><img src="img/logo-castlecss.png"></a>
35-
<ul class="doc-menu list-unstyled">
36-
<li><a href="about.html">About CastleCSS</a></li>
37-
<li>
38-
<a href="installation.html">Installation</a>
39-
</li>
40-
<li><a href="variables.html">Variables</a></li>
41-
<li>
42-
<a href="grid.html">Breakpoints &amp; Grid</a>
43-
<ul class="list-unstyled">
44-
<li>
45-
<a href="grid.html#basicexamples">The basics</a>
46-
</li>
47-
<li>
48-
<a href="grid.html#breakpoints">Breakpoints</a>
49-
</li>
50-
<li>
51-
<a href="grid.html#basicexamples">Basic grid examples</a>
52-
</li>
53-
<li>
54-
<a href="grid.html#gutters">Gutters</a>
55-
</li>
56-
<li>
57-
<a href="grid.html#directionalignment">Direction and alignment</a>
58-
</li>
59-
</ul>
60-
</li>
61-
<li><a href="utility.html">Utility classes</a></li>
62-
<li><a href="utility_spacers.html">Utility spacers</a></li>
63-
<li><a href="buttons.html">Buttons</a></li>
64-
<li><a href="notifications.html">Notifications / alerts</a></li>
65-
<li><a href="mixins.html">Mixins</a></li>
66-
</ul>
32+
<a class="nav-logo p-b4-3x" href="index.html"><img src="img/logo-castlecss.png"></a>
33+
<div class="nav-wrap pl-3x pr-3x">
34+
35+
<ul class="doc-menu list-unstyled">
36+
37+
<li><a href="/about.html" class="active">About CastleCSS</a>
38+
39+
</li>
40+
41+
<li><a href="/installation.html" >Installation</a>
42+
43+
</li>
44+
45+
<li><a href="/variables.html" >Variables</a>
46+
47+
</li>
48+
49+
<li><a href="/grid.html" >Breakpoints &amp; Grid</a>
50+
51+
<ul class="list-unstyled">
52+
53+
<li><a href="grid.html#basicexamples">The basics</a>
54+
55+
<li><a href="grid.html#breakpoints">Breakpoints</a>
56+
57+
<li><a href="grid.html#basicexamples">Basic grid examples</a>
58+
59+
<li><a href="grid.html#gutters">Gutters</a>
60+
61+
<li><a href="grid.html#directionalignment">Direction and alignment</a>
62+
63+
</ul>
64+
65+
</li>
66+
67+
<li><a href="/utility.html" >Utility classes</a>
68+
69+
</li>
70+
71+
<li><a href="/utility_spacers.html" >Utility spacers</a>
72+
73+
</li>
74+
75+
<li><a href="/icons.html" >Icons</a>
76+
77+
</li>
78+
79+
<li><a href="/buttons.html" >Buttons</a>
80+
81+
</li>
82+
83+
<li><a href="/notifications.html" >Notifications / alerts</a>
84+
85+
</li>
86+
87+
<li><a href="/mixins.html" >Mixins</a>
88+
89+
</li>
90+
91+
</ul>
92+
</div>
93+
94+
95+
6796
</header>
6897

6998
</div>
7099
<!-- End side -->
71100

72-
<!-- Main -->
73-
<div class="b0_12 b4_14 b4_push_01">
74-
<div class="p-3x">
75-
76-
<div class="block">
77-
<h1>About CastleCSS</h1>
78-
<p class="intro">A modular, easy to use SCSS Framework</p>
79-
80-
<h2>What is CastleCSS? </h2>
81-
<p >CastleCSS is a mobile first SCSS framework with modular building blocks for the web. It's also fully updateable! No more worrying if your base files are still correct, we keep the files up-to-date for you!</p>
82-
</div>
83-
<div class="block">
84-
<h2>Why did we create CastleCSS?</h2>
85-
<p>Years ago, when the responsive web was on the rise, none of the existing mobile first frameworks lived up to our specific needs. We did not believe in things like device specific classes and the grids did not offer the flexibility we required... So, we started creating our own Fortress in HTML/CSS/JS and have been expanding it ever since.</p>
86-
87-
<p>Now, we want to share our way of working with the world.</p>
88-
</div>
89-
<div class="block">
90-
<h2>What makes CastleCSS different?</h2>
91-
<p>Unlike other Frameworks, we do n&oacute;t include everything, but only what you need. The core is a kickstart to your website, which you can extend with several extensions.</p>
92-
93-
<p>Our philosophy is mobile first, easy to update, self explanatory code. We want to be able to keep you up to date with the latest version of CastleCSS, which is only possible if you follow the installation instructions.</p>
94-
<div>
95-
<a class="btn-theme04 mb" href="installation.html"><i class="fa fa-book"></i> Installation instructions</a>
96-
97-
<a href="https://github.com/castlecss/castlecss-boilerplate" class="btn-theme02" aria-label="Watch castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-github"></i> Watch on github</a>
98-
<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>
99-
</div>
100-
</div>
101-
102-
</div>
103-
104-
<!-- Scripts for footer -->
105-
<!-- Scripts for documentation -->
106-
<footer id="footer">
107-
108-
</footer>
109-
<script>
110-
$(function () {
111-
navOpen();
112-
});
113-
function navOpen() {
114-
$('.nav-label, .open-documentation').on('click', function(e) {
115-
$('.nav-container').toggleClass('nav-container-active');
116-
e.preventDefault();
117-
});
118-
}
119-
120-
</script>
121-
122-
<script src="js/shCore.js"></script>
123-
<script src="js/shBrushXml.js"></script>
124-
<script src="js/shBrushSass.js"></script>
125-
<script src="js/shBrushJScript.js"></script>
126-
<script type="text/javascript">SyntaxHighlighter.all();</script>
127-
<script async defer src="https://buttons.github.io/buttons.js"></script>
128-
129-
130-
</body>
131-
132-
</html>
101+
102+
<!-- Main -->
103+
<div class="b0_12 b4_14 b4_push_01">
104+
<div class="p p-b3-3x">
105+
<div class="block">
106+
<h1>About CastleCSS</h1>
107+
<p class="intro">A modular, easy to use SCSS Framework</p>
108+
109+
<h2>What is CastleCSS? </h2>
110+
<p >CastleCSS is a mobile first SCSS framework with modular building blocks for the web. It's also fully updateable! No more worrying if your base files are still correct, we keep the files up-to-date for you!</p>
111+
</div>
112+
<div class="block">
113+
<h2>Why did we create CastleCSS?</h2>
114+
<p>Years ago, when the responsive web was on the rise, none of the existing mobile first frameworks lived up to our specific needs. We did not believe in things like device specific classes and the grids did not offer the flexibility we required... So, we started creating our own Fortress in HTML/CSS/JS and have been expanding it ever since.</p>
115+
116+
<p>Now, we want to share our way of working with the world.</p>
117+
</div>
118+
<div class="block">
119+
<h2>What makes CastleCSS different?</h2>
120+
<p>Unlike other Frameworks, we do n&oacute;t include everything, but only what you need. The core is a kickstart to your website, which you can extend with several extensions.</p>
121+
122+
<p>Our philosophy is mobile first, easy to update, self explanatory code. We want to be able to keep you up to date with the latest version of CastleCSS, which is only possible if you follow the installation instructions.</p>
123+
<div>
124+
<a class="btn-theme04 mb" href="installation.html"><i class="fa fa-book"></i> Installation instructions</a>
125+
<a href="https://github.com/castlecss/castlecss-boilerplate" class="btn-theme02" aria-label="Watch castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-github"></i> Watch on github</a>
126+
<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>
127+
</div>
128+
</div>
129+
</div>
130+
</div>
131+
<!-- End main -->
132+
133+
<!-- Scripts for documentation -->
134+
<footer id="footer">
135+
136+
</footer>
137+
<script>
138+
$(function () {
139+
navOpen();
140+
141+
window.onscroll = function(e) {
142+
offSetManager();
143+
}
144+
});
145+
146+
function offSetManager(){
147+
148+
var yOffset = 110;
149+
var currYOffSet = window.pageYOffset;
150+
var menuHeight = $('.doc-menu').height();
151+
var windowHeight = $(window).height();
152+
153+
if((yOffset < currYOffSet) && (menuHeight < windowHeight)) {
154+
$('.nav-wrap').addClass('fixed');
155+
} else if(yOffset > currYOffSet){
156+
$('.nav-wrap').removeClass('fixed');
157+
}
158+
}
159+
160+
function navOpen() {
161+
$('.nav-label, .open-documentation').on('click', function(e) {
162+
$('.nav-container').toggleClass('nav-container-active');
163+
e.preventDefault();
164+
});
165+
}
166+
167+
</script>
168+
169+
<script src="js/shCore.js"></script>
170+
<script src="js/shBrushXml.js"></script>
171+
<script src="js/shBrushSass.js"></script>
172+
<script src="js/shBrushJScript.js"></script>
173+
<script type="text/javascript">SyntaxHighlighter.all();</script>
174+
<script async defer src="https://buttons.github.io/buttons.js"></script>
175+
</body>
176+
</html>

0 commit comments

Comments
 (0)