Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Prevent bs.scss overrides #187

Merged
merged 2 commits into from
Jul 12, 2016
Merged

Bugfix: Prevent bs.scss overrides #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47336ce
Prevent bs.scss overrides
kevinchappell Jul 12, 2016
72fa278
1.10.6
kevinchappell Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

- v1.10.6 - Bugfix: Limit scope of bootstrap helpers [#187](https://github.com/kevinchappell/formBuilder/pull/187)
- v1.10.5 - Bugfix: Other option for radio and checkbox xml attribute [#186](https://github.com/kevinchappell/formBuilder/pull/186)
- v1.10.4 - Bugfix: Object.assign [#181](https://github.com/kevinchappell/formBuilder/pull/181)
- v1.10.3 - Bugfix: defaultFields multiple select not applied [#176](https://github.com/kevinchappell/formBuilder/pull/176)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
formBuilder v1.10.5
formBuilder v1.10.6
===========

[![Join the chat at https://gitter.im/kevinchappell/formBuilder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kevinchappell/formBuilder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "formBuilder",
"version": "1.10.5",
"version": "1.10.6",
"main": [
"dist/*"
],
Expand Down
1,116 changes: 555 additions & 561 deletions demo/assets/css/form-builder.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/assets/css/form-builder.min.css
View file
Open in desktop

Large diffs are not rendered by default.

188 changes: 94 additions & 94 deletions demo/assets/css/form-render.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.10.5
Version: 1.10.6
Author: Kevin Chappell <[email protected]>
*/
* {
[id^='frmb-'][id$='-form-wrap'] * {
box-sizing: border-box; }

button,
input,
select,
textarea {
[id^='frmb-'][id$='-form-wrap'] button,
[id^='frmb-'][id$='-form-wrap'] input,
[id^='frmb-'][id$='-form-wrap'] select,
[id^='frmb-'][id$='-form-wrap'] textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit; }

input {
[id^='frmb-'][id$='-form-wrap'] input {
line-height: normal; }

button,
input,
optgroup,
select,
textarea {
[id^='frmb-'][id$='-form-wrap'] button,
[id^='frmb-'][id$='-form-wrap'] input,
[id^='frmb-'][id$='-form-wrap'] optgroup,
[id^='frmb-'][id$='-form-wrap'] select,
[id^='frmb-'][id$='-form-wrap'] textarea {
margin: 0;
font: inherit;
color: inherit; }

textarea {
[id^='frmb-'][id$='-form-wrap'] textarea {
overflow: auto; }

button,
input,
select,
textarea {
[id^='frmb-'][id$='-form-wrap'] button,
[id^='frmb-'][id$='-form-wrap'] input,
[id^='frmb-'][id$='-form-wrap'] select,
[id^='frmb-'][id$='-form-wrap'] textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit; }

.btn-group {
[id^='frmb-'][id$='-form-wrap'] .btn-group {
position: relative;
display: inline-block;
vertical-align: middle; }
.btn-group > .btn {
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn {
position: relative;
float: left; }
.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
border-radius: 0; }
.btn-group .btn + .btn,
.btn-group .btn + .btn-group,
.btn-group .btn-group + .btn,
.btn-group .btn-group + .btn-group {
[id^='frmb-'][id$='-form-wrap'] .btn-group .btn + .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group .btn + .btn-group,
[id^='frmb-'][id$='-form-wrap'] .btn-group .btn-group + .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group .btn-group + .btn-group {
margin-left: -1px; }
.btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child),
.btn-group .input-group .form-control:last-child,
.btn-group .input-group-addon:last-child,
.btn-group .input-group-btn:first-child > .btn-group:not(:first-child) > .btn,
.btn-group .input-group-btn:first-child > .btn:not(:first-child),
.btn-group .input-group-btn:last-child > .btn,
.btn-group .input-group-btn:last-child > .btn-group > .btn, .btn-group .input-group-btn:last-child > .dropdown-toggle {
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:last-child:not(:first-child),
[id^='frmb-'][id$='-form-wrap'] .btn-group > .dropdown-toggle:not(:first-child),
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group .form-control:last-child,
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-addon:last-child,
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-btn:first-child > .btn-group:not(:first-child) > .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-btn:first-child > .btn:not(:first-child),
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-btn:last-child > .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-btn:last-child > .btn-group > .btn, [id^='frmb-'][id$='-form-wrap'] .btn-group .input-group-btn:last-child > .dropdown-toggle {
border-top-left-radius: 0;
border-bottom-left-radius: 0; }
.btn-group > .btn.active,
.btn-group > .btn:active,
.btn-group > .btn:focus,
.btn-group > .btn:hover {
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn.active,
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:active,
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:focus,
[id^='frmb-'][id$='-form-wrap'] .btn-group > .btn:hover {
z-index: 2; }

.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group,
.btn-group-vertical > .btn-group > .btn {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group > .btn {
display: block;
float: none;
width: 100%;
max-width: 100%; }

.btn-group-vertical > .btn-group > .btn {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group > .btn {
float: none; }

.btn-group-vertical > .btn + .btn,
.btn-group-vertical > .btn + .btn-group,
.btn-group-vertical > .btn-group + .btn,
.btn-group-vertical > .btn-group + .btn-group {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn + .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn + .btn-group,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group + .btn,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group + .btn-group {
margin-top: -1px;
margin-left: 0; }

.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn:not(:first-child):not(:last-child) {
border-radius: 0; }

.btn-group-vertical > .btn:first-child:not(:last-child) {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-left-radius: 4px !important;
border-top-right-radius: 4px !important;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0; }

.btn-group-vertical > .btn:last-child:not(:first-child) {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn:last-child:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; }

.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; }

.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0; }

.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
[id^='frmb-'][id$='-form-wrap'] .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0;
border-top-right-radius: 0; }

.btn {
[id^='frmb-'][id$='-form-wrap'] .btn {
color: #fff;
display: inline-block;
padding: 6px 12px;
Expand All @@ -136,114 +136,114 @@ textarea {
background-image: none;
border: 1px solid transparent;
border-radius: 4px; }
.btn.btn-default {
[id^='frmb-'][id$='-form-wrap'] .btn.btn-default {
color: #333;
background-color: #fff;
border-color: #ccc; }
.btn.btn-lg {
[id^='frmb-'][id$='-form-wrap'] .btn.btn-lg {
padding: 10px 16px;
font-size: 18px;
line-height: 1.3333333;
border-radius: 6px; }
.btn.btn-sm {
[id^='frmb-'][id$='-form-wrap'] .btn.btn-sm {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px; }
.btn.btn-xs {
[id^='frmb-'][id$='-form-wrap'] .btn.btn-xs {
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px; }
.btn.active, .btn.btn-active, .btn:active {
[id^='frmb-'][id$='-form-wrap'] .btn.active, [id^='frmb-'][id$='-form-wrap'] .btn.btn-active, [id^='frmb-'][id$='-form-wrap'] .btn:active {
background-image: none; }

.btn-primary {
[id^='frmb-'][id$='-form-wrap'] .btn-primary {
background-color: #337ab7;
border-color: #2e6da4; }
.btn-primary:hover, .btn-primary:active, .btn-primary.active, .btn-primary.btn-active {
[id^='frmb-'][id$='-form-wrap'] .btn-primary:hover, [id^='frmb-'][id$='-form-wrap'] .btn-primary:active, [id^='frmb-'][id$='-form-wrap'] .btn-primary.active, [id^='frmb-'][id$='-form-wrap'] .btn-primary.btn-active {
background-color: #286090;
border-color: #204d74; }

.btn-danger {
[id^='frmb-'][id$='-form-wrap'] .btn-danger {
background-color: #d9534f;
border-color: #d43f3a; }
.btn-danger:hover {
[id^='frmb-'][id$='-form-wrap'] .btn-danger:hover {
background-color: #c9302c;
border-color: #ac2925; }

.btn-default {
[id^='frmb-'][id$='-form-wrap'] .btn-default {
background-color: #fff;
border-color: #ccc; }

.btn-success {
[id^='frmb-'][id$='-form-wrap'] .btn-success {
background-color: #5cb85c;
border-color: #4cae4c; }
.btn-success:hover {
[id^='frmb-'][id$='-form-wrap'] .btn-success:hover {
background-color: #449d44;
border-color: #398439; }

.btn-info {
[id^='frmb-'][id$='-form-wrap'] .btn-info {
background-color: #5bc0de;
border-color: #46b8da; }
.btn-info:hover {
[id^='frmb-'][id$='-form-wrap'] .btn-info:hover {
background-color: #31b0d5;
border-color: #269abc; }

.btn-warning {
[id^='frmb-'][id$='-form-wrap'] .btn-warning {
background-color: #f0ad4e;
border-color: #eea236; }
.btn-warning:hover {
[id^='frmb-'][id$='-form-wrap'] .btn-warning:hover {
background-color: #ec971f;
border-color: #d58512; }

.input-group .form-control:last-child,
.input-group-addon:last-child,
.input-group-btn:first-child > .btn-group:not(:first-child) > .btn,
.input-group-btn:first-child > .btn:not(:first-child),
.input-group-btn:last-child > .btn,
.input-group-btn:last-child > .btn-group > .btn,
.input-group-btn:last-child > .dropdown-toggle {
[id^='frmb-'][id$='-form-wrap'] .input-group .form-control:last-child,
[id^='frmb-'][id$='-form-wrap'] .input-group-addon:last-child,
[id^='frmb-'][id$='-form-wrap'] .input-group-btn:first-child > .btn-group:not(:first-child) > .btn,
[id^='frmb-'][id$='-form-wrap'] .input-group-btn:first-child > .btn:not(:first-child),
[id^='frmb-'][id$='-form-wrap'] .input-group-btn:last-child > .btn,
[id^='frmb-'][id$='-form-wrap'] .input-group-btn:last-child > .btn-group > .btn,
[id^='frmb-'][id$='-form-wrap'] .input-group-btn:last-child > .dropdown-toggle {
border-top-left-radius: 0;
border-bottom-left-radius: 0; }

.input-group .form-control,
.input-group-addon,
.input-group-btn {
[id^='frmb-'][id$='-form-wrap'] .input-group .form-control,
[id^='frmb-'][id$='-form-wrap'] .input-group-addon,
[id^='frmb-'][id$='-form-wrap'] .input-group-btn {
display: table-cell; }

.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
[id^='frmb-'][id$='-form-wrap'] .input-group-lg > .form-control,
[id^='frmb-'][id$='-form-wrap'] .input-group-lg > .input-group-addon,
[id^='frmb-'][id$='-form-wrap'] .input-group-lg > .input-group-btn > .btn {
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.3333333;
border-radius: 6px; }

.input-group .form-control {
[id^='frmb-'][id$='-form-wrap'] .input-group .form-control {
position: relative;
z-index: 2;
float: left;
width: 100%;
margin-bottom: 0; }

.input-group {
[id^='frmb-'][id$='-form-wrap'] .input-group {
position: relative;
display: table;
border-collapse: separate; }

.form-control,
output {
[id^='frmb-'][id$='-form-wrap'] .form-control,
[id^='frmb-'][id$='-form-wrap'] output {
font-size: 14px;
line-height: 1.42857143;
color: #555;
display: block; }

textarea.form-control {
[id^='frmb-'][id$='-form-wrap'] textarea.form-control {
height: auto; }

.form-control {
[id^='frmb-'][id$='-form-wrap'] .form-control {
height: 34px;
display: block;
width: 100%;
Expand All @@ -258,22 +258,22 @@ textarea.form-control {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; }
.form-control:focus {
[id^='frmb-'][id$='-form-wrap'] .form-control:focus {
border-color: #66afe9;
outline: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); }

.form-group {
[id^='frmb-'][id$='-form-wrap'] .form-group {
margin-bottom: 15px; }

.btn,
.form-control {
[id^='frmb-'][id$='-form-wrap'] .btn,
[id^='frmb-'][id$='-form-wrap'] .form-control {
background-image: none; }

.pull-right {
[id^='frmb-'][id$='-form-wrap'] .pull-right {
float: right !important; }

.pull-left {
[id^='frmb-'][id$='-form-wrap'] .pull-left {
float: left !important; }

.kc-toggle {
Expand Down
Loading