mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Upgraded x-editable to v1.4.3

Browse Source
This commit is contained in:
Cameron
2013-04-17 11:25:33 -07:00
parent b92d481ff0
commit cd4d793fd4
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_web/js/bootstrap-editable/css/bootstrap-editable.css vendored
View File

@@ -1,4 +1,4 @@
/*! X-editable - v1.4.1 /*! X-editable - v1.4.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery * In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable * http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */ * Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
@@ -10,6 +10,7 @@
.editableform .control-group { .editableform .control-group {
margin-bottom: 0; /* overwrites bootstrap margin */ margin-bottom: 0; /* overwrites bootstrap margin */
white-space: nowrap; /* prevent wrapping buttons on new line */ white-space: nowrap; /* prevent wrapping buttons on new line */
line-height: 20px; /* overwriting bootstrap line-height. See #133 */
} }
.editable-buttons { .editable-buttons {
@@ -111,6 +112,7 @@
position: absolute; position: absolute;
opacity: 0.6; opacity: 0.6;
z-index: 100; z-index: 100;
} }
.editable-clear-x:hover { .editable-clear-x:hover {
@@ -167,6 +169,13 @@ a.editable-click.editable-disabled:hover {
/* content: '*'*/ /* content: '*'*/
} }
/*see https://github.com/vitalets/x-editable/issues/139 */
.form-horizontal .editable
{
padding-top: 5px;
display:inline-block;
}
/*! /*!
* Datepicker for Bootstrap * Datepicker for Bootstrap
@@ -452,6 +461,16 @@ a.editable-click.editable-disabled:hover {
.datepicker tfoot tr:first-child th:hover { .datepicker tfoot tr:first-child th:hover {
background: #eeeeee; background: #eeeeee;
} }
.datepicker .cw {
font-size: 10px;
width: 12px;
padding: 0 2px 0 5px;
vertical-align: middle;
}
.datepicker thead tr:first-child th.cw {
cursor: default;
background-color: transparent;
}
.input-append.date .add-on i, .input-append.date .add-on i,
.input-prepend.date .add-on i { .input-prepend.date .add-on i {
display: block; display: block;

4
e107_web/js/bootstrap-editable/js/bootstrap-editable.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
e107_web/js/core/admin.jquery.js
View File

@@ -77,10 +77,6 @@ $(document).ready(function()
// $(this).css( 'cursor', 'pointer' ) // $(this).css( 'cursor', 'pointer' )
}); });
if($.fn.editable.defaults.mode)
{
$.fn.editable.defaults.mode = 'popup';
}
$("#uiModal").draggable({ $("#uiModal").draggable({
handle: ".modal-header" handle: ".modal-header"