Skip to content

Commit 8ec2211

Browse files
author
Pascal Alferink
committed
Merge branch 'develop' into feature/castlecss-tabs
# Conflicts: # dist/about.html # dist/breadcrumbs.html # dist/buttons.html # dist/css/styles.min.css # dist/css/styles.min.css.map # dist/grid.html # dist/icons.html # dist/index.html # dist/installation.html # dist/js/scripts.min.js # dist/mixins.html # dist/notifications.html # dist/utility.html # dist/utility_spacers.html # dist/variables.html # dist/variables_1x.html # js/scripts.js # package.json # views/inc/header.html
2 parents 364c72f + 06db8ac commit 8ec2211

30 files changed

+1605
-691
lines changed

‎Gruntfile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ module.exports = function(grunt) {
6060
},
6161
}
6262
},
63+
6364
nunjucks: {
6465
render: {
6566
options: {

‎dist/about.html‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,25 @@
88
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css' />
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js" type="text/javascript"></script>
1010
<script src="js/scripts.min.js" type="text/javascript"></script>
11+
1112
</head>
1213

1314
<body>
14-
15-
<!-- Google Tag Manager -->
16-
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX"
17-
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
18-
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
19-
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
20-
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
21-
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
22-
})(window,document,'script','dataLayer','GTM-N85PTX');</script>
23-
15+
<!-- Google Tag Manager -->
16+
<noscript>
17+
<iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX" height="0" width="0" style="display:none;visibility:hidden"></iframe>
18+
</noscript>
19+
<script>
20+
(function (w, d, s, l, i) {
21+
w[l] = w[l] || []; w[l].push({
22+
'gtm.start':
23+
new Date().getTime(), event: 'gtm.js'
24+
}); var f = d.getElementsByTagName(s)[0],
25+
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
26+
'//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
27+
})(window, document, 'script', 'dataLayer', 'GTM-N85PTX');
28+
</script>
29+
2430
<div id="wrapper" class="wrapper ">
2531

2632
<div class="g full-height">
@@ -77,6 +83,10 @@
7783

7884
</li>
7985

86+
<li><a href="/forms.html" >Forms</a>
87+
88+
</li>
89+
8090
<li><a href="/buttons.html" >Buttons</a>
8191

8292
</li>
@@ -143,37 +153,6 @@ <h2>What makes CastleCSS different?</h2>
143153
<footer id="footer">
144154

145155
</footer>
146-
<script>
147-
$(function () {
148-
navOpen();
149-
150-
window.onscroll = function(e) {
151-
offSetManager();
152-
}
153-
});
154-
155-
function offSetManager(){
156-
157-
var yOffset = 110;
158-
var currYOffSet = window.pageYOffset;
159-
var menuHeight = $('.doc-menu').height();
160-
var windowHeight = $(window).height();
161-
162-
if((yOffset < currYOffSet) && (menuHeight < windowHeight)) {
163-
$('.nav-wrap').addClass('fixed');
164-
} else if(yOffset > currYOffSet){
165-
$('.nav-wrap').removeClass('fixed');
166-
}
167-
}
168-
169-
function navOpen() {
170-
$('.nav-label, .open-documentation').on('click', function(e) {
171-
$('.nav-container').toggleClass('nav-container-active');
172-
e.preventDefault();
173-
});
174-
}
175-
176-
</script>
177156

178157
<script src="js/shCore.js"></script>
179158
<script src="js/shBrushXml.js"></script>

‎dist/breadcrumbs.html‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,25 @@
88
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css' />
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js" type="text/javascript"></script>
1010
<script src="js/scripts.min.js" type="text/javascript"></script>
11+
1112
</head>
1213

1314
<body>
14-
15-
<!-- Google Tag Manager -->
16-
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX"
17-
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
18-
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
19-
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
20-
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
21-
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
22-
})(window,document,'script','dataLayer','GTM-N85PTX');</script>
23-
15+
<!-- Google Tag Manager -->
16+
<noscript>
17+
<iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX" height="0" width="0" style="display:none;visibility:hidden"></iframe>
18+
</noscript>
19+
<script>
20+
(function (w, d, s, l, i) {
21+
w[l] = w[l] || []; w[l].push({
22+
'gtm.start':
23+
new Date().getTime(), event: 'gtm.js'
24+
}); var f = d.getElementsByTagName(s)[0],
25+
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
26+
'//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
27+
})(window, document, 'script', 'dataLayer', 'GTM-N85PTX');
28+
</script>
29+
2430
<div id="wrapper" class="wrapper ">
2531

2632
<div class="g full-height">
@@ -77,6 +83,10 @@
7783

7884
</li>
7985

86+
<li><a href="/forms.html" >Forms</a>
87+
88+
</li>
89+
8090
<li><a href="/buttons.html" >Buttons</a>
8191

8292
</li>
@@ -204,37 +214,6 @@ <h2>Seo</h2>
204214
<footer id="footer">
205215

206216
</footer>
207-
<script>
208-
$(function () {
209-
navOpen();
210-
211-
window.onscroll = function(e) {
212-
offSetManager();
213-
}
214-
});
215-
216-
function offSetManager(){
217-
218-
var yOffset = 110;
219-
var currYOffSet = window.pageYOffset;
220-
var menuHeight = $('.doc-menu').height();
221-
var windowHeight = $(window).height();
222-
223-
if((yOffset < currYOffSet) && (menuHeight < windowHeight)) {
224-
$('.nav-wrap').addClass('fixed');
225-
} else if(yOffset > currYOffSet){
226-
$('.nav-wrap').removeClass('fixed');
227-
}
228-
}
229-
230-
function navOpen() {
231-
$('.nav-label, .open-documentation').on('click', function(e) {
232-
$('.nav-container').toggleClass('nav-container-active');
233-
e.preventDefault();
234-
});
235-
}
236-
237-
</script>
238217

239218
<script src="js/shCore.js"></script>
240219
<script src="js/shBrushXml.js"></script>

‎dist/buttons.html‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,25 @@
88
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css' />
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js" type="text/javascript"></script>
1010
<script src="js/scripts.min.js" type="text/javascript"></script>
11+
1112
</head>
1213

1314
<body>
14-
15-
<!-- Google Tag Manager -->
16-
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX"
17-
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
18-
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
19-
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
20-
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
21-
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
22-
})(window,document,'script','dataLayer','GTM-N85PTX');</script>
23-
15+
<!-- Google Tag Manager -->
16+
<noscript>
17+
<iframe src="//www.googletagmanager.com/ns.html?id=GTM-N85PTX" height="0" width="0" style="display:none;visibility:hidden"></iframe>
18+
</noscript>
19+
<script>
20+
(function (w, d, s, l, i) {
21+
w[l] = w[l] || []; w[l].push({
22+
'gtm.start':
23+
new Date().getTime(), event: 'gtm.js'
24+
}); var f = d.getElementsByTagName(s)[0],
25+
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
26+
'//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
27+
})(window, document, 'script', 'dataLayer', 'GTM-N85PTX');
28+
</script>
29+
2430
<div id="wrapper" class="wrapper ">
2531

2632
<div class="g full-height">
@@ -77,6 +83,10 @@
7783

7884
</li>
7985

86+
<li><a href="/forms.html" >Forms</a>
87+
88+
</li>
89+
8090
<li><a href="/buttons.html" class="active">Buttons</a>
8191

8292
</li>
@@ -167,37 +177,6 @@ <h2 class="ta-center ta-left-b3">Example buttons with icons</h2>
167177
<footer id="footer">
168178

169179
</footer>
170-
<script>
171-
$(function () {
172-
navOpen();
173-
174-
window.onscroll = function(e) {
175-
offSetManager();
176-
}
177-
});
178-
179-
function offSetManager(){
180-
181-
var yOffset = 110;
182-
var currYOffSet = window.pageYOffset;
183-
var menuHeight = $('.doc-menu').height();
184-
var windowHeight = $(window).height();
185-
186-
if((yOffset < currYOffSet) && (menuHeight < windowHeight)) {
187-
$('.nav-wrap').addClass('fixed');
188-
} else if(yOffset > currYOffSet){
189-
$('.nav-wrap').removeClass('fixed');
190-
}
191-
}
192-
193-
function navOpen() {
194-
$('.nav-label, .open-documentation').on('click', function(e) {
195-
$('.nav-container').toggleClass('nav-container-active');
196-
e.preventDefault();
197-
});
198-
}
199-
200-
</script>
201180

202181
<script src="js/shCore.js"></script>
203182
<script src="js/shBrushXml.js"></script>

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

0 commit comments

Comments
 (0)