mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-22 07:14:21 +00:00
(js) Allow mail filters to be sortable
Added dependency to https://github.com/RubaXa/Sortable
This commit is contained in:
1 parent
3e76de1e6e
commit
2380890428
6 files changed
+34
-7
No files matched your search
@@ -15,6 +15,9 @@ module.exports = function(grunt) {
|
||||
'js/Administration.js': ['js/Administration/Administration.app.js', 'js/Administration/*Controller.js']
|
||||
|
||||
};
|
||||
var sortable_files = {
|
||||
'js/vendor/ng-sortable.js': ['bower_components/Sortable/Sortable.js', 'bower_components/Sortable/ng-sortable.js']
|
||||
};
|
||||
|
||||
require('time-grunt')(grunt);
|
||||
|
||||
@@ -87,6 +90,12 @@ module.exports = function(grunt) {
|
||||
mangle: false,
|
||||
},
|
||||
files: js_files
|
||||
},
|
||||
sortable: {
|
||||
options: {
|
||||
compress: true
|
||||
},
|
||||
files: sortable_files,
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@@ -170,7 +179,7 @@ module.exports = function(grunt) {
|
||||
}
|
||||
*/
|
||||
});
|
||||
grunt.task.registerTask('build', ['static', 'uglify:dist', 'sass:dist', 'postcss:dist']);
|
||||
grunt.task.registerTask('build', ['static', 'uglify:dist', 'uglify:sortable', 'sass:dist', 'postcss:dist']);
|
||||
// Tasks for developers
|
||||
grunt.task.registerTask('default', ['watch']);
|
||||
grunt.task.registerTask('css', ['sass:dev', 'postcss:dev']);
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
"angular-file-upload": "latest",
|
||||
"angular-material": "v1.0.5",
|
||||
"lodash": "latest",
|
||||
"Sortable": "latest",
|
||||
"breakpoint-sass": ">=2.4.2"
|
||||
},
|
||||
"resolutions": {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
angular.module('SOGo.PreferencesUI', ['ui.router', 'ck', 'SOGo.Common', 'SOGo.MailerUI', 'SOGo.ContactsUI', 'SOGo.Authentication'])
|
||||
angular.module('SOGo.PreferencesUI', ['ui.router', 'ck', 'SOGo.Common', 'SOGo.MailerUI', 'SOGo.ContactsUI', 'SOGo.Authentication', 'ng-sortable'])
|
||||
.config(configure)
|
||||
.run(runBlock);
|
||||
|
||||
|
||||
@@ -202,6 +202,21 @@ div.md-tile-left {
|
||||
margin: 1px 2px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Classes for ng-sortable */
|
||||
&-sortable-grip {
|
||||
&:hover {
|
||||
cursor: move;
|
||||
}
|
||||
}
|
||||
|
||||
&-sortable-ghost {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
&-sortable-chosen {
|
||||
background-color: white;
|
||||
}
|
||||
}
|
||||
|
||||
.card-picture {
|
||||
|
||||
Reference in new issue
Block a user