Skip to content

Commit 5125d3b

Browse files
Merge pull request #10 from CastleCSS/develop
Develop
2 parents 85d9ed6 + 29544df commit 5125d3b

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

scss/layout/docs_mainvisual.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989

9090
.nav-container {
9191
min-height: 100%;
92-
height: 100vh;
9392
max-height: 100%;
9493

9594
.nav-wrap {

views/breadcrumbs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h3>Changing the breadcrumb separator</h3>
6161
To set a different character as your separator for all crumbs, please overwrite the variable <code>$breadcrumbs-separator</code>.
6262
</p>
6363
<p>
64-
If you want a different charactor for a specific separator, please add the attribute <code>data-breadcrumbs-separator</code> and give it the vaule of your separator.
64+
If you want a different character for a specific separator, please add the attribute <code>data-breadcrumbs-separator</code> and give it the value of your separator.
6565
</p>
6666
<p>
6767
<strong>Example:</strong> <code>data-breadcrumbs-separator="/"</code> sets a / as separator

views/grid.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="breakpoints" class="head head2">Breakpoints</h2>
2828
<li>Set the container width</li>
2929
</ul>
3030
</p>
31-
<p><strong>Make these changes in you own variable file</strong> if you want to continue receiving CastleCSS updates.</p>
31+
<p><strong>Make these changes in your own variable file</strong> if you want to continue receiving CastleCSS updates.</p>
3232
<div class="specs">
3333
<table class="full">
3434
<tr>
@@ -237,7 +237,7 @@ <h4>Example of nested <grids></grids></h4>
237237
</div>
238238
<div id="order" class="block">
239239
<h2>Order</h2>
240-
<p>You can switch up the order of the items by giving is a class <code>order-{order}</code>.</p>
240+
<p>You can switch the order of items by applying the class <code>order-{order}</code>.</p>
241241
<table class="specs">
242242
<tr>
243243
<th>Class</th>
@@ -489,7 +489,7 @@ <h3 class="head head3">Justify content</h3>
489489
</div>
490490
<div class="block">
491491
<h3 class="head head3">Auto fill grid</h3>
492-
<p>It's possible to let the grid figure out the widths for itself. When you don't know what the width will be but you want the grid to fill out the <code>auto</code> class is a nice addition to the grid (<code>g</code>).
492+
<p>It's possible to let the grid figure out the widths for itself. When you don't know what the width will be but you want the grid to fill out, the <code>auto</code> class is a nice addition to the grid (<code>g</code>).
493493
<div>
494494
<strong>Example</strong>
495495
</div>

views/installation.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1>Installation</h1>
1414
<div class="block block-invert p-3x pt-2x">
1515
<h2>Boilerplate</h2>
1616
<p>
17-
The <strong>easiest way</strong> to start is with the CastleCSS Boilerplate
17+
The <strong>easiest way</strong> to start is with the CastleCSS Boilerplate.
1818
CastleCSS is a modular, updatable and easy to use HTML and SCSS framework. Use this Boilerplate to get started with your project right away!
1919
<div>
2020
<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>
@@ -39,7 +39,7 @@ <h3>
3939
</div>
4040
<div class="block mb-3x">
4141
<h2>Structure</h2>
42-
<p>The basis structure for your website should look similar like this (included in the boilerplate):<br />
42+
<p>The basic structure for your website should look similar to this (included in the boilerplate):<br />
4343
</p>
4444
<code class="code-structure">
4545
| Project directory/<br />
@@ -66,7 +66,7 @@ <h2>Structure</h2>
6666
</div>
6767
<div class="block mb-3x">
6868
<h2>Main.scss</h2>
69-
<p>Your main.scss should have a setup similair to this (included in the boilerplate):</p>
69+
<p>Your main.scss should have a setup similar to this (included in the boilerplate):</p>
7070
<pre class="brush: sass;">
7171
/* CastleCSS Core variables */
7272
@import "node_modules/castlecss-core/sass/variables";
@@ -92,7 +92,7 @@ <h2>Main.scss</h2>
9292
@import "node_modules/castlecss-core/sass/base/utility_spacers";</pre>
9393
</div>
9494
<div class="block mb-3x">
95-
<h2>Install packages seperately</h2>
95+
<h2>Install packages separately</h2>
9696
<p>Already have a CastleCSS project and want to add a module or just want to add 1 part of CastleCSS? Just include the core and any addon you want.</p>
9797
<div class="g">
9898

views/style-guidelines.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set currentPageId = 'about' %}{% set pageTitle = 'About - CastleCSS' %}{% include "inc/header.html" %}
1+
{% set currentPageId = 'guidelines' %}{% set pageTitle = 'About - CastleCSS' %}{% include "inc/header.html" %}
22

33
<!-- Main -->
44
<div class="b0_12 b4_14 b4_push_01">
@@ -9,7 +9,7 @@ <h1>Style guidelines</h1>
99
</div>
1010
<div class="block">
1111
<h2>Sass-lint</h2>
12-
<p>For style verifiation we use <a href="https://github.com/sasstools/sass-lint" target="_blank">sass-lint</a>. This ensures us to give you guidelines and warnings about writing mistakes in order, whitespace, nesting, etc</p>
12+
<p>For style verification we use <a href="https://github.com/sasstools/sass-lint" target="_blank">sass-lint</a>. This ensures us to give you guidelines and warnings about writing mistakes in order, whitespace, nesting, etc.</p>
1313
<p>We have included a sass-lint.yml in the packages and it's connected to the package-json.</p>
1414
<p>Example in Visual Studio Code:<br />
1515
<img src="img/output-example.png" class="full-img" alt="">

0 commit comments

Comments
 (0)