Merge branch 'develop' of github.com:modularcode/modular-admin-html into develop

Author: modularcoder

src/app/forms/checboxes/checboxes.hbs

@@ -56,11 +56,11 @@
                      <label class="control-label">Rounded Checkboxes</label>
                      <div>
                          <label>
-                            <input class="checkbox squared" checked="checked" type="checkbox">
+                            <input class="checkbox rounded" checked="checked" type="checkbox">
                             <span>Checked</span>
                         </label>
                         <label>
-                            <input class="checkbox squared" type="checkbox">
+                            <input class="checkbox rounded" type="checkbox">
                             <span>Unchecked</span>
                         </label>
                      </div>

src/app/forms/control-sizing/control-sizing.hbs

@@ -0,0 +1,30 @@
+<div class="card card-block">
+	<div class="panel-title-block" style="margin-bottom: 20px;">
+		<h3 class="title">
+			Control Sizing
+		</h3>
+	</div>
+	<div class="panel-body">
+		<input class="form-control form-control-lg" type="text" placeholder=".form-control-lg">
+		<input class="form-control" type="text" placeholder="Default input">
+		<input class="form-control form-control-sm" type="text" placeholder=".form-control-sm">
+		<select class="form-control form-control-lg">
+			<option>Option one</option>
+			<option>Option two</option>
+			<option>Option three</option>
+			<option>Option four</option>
+		</select>
+		<select class="form-control">
+			<option>Option one</option>
+			<option>Option two</option>
+			<option>Option three</option>
+			<option>Option four</option>
+		</select>
+		<select class="form-control form-control-sm">
+			<option>Option one</option>
+			<option>Option two</option>
+			<option>Option three</option>
+			<option>Option four</option>
+		</select>
+	</div>
+</div>

src/app/forms/forms-page.hbs

@@ -133,14 +133,7 @@ page: forms
 		<section class="section">
 			<div class="row sameheight-container">
 				<div class="col-md-6">
-					<div class="card card-block">
-						<div class="panel-title-block">
-							<h3 class="title">
-								Control Sizing
-							</h3>
-						</div>
-
-					</div>
+					{{> app/forms/control-sizing/control-sizing}}
 				</div>
 				<div class="col-md-6">
 					<div class="card card-block">

src/app/forms/radios/radios.hbs

@@ -56,11 +56,11 @@
                      <label class="control-label">Squared Radios</label>
                      <div>
                          <label>
-                            <input class="radio rounded"  name="squared-radios" checked="checked" type="radio">
+                            <input class="radio squared"  name="squared-radios" checked="checked" type="radio">
                             <span>Checked</span>
                         </label>
                         <label>
-                            <input class="radio rounded"  name="squared-radios" type="radio">
+                            <input class="radio squared"  name="squared-radios" type="radio">
                             <span>Unchecked</span>
                         </label>
                      </div>