Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: gossi/webform
base: 74c123566f
...
head fork: gossi/webform
compare: 481738f6df
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
44 css/webform.css
@@ -175,7 +175,8 @@
border: 0;
}
.webform-composite,
-.webform select {
+.webform select,
+.webform textarea {
border: 1px solid #dddddd;
border-radius: 5px;
-o-box-shadow: 0 0 1px #e0e0e0;
@@ -187,7 +188,8 @@
-moz-transition: all 0.2s ease;
}
.webform-composite:focus,
-.webform select:focus {
+.webform select:focus,
+.webform textarea:focus {
-o-box-shadow: 0 0 2px #5f96e1;
-ms-box-shadow: 0 0 2px #5f96e1;
-moz-box-shadow: 0 0 2px #5f96e1;
@@ -438,7 +440,8 @@
width: 150px;
}
.webform-layout-table .webform-composite,
-.webform-layout-table .webform-borderless-composite {
+.webform-layout-table .webform-borderless-composite,
+.webform-layout-table textarea {
width: 300px;
}
.webform-layout-table .webform-composite {
@@ -473,15 +476,48 @@
.webform-layout-table .webform-control-box .webform-errors {
margin-left: 155px;
}
+.webform-layout-vertical label {
+ display: block;
+}
+.webform-layout-vertical .webform-control-content > li > .webform-control-box > label {
+ display: inline;
+}
.webform-layout-vertical .webform-control-box {
display: block;
- margin: 5px 0;
+ margin: 5px 0;
}
.webform-layout-vertical .webform-control[type=submit],
.webform-layout-vertical .webform-control[type=reset],
.webform-layout-vertical button {
margin: 8px 0 5px 0;
}
+.webform-layout-vertical .webform-composite,
+.webform-layout-vertical .webform-borderless-composite,
+.webform-layout-vertical textarea {
+ min-width: 180px;
+}
+.webform-layout-vertical .webform-composite {
+ display: table;
+}
+.webform-layout-vertical .webform-composite .webform-control {
+ width: 96%;
+}
+.webform-layout-vertical .webform-composite .webform-control.has-step-controls {
+ width: 86%;
+}
+.webform-layout-vertical .webform-composite .step-controls {
+ margin-left: -1px;
+}
+.webform-layout-vertical .webform-composite .webform-prepend,
+.webform-layout-vertical .webform-composite .webform-append {
+ display: table-cell;
+}
+.webform-layout-vertical .webform-borderless-composite .webform-control {
+ width: 100%;
+}
+.webform-layout-vertical .webform-borderless-composite .webform-control.input-range {
+ width: 96%;
+}
.webform-layout-column > .webform-area {
float: left;
}
View
51 css/webform.less
@@ -155,7 +155,7 @@
}
}
- &-composite, select {
+ &-composite, select, textarea {
border: 1px solid @controlBorderColor;
border-radius: @controlPadding + 1px;
.webform-focus;
@@ -361,7 +361,8 @@
}
.webform-composite,
- .webform-borderless-composite {
+ .webform-borderless-composite,
+ textarea {
width: 300px;
}
@@ -411,14 +412,58 @@
/* Vertical Layout */
&-vertical {
+ label {
+ display: block;
+ }
+
+ .webform-control-content > li > .webform-control-box > label {
+ display: inline;
+ }
+
.webform-control-box {
display: block;
- margin: 5px 0;
+ margin: 5px 0;
}
.webform-control[type=submit], .webform-control[type=reset], button {
margin: 8px 0 5px 0;
}
+
+ .webform-composite,
+ .webform-borderless-composite,
+ textarea {
+ min-width: 180px;
+ }
+
+ .webform-composite {
+ display: table;
+
+ .webform-control {
+ width: 100% - @controlPadding;
+ }
+
+ .webform-control.has-step-controls {
+ width: 100% - (@controlPadding * 3.5);
+ }
+
+ .step-controls {
+ margin-left: -1px;
+ }
+
+ .webform-prepend, .webform-append {
+ display: table-cell;
+ }
+ }
+
+ .webform-borderless-composite {
+ .webform-control {
+ width: 100%;
+ }
+
+ .webform-control.input-range {
+ width: 100% - @controlPadding;
+ }
+ }
}
/* Column Layout (fieldset - Area) */
View
13 css/webform.min.css
@@ -16,7 +16,7 @@
.webform-control[readonly]{color:#777;}
.webform-control[type=checkbox],.webform-control[type=radio]{margin-right:5px;}
.webform-control[type=range]{border:0;}
-.webform-composite,.webform select{border:1px solid #dddddd;border-radius:5px;-o-box-shadow:0 0 1px #e0e0e0;-ms-box-shadow:0 0 1px #e0e0e0;-moz-box-shadow:0 0 1px #e0e0e0;-webkit-box-shadow:0 0 1px #e0e0e0;box-shadow:0 0 1px #e0e0e0;outline:none;-moz-transition:all 0.2s ease;}.webform-composite:focus,.webform select:focus{-o-box-shadow:0 0 2px #5f96e1;-ms-box-shadow:0 0 2px #5f96e1;-moz-box-shadow:0 0 2px #5f96e1;-webkit-box-shadow:0 0 2px #5f96e1;box-shadow:0 0 2px #5f96e1;outline:none;-moz-transition:all 0.2s ease;}
+.webform-composite,.webform select,.webform textarea{border:1px solid #dddddd;border-radius:5px;-o-box-shadow:0 0 1px #e0e0e0;-ms-box-shadow:0 0 1px #e0e0e0;-moz-box-shadow:0 0 1px #e0e0e0;-webkit-box-shadow:0 0 1px #e0e0e0;box-shadow:0 0 1px #e0e0e0;outline:none;-moz-transition:all 0.2s ease;}.webform-composite:focus,.webform select:focus,.webform textarea:focus{-o-box-shadow:0 0 2px #5f96e1;-ms-box-shadow:0 0 2px #5f96e1;-moz-box-shadow:0 0 2px #5f96e1;-webkit-box-shadow:0 0 2px #5f96e1;box-shadow:0 0 2px #5f96e1;outline:none;-moz-transition:all 0.2s ease;}
.webform-composite,.webform-borderless-composite{display:inline-block;}
.webform-composite .webform-control{margin:4px 5px;}
.webform-composite.focus{-o-box-shadow:0 0 2px #5f96e1;-ms-box-shadow:0 0 2px #5f96e1;-moz-box-shadow:0 0 2px #5f96e1;-webkit-box-shadow:0 0 2px #5f96e1;box-shadow:0 0 2px #5f96e1;outline:none;-moz-transition:all 0.2s ease;}
@@ -50,7 +50,7 @@
.webform-control-box .webform-errors{padding:5px;list-style-type:disc;color:#D63301;}
.webform .webform-errors li,.webform .webform-group-vertical li{background-image:none;padding:0;}
.webform-layout{}.webform-layout-table .webform-control-box>.webform-label{float:left;width:150px;}
-.webform-layout-table .webform-composite,.webform-layout-table .webform-borderless-composite{width:300px;}
+.webform-layout-table .webform-composite,.webform-layout-table .webform-borderless-composite,.webform-layout-table textarea{width:300px;}
.webform-layout-table .webform-composite{display:table;}.webform-layout-table .webform-composite .webform-control{width:96%;}
.webform-layout-table .webform-composite .webform-control.has-step-controls{width:91%;}
.webform-layout-table .webform-composite .step-controls{margin-left:-1px;}
@@ -59,8 +59,17 @@
.webform-layout-table .webform-borderless-composite .webform-control.input-range{width:98%;}
.webform-layout-table .webform-control-content{margin-left:150px;}.webform-layout-table .webform-control-content .webform-control-box>.webform-label{float:none;width:auto;}
.webform-layout-table .webform-control-box .webform-errors{margin-left:155px;}
+.webform-layout-vertical label{display:block;}
+.webform-layout-vertical .webform-control-content>li>.webform-control-box>label{display:inline;}
.webform-layout-vertical .webform-control-box{display:block;margin:5px 0;}
.webform-layout-vertical .webform-control[type=submit],.webform-layout-vertical .webform-control[type=reset],.webform-layout-vertical button{margin:8px 0 5px 0;}
+.webform-layout-vertical .webform-composite,.webform-layout-vertical .webform-borderless-composite,.webform-layout-vertical textarea{min-width:180px;}
+.webform-layout-vertical .webform-composite{display:table;}.webform-layout-vertical .webform-composite .webform-control{width:96%;}
+.webform-layout-vertical .webform-composite .webform-control.has-step-controls{width:86%;}
+.webform-layout-vertical .webform-composite .step-controls{margin-left:-1px;}
+.webform-layout-vertical .webform-composite .webform-prepend,.webform-layout-vertical .webform-composite .webform-append{display:table-cell;}
+.webform-layout-vertical .webform-borderless-composite .webform-control{width:100%;}
+.webform-layout-vertical .webform-borderless-composite .webform-control.input-range{width:96%;}
.webform-layout-column >.webform-area{float:left;}
.webform-layout-column >.webform-area:last-child{}
.webform .step-controls{margin-left:-16px;margin-top:4px;}.webform .step-controls span{background:none;border:1px solid #CCC;background-color:#EEE;background-image:-o-linear-gradient(top, #ffffff, #e0e0e0);background-image:-ms-linear-gradient(top, #ffffff, #e0e0e0);background-image:-moz-linear-gradient(top, #ffffff, #e0e0e0);background-image:-webkit-linear-gradient(top, #ffffff, #e0e0e0);background-image:linear-gradient(top, #ffffff, #e0e0e0);-o-box-sizing:border-box;-ms-box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;width:14px;height:8.5px;}.webform .step-controls span:hover{background-color:#DDD;background-image:-o-linear-gradient(top, #ffffff, #f0f0f0);background-image:-ms-linear-gradient(top, #ffffff, #f0f0f0);background-image:-moz-linear-gradient(top, #ffffff, #f0f0f0);background-image:-webkit-linear-gradient(top, #ffffff, #f0f0f0);background-image:linear-gradient(top, #ffffff, #f0f0f0);}
View
2  demo/user-signup.php
@@ -27,7 +27,7 @@
$wf = new Webform(array('target' => $_SERVER['PHP_SELF']));
-$wf->setLayout(Webform::LAYOUT_TABLE);
+$wf->setLayout(Webform::LAYOUT_VERTICAL);
$personal = new Area($wf, array('label' => 'Personal Data', 'columns' => 2));
View
BIN  images/spinner_down.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  images/spinner_up.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

No commit comments for this range

Something went wrong with that request. Please try again.