diff options
| author | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-09-19 15:44:49 +0200 |
|---|---|---|
| committer | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-09-21 12:57:34 +0200 |
| commit | 964cfc8e08467c93e18d78ab20f311d05b22eeb9 (patch) | |
| tree | 06dd65d9da1d3dbd84d3d7551054625cb1c264fa /core | |
| parent | 6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff) | |
| download | nextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.tar.gz nextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.zip | |
fix missing checkboxes in file comparator
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 2ec5129a1c5..bc4db43301d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -178,6 +178,8 @@ input[type="checkbox"] + label:before { opacity: 0.7; } +input[type="checkbox"].u-left +label:before { float: left; } + input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.svg'); } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 52ed34f61ec..719ac8587a4 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -400,6 +400,11 @@ var OCdialogs = { $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); } ); + // connect checkboxes with labels + var checkboxId = $conflicts.find('.conflict').length; + $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId); + $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId); + $conflicts.append($conflict); //set more recent mtime bold |