Skip to content

Commit 3dcb55a

Browse files
committed
adding bs3 after resolving conflicts, thanks to @ihabsoliman
2 parents 6e3fe75 + a65cda7 commit 3dcb55a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+10356
-618
lines changed

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
#Bootstrap Form Builder
1+
#Bootstrap v 3.0.0 Form Builder
22

33
##What's this?
44

5-
A Drag-and-drop form builder for [twitter bootstrap](http://twitter.github.com/bootstrap/).
5+
A Drag-and-drop form builder for [twitter bootstrap](http://getbootstrap.com/).
66

7-
Currently using `v. 2.3.1` :dolphin:
7+
Currently using `v. 3.0.0` :dolphin:
88

9-
##Where can I see it in action?
9+
##Where can I see it in action using bootstrap v 2.3.1 thanks to [minikomi](https://github.com/minikomi/Bootstrap-Form-Builder/)?
1010

11-
It's hosted on github pages [here](http://minikomi.github.io/Bootstrap-Form-Builder/).
11+
And It's hosted on github pages [here](http://ihabsoliman.github.io/Bootstrap-Form-Builder) using bootstrap v 3.0.0
1212

1313
###Notes
1414

15+
* This project is still under development.
16+
1517
* For development & debugging change the data-main for the require script tag in `index.html`
1618
to point at `assets/js/main.js`. (Look just before the closing `<body>` tag!)
1719

assets/css/custom.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ body {
1212

1313
#components {
1414
min-height: 500px;
15+
margin-top:5px;
1516
}
1617

1718
#target fieldset {
1819
border: 1px solid #ccc;
19-
min-height: 200px;
20+
min-height: 220px;
2021
padding: 5px;
21-
padding-bottom: 30px;
22+
padding-bottom: 50px;
2223
}
2324

2425
.component {
@@ -32,7 +33,9 @@ input {
3233
textarea {
3334
resize: vertical;
3435
}
35-
36+
.popover {
37+
z-index: 9999;
38+
}
3639
.popover .control-group {
3740
cursor: default;
3841
}
@@ -78,17 +81,17 @@ form .popover .control-label {
7881
}
7982

8083
form .popover form {
81-
width: 224px;
84+
width: 300px;
8285
}
8386

8487
.popover-content form .btn{
85-
margin-right: 10px
88+
/* margin-right: 10px */
8689
}
8790

8891
.target:after{
8992
float:left;
9093
content: " ";
91-
height: 77px;
94+
height: 77px;
9295
margin-top: 3px;
9396
background: #f0f0f0;
9497
width: 100%;

0 commit comments

Comments
 (0)