Revert "Update select2 styles"

This reverts commit 9edef4051b.
This commit is contained in:
champsupertramp
2016-01-26 18:11:55 +08:00
parent 9edef4051b
commit a964f4ac2f
3 changed files with 606 additions and 479 deletions
+600 -462
View File
File diff suppressed because it is too large Load Diff
+5 -8
View File
@@ -145,6 +145,8 @@ class UM_Enqueue {
$this->load_modal(); $this->load_modal();
$this->load_css();
$this->load_fileupload(); $this->load_fileupload();
$this->load_datetimepicker(); $this->load_datetimepicker();
@@ -165,9 +167,6 @@ class UM_Enqueue {
$this->load_customjs(); $this->load_customjs();
$this->load_css();
} }
/*** /***
@@ -185,7 +184,9 @@ class UM_Enqueue {
***/ ***/
function load_css(){ function load_css(){
wp_register_style('um_styles', um_url . 'assets/css/um-styles.css' );
wp_enqueue_style('um_styles');
wp_register_style('um_members', um_url . 'assets/css/um-members.css' ); wp_register_style('um_members', um_url . 'assets/css/um-members.css' );
wp_enqueue_style('um_members'); wp_enqueue_style('um_members');
@@ -198,10 +199,6 @@ class UM_Enqueue {
wp_register_style('um_misc', um_url . 'assets/css/um-misc.css' ); wp_register_style('um_misc', um_url . 'assets/css/um-misc.css' );
wp_enqueue_style('um_misc'); wp_enqueue_style('um_misc');
wp_register_style('um_styles', um_url . 'assets/css/um-styles.css' );
wp_enqueue_style('um_styles');
} }
/*** /***
+1 -9
View File
@@ -63,21 +63,13 @@ gulp.task('scripts', function() {
.pipe(concat("um.min.js")) .pipe(concat("um.min.js"))
.pipe(gulp.dest('assets/js')); .pipe(gulp.dest('assets/js'));
// Copy Select2 ( full or not minified ) // Select2 not minified
// script
gulp.src([ gulp.src([
'./assets/vendor/select2/dist/js/select2.full.js', './assets/vendor/select2/dist/js/select2.full.js',
]) ])
.pipe(concat("um-select.js")) .pipe(concat("um-select.js"))
.pipe(gulp.dest('assets/js')); .pipe(gulp.dest('assets/js'));
// css
gulp.src([
'./assets/vendor/select2/dist/css/select2.css',
])
.pipe(concat("um-select.css"))
.pipe(gulp.dest('assets/css'));
// Merge and minify all CSS files
gulp.src([ gulp.src([
'./assets/vendor/select2/dist/css/select2.css', './assets/vendor/select2/dist/css/select2.css',
'./assets/css/um-misc.css', './assets/css/um-misc.css',