Skip to content

Commit

Permalink
working autocomplete with select2-4.0.4 rebased from select2 fork
Browse files Browse the repository at this point in the history
  • Loading branch information
hishammalik committed Oct 29, 2017
1 parent baa68df commit 7cd9f1c
Show file tree
Hide file tree
Showing 17 changed files with 2,056 additions and 1,404 deletions.
29 changes: 17 additions & 12 deletions dist/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
# X-editable

In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.

## Project status
Unfortunately, **project is currently frozen**, as I don't have enough time for it.
You could try use it as is, but there may be some bugs with newer versions of dependend libraries (e.g. bootstrap).
I would really appreciate if someone take care of it.. See [#610](https://github.com/vitalets/x-editable/issues/610).
Vitalets.

## Live demo
## Live Demo
**http://vitalets.github.io/x-editable/demo.html**

## Pull Requests
Please submit all Pull Requests to the `develop` branch: https://github.com/vitalets/x-editable/tree/develop

## Issue Tracker
Please report all issues here: https://github.com/vitalets/x-editable/issues

## User Support
Unfortunately, due to this project being supported by volunteers we cannot provide user support at this time. Please try a site like Stack Overflow: http://stackoverflow.com/questions/tagged/x-editable

## Documentation
**http://vitalets.github.io/x-editable**

## Project Status
Actively Maintained

## How to get it

### Manual download
Expand All @@ -26,25 +31,25 @@ bower install x-editable

### CDN
Bootstrap 3 build:
````js
````html
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css" rel="stylesheet"/>
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
````

Bootstrap 2 build:
````js
````html
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet"/>
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/js/bootstrap-editable.min.js"></script>
````

jQuery UI build:
````js
````html
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jqueryui-editable/css/jqueryui-editable.css" rel="stylesheet"/>
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jqueryui-editable/js/jqueryui-editable.min.js"></script>
````

jQuery only build:
````js
````html
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jquery-editable/css/jquery-editable.css" rel="stylesheet"/>
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jquery-editable/js/jquery-editable-poshytip.min.js"></script>
````
Expand Down
13 changes: 12 additions & 1 deletion dist/bootstrap-editable/css/bootstrap-editable.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2017 Vitaliy Potapov; Licensed MIT */
.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand All @@ -12,6 +12,16 @@
line-height: 20px; /* overwriting bootstrap line-height. See #133 */
}

/*
BS3 fix: stop css from breaking when the form is inside a popup and inside a form with the class .form-horizontal
See: https://github.com/vitalets/x-editable/issues/682
*/
.form-horizontal .editable-popup .editableform .form-group {
margin-left:0;
margin-right:0;
}


/*
BS3 width:1005 for inputs breaks editable form in popup
See: https://github.com/vitalets/x-editable/issues/393
Expand Down Expand Up @@ -145,6 +155,7 @@
.editable-pre-wrapped {
white-space: pre-wrap;
}

.editable-container.editable-popup {
max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
}
Expand Down
Loading

0 comments on commit 7cd9f1c

Please sign in to comment.