Merge remote-tracking branch 'origin/master' into develop

Author: Darius Rosendahl

README.md

@@ -16,6 +16,9 @@ The project will watch for changes in your scss and html files in your /views an
 
 ## Build and run manually
 - Build the project: ```npm run create_all```
+- Only build CSS: ```npm run create_css```
+- Only build HTML: ```npm run create_html```
+- Only build JS: ```npm run create_js```
 
 You can now see the project in dist folder, open a .html page in your browser
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "castlecss-docs",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Documentation website for CastleCSS",
   "main": "index.js",
   "sasslintConfig": "sass-lint.yml",

package.json

@@ -136,7 +136,7 @@ $input-border-color-focus: #eee;
 $input-border: 1px solid $input-border-color;
 
 /* Custom select */
-$select-arrow: "\2039";
+$select-arrow: "\203A";
 
 /* Labels */
 $input-label-color: #aaa;

scss/variables.scss

@@ -185,12 +185,30 @@ <h5>Moves to bottom inside the input</h5>
 					<h2>Textarea</h2>
 					<div class="g">
 						<div class="gi b0_12">
-							<ul class="form-fields label-top">
-								<li class="form-field input-textarea" data-castlecss-field>
+							<ul class="form-fields">
+								<li class="form-field form-textarea" data-castlecss-field>
 									<label for="textarea">Example</label>
 									<textarea maxlength="30000" cols="50" rows="10" id="textarea" name="textarea"></textarea>
 								</li>
+								<li class="form-field form-textarea label-top" data-castlecss-field>
+									<label for="textarea2">Example with label-top</label>
+									<textarea maxlength="30000" cols="50" rows="10" id="textarea2" name="textarea2"></textarea>
+								</li>
 							</ul>
+							<pre class="brush: html">
+							<form class="form form-horizontal">
+								<ul class="form-fields">
+									<li class="form-field form-textarea" data-castlecss-field>
+										<label for="textarea">Example</label>
+										<textarea maxlength="30000" cols="50" rows="10" id="textarea" name="textarea"></textarea>
+									</li>
+									<li class="form-field form-textarea label-top" data-castlecss-field>
+										<label for="textarea2">Example with label-top</label>
+										<textarea maxlength="30000" cols="50" rows="10" id="textarea2" name="textarea2"></textarea>
+									</li>
+								</ul>
+							</form>
+						</pre>
 							<div class="alert mb-2x">Remember the label placements mentioned above? The classes <code>.label-bottom</code>, <code>.label-top</code> and <code>.label-above</code> also work well with textareas. By default all labels are vertical-aligned in the middle. If you want to prevent this behaviour with textarea's you can add a parent class of <code>.input-textarea</code></div>
 						</div>
 					</div>