build

dist/README.md

@@ -1,19 +1,25 @@
 # 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  
+More details are in [CONTRIBUTING.md](/CONTRIBUTING.md).
+
+## 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
@@ -26,25 +32,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>
 ````
@@ -53,78 +59,12 @@ jQuery only build:
 ## Reporting issues
 Please **provide jsFiddle** when creating issues!   
 It's really saves much time. Use these as template:   
-1. [jsFiddle Bootstrap 3](http://jsfiddle.net/xBB5x/2265/)  
+1. [jsFiddle Bootstrap 3](http://jsfiddle.net/xBB5x/15155/)  
 2. [jsFiddle Bootstrap 2](http://jsfiddle.net/xBB5x/1817/)  
 3. [jsFiddle jQuery-ui](http://jsfiddle.net/xBB5x/2511/)  
 4. [jsFiddle jQuery](http://jsfiddle.net/xBB5x/197)    
 Your feedback is very appreciated!
 
-## Contribution
-A few steps how to start contributing.  
-Assuming you have [Node.js](http://nodejs.org/) already installed.
-
-1.Fork *X-editable* on github and clone it to your local mashine:
-````
-git clone https://github.com/<your-github-name>/x-editable.git -b dev
-````
-2.Install *grunt-cli* globally (if not yet):
-````
-npm i -g grunt-cli
-````
-3.Install dependencies:  
-````
-cd x-editable
-npm i
-````
-4.Make your changes:  
-````
-vim editable-form.js
-````
-5.Write some tests for your changes:
-````
-vim /test/unit/*.js
-````
-6.Run tests in cli:  
-````
-grunt test
-````
-or directly in browser:
-````
-grunt server
-````
-and open http://127.0.0.1:8000/test  
-By default test run on bootstrap 3 popup version, but you can test any other build:  
-
-* bootstrap 3
-  * popup: http://127.0.0.1:8000/test/?f=bootstrap3&c=popup  
-  * inline: http://127.0.0.1:8000/test/?f=bootstrap3&c=inline  
-* bootstrap 2
-  * popup: http://127.0.0.1:8000/test/?f=bootstrap2&c=popup 
-  * inline: http://127.0.0.1:8000/test/?f=bootstrap2&c=inline
-* jquery-ui
-  * popup: http://127.0.0.1:8000/test/?f=jqueryui&c=popup 
-  * inline: http://127.0.0.1:8000/test/?f=jqueryui&c=inline
-* jquery + poshytip
-  * popup: http://127.0.0.1:8000/test/?f=plain&c=popup 
-  * inline: http://127.0.0.1:8000/test/?f=plain&c=inline
-
-7.Commit and push back on github:  
-````
-git add .
-git commit -m'refactor editable form, fix #123'
-git push origin
-````
-8.Make pull request on github (to `dev` branch).  
-
-Thanks for your support!
-
-### Local build
-To build x-editable locally please run:
-````
-grunt build
-````
-Result will appear in `dist` directory.
-
 ## License
 Copyright (c) 2012 Vitaliy Potapov  
 Licensed under the MIT license.

dist/bootstrap-editable/css/bootstrap-editable.css

@@ -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) 2018 Vitaliy Potapov; Licensed MIT */
 .editableform {
     margin-bottom: 0; /* overwrites bootstrap margin */
 }
@@ -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
@@ -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 */
 }