Skip to content

Commit 47f2102

Browse files
dariusrosendahldariusrosendahl
committed
Merge branch 'feature/castlecss-forms' into develop
2 parents 2ab1794 + da7b509 commit 47f2102

29 files changed

+7562
-116
lines changed

‎Gruntfile.js

+1
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

+5-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,11 @@
77
<link rel="stylesheet" href="css/styles.min.css" />
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>
10+
<script src="js/scripts.min.js" type="text/javascript"></script>
1011
</head>
1112

1213
<body>
1314

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

2316
<div id="wrapper" class="wrapper ">
2417

@@ -76,6 +69,10 @@
7669

7770
</li>
7871

72+
<li><a href="/forms.html" >Forms</a>
73+
74+
</li>
75+
7976
<li><a href="/buttons.html" >Buttons</a>
8077

8178
</li>

‎dist/breadcrumbs.html

+5-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,11 @@
77
<link rel="stylesheet" href="css/styles.min.css" />
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>
10+
<script src="js/scripts.min.js" type="text/javascript"></script>
1011
</head>
1112

1213
<body>
1314

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

2316
<div id="wrapper" class="wrapper ">
2417

@@ -76,6 +69,10 @@
7669

7770
</li>
7871

72+
<li><a href="/forms.html" >Forms</a>
73+
74+
</li>
75+
7976
<li><a href="/buttons.html" >Buttons</a>
8077

8178
</li>

‎dist/buttons.html

+5-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,11 @@
77
<link rel="stylesheet" href="css/styles.min.css" />
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>
10+
<script src="js/scripts.min.js" type="text/javascript"></script>
1011
</head>
1112

1213
<body>
1314

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

2316
<div id="wrapper" class="wrapper ">
2417

@@ -76,6 +69,10 @@
7669

7770
</li>
7871

72+
<li><a href="/forms.html" >Forms</a>
73+
74+
</li>
75+
7976
<li><a href="/buttons.html" class="active">Buttons</a>
8077

8178
</li>

‎dist/css/styles.min.css

+6,230-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)