Merge pull request #63 from kevinchappell/hotfix/placeholder

Add placeholder
kevinchappell · Feb 20, 2016 · a811b62 · a811b62
2 parents cb0969e + 3719e66
commit a811b62
Show file tree

Hide file tree

Showing 14 changed files with 216 additions and 133 deletions.
diff --git a/demo/assets/demo.css b/demo/assets/demo.css
diff --git a/demo/assets/form-builder.min.css b/demo/assets/form-builder.min.css
diff --git a/demo/assets/form-builder.min.js b/demo/assets/form-builder.min.js
diff --git a/demo/assets/form-render.min.js b/demo/assets/form-render.min.js
diff --git a/dist/form-builder.css b/dist/form-builder.css
@@ -367,6 +367,36 @@ textarea.form-control {
 .frmb .disabled .field-label {
   display: block; }
 
+.stage-wrap {
+  position: relative;
+  float: left;
+  width: 62%;
+  margin-right: 2%; }
+  .stage-wrap .action-links {
+    width: calc( 100% - 141px);
+    display: none;
+    float: right;
+    overflow: hidden;
+    text-align: right; }
+  .stage-wrap.empty:after {
+    content: attr(data-content);
+    position: absolute;
+    text-align: center;
+    top: 50%;
+    left: 0;
+    width: 100%;
+    margin-top: -1em; }
+
+.stage-wrap .action-links .active {
+  font-weight: 700;
+  color: #000; }
+
+.frm-fld {
+  clear: left;
+  padding: 5px 0; }
+  .frm-fld select.form-control {
+    width: 70%; }
+
 .kc-toggle {
   position: relative;
   margin: 4px 0 0 2px;
@@ -471,29 +501,6 @@ textarea.idea-template {
   float: right;
   width: 36%; }
 
-.stage-wrap {
-  position: relative;
-  float: left;
-  width: 62%;
-  margin-right: 2%; }
-  .stage-wrap .action-links {
-    width: calc( 100% - 141px);
-    display: none;
-    float: right;
-    overflow: hidden;
-    text-align: right; }
-  .stage-wrap.empty:after {
-    content: attr(data-content);
-    position: absolute;
-    text-align: center;
-    top: 50%;
-    width: 100%;
-    margin-top: -1em; }
-
-.stage-wrap .action-links .active {
-  font-weight: 700;
-  color: #000; }
-
 .action-links .action-links-inner {
   overflow: hidden;
   width: 0;
@@ -627,10 +634,6 @@ ol.sortable-options li {
 .allow-select .form-elements .allow-multi, .allow-select .form-elements .select-option, .edit-names .form-elements .name-wrap {
   display: block !important; }
 
-.frm-fld {
-  clear: left;
-  padding: 5px 0; }
-
 .frm-fld .available-roles {
   display: none;
   padding: 5px 10px;