Index: lams_central/web/css/x-editable.css =================================================================== diff -u -r57cb0137ad3c8822ab19d49534125c7b3a7ce09c -r35dd47046a83ab2f9e80f76dc22d1521412219b5 --- lams_central/web/css/x-editable.css (.../x-editable.css) (revision 57cb0137ad3c8822ab19d49534125c7b3a7ce09c) +++ lams_central/web/css/x-editable.css (.../x-editable.css) (revision 35dd47046a83ab2f9e80f76dc22d1521412219b5) @@ -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 @@ -24,9 +34,6 @@ display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */ vertical-align: top; margin-left: 7px; - /* inline-block emulation for IE7*/ - zoom: 1; - *display: inline; } .editable-buttons.editable-buttons-bottom { @@ -40,9 +47,6 @@ display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */ width: auto; /* bootstrap-responsive has width: 100% that breakes layout */ white-space: normal; /* reset white-space decalred in parent*/ - /* display-inline emulation for IE7*/ - zoom: 1; - *display: inline; } .editable-buttons .editable-cancel { @@ -56,7 +60,7 @@ } .editableform-loading { - background: url('/lams/images/css/loading.gif') center center no-repeat; + background: url('../images/x-editable/loading.gif') center center no-repeat; height: 25px; width: auto; min-width: 25px; @@ -124,7 +128,7 @@ /* IOS-style clear button for text inputs */ .editable-clear-x { - background: url('/lams/images/css/clear.png') center center no-repeat; + background: url('../images/x-editable/clear.png') center center no-repeat; display: block; width: 13px; height: 13px; @@ -145,6 +149,7 @@ .editable-pre-wrapped { white-space: pre-wrap; } + .editable-container.editable-popup { max-width: none !important; /* without this rule poshytip/tooltip does not stretch */ } @@ -157,9 +162,6 @@ display: inline-block; vertical-align: middle; width: auto; - /* inline-block emulation for IE7*/ - zoom: 1; - *display: inline; } .editable-container.ui-widget { @@ -660,4 +662,4 @@ border: 1px solid #ccc; margin-left: -5px; margin-right: -5px; -} \ No newline at end of file +}