From 3e9bc27171d92f8dc27573de19d75fda967427e7 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 25 Jul 2018 16:27:28 +0200 Subject: [PATCH] * Api: Fix minified themes cause multiple theme false entries --- Gruntfile.js | 36 ++---------------------------------- pixelegg/css/traditional.css | 4 ++-- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a4e0bb1345..5d8e815573 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -328,7 +328,7 @@ module.exports = function (grunt) { "api/templates/default/print.css", "pixelegg/print.css" ], - "pixelegg/css/Standard.min.css": [ + "pixelegg/css/traditional.min.css": [ "api/js/jquery/chosen/chosen.css", "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "vendor/egroupware/magicsuggest/magicsuggest.css", @@ -340,39 +340,7 @@ module.exports = function (grunt) { "api/js/etemplate/lib/jsdifflib/diffview.css", "vendor/bower-asset/cropper/dist/cropper.min.css", "api/templates/default/etemplate2.css", - "pixelegg/css/pixelegg.css", - "api/templates/default/print.css", - "pixelegg/print.css" - ], - "pixelegg/css/Compact.min.css": [ - "api/js/jquery/chosen/chosen.css", - "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", - "vendor/egroupware/magicsuggest/magicsuggest.css", - "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", - "api/js/jquery/jquery-ui-timepicker-addon.css", - "api/js/jquery/blueimp/css/blueimp-gallery.min.css", - "api/js/dhtmlxtree/codebase/dhtmlxtree.css", - "api/js/egw_action/test/skins/dhtmlxmenu_egw.css", - "api/js/etemplate/lib/jsdifflib/diffview.css", - "vendor/bower-asset/cropper/dist/cropper.min.css", - "api/templates/default/etemplate2.css", - "pixelegg/css/pixelegg.css", - "api/templates/default/print.css", - "pixelegg/print.css" - ], - "pixelegg/css/Traditional.min.css": [ - "api/js/jquery/chosen/chosen.css", - "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", - "vendor/egroupware/magicsuggest/magicsuggest.css", - "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", - "api/js/jquery/jquery-ui-timepicker-addon.css", - "api/js/jquery/blueimp/css/blueimp-gallery.min.css", - "api/js/dhtmlxtree/codebase/dhtmlxtree.css", - "api/js/egw_action/test/skins/dhtmlxmenu_egw.css", - "api/js/etemplate/lib/jsdifflib/diffview.css", - "vendor/bower-asset/cropper/dist/cropper.min.css", - "api/templates/default/etemplate2.css", - "pixelegg/css/pixelegg.css", + "pixelegg/css/traditional.css", "api/templates/default/print.css", "pixelegg/print.css" ] diff --git a/pixelegg/css/traditional.css b/pixelegg/css/traditional.css index e46324a335..eba20d3481 100644 --- a/pixelegg/css/traditional.css +++ b/pixelegg/css/traditional.css @@ -35,7 +35,7 @@ * @version: 1 * Stefan Reinhardt */ -@import "../../etemplate/templates/default/etemplate2.css"; +@import "../../api/templates/default/etemplate2.css"; @media all { /** * Top level @@ -5140,7 +5140,7 @@ td.message span.message { border-width: 0px 1px 1px 1px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_bottom { - + } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_icon { display: inline-block;