holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Organize themes and remove old themes:

Browse Source 
- Move color code defs into less definitions
- Remove Traditional theme
- Make Modern theme standard
- Make pixelegg default theme as Monochrome
This commit is contained in:
Hadi Nategh 2019-03-05 11:17:01 +01:00
parent c3bdaa9bbe
commit 7b5b8f4a56
10 changed files with 13 additions and 7012 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Gruntfile.js
View File

@ -353,23 +353,6 @@ module.exports = function (grunt) {
"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/traditional.css",
"api/templates/default/print.css",
"pixelegg/print.css",
"api/templates/default/css/flags.css"
],
"pixelegg/css/modern.min.css": [
"api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",

10
calendar/templates/mobile/app.css
View File

@ -260,8 +260,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
/* marks a day in the colum-header as today
*/
.calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
background: #ffffcc;
color: #0C5DA5;
}
.calendar_calWeek {
background: #ffffcc;
@ -470,14 +472,18 @@ Hide subsequent headers in week view with non-consolidated owners
border-bottom: 1px solid silver;
white-space: nowrap;
overflow: hidden;
background-color: white;
color: white;
background: #2D6393;
}
.hideDayColHeader .calendar_calDayColHeader > div[data-date] {
position: fixed;
background: white;
width: inherit;
z-index: 100;
}
.blue_title {
color: white;
background: #2D6393;
}
/* Seperate long and short day names */
.calendar_calDayColHeader > div[data-date] .short_date,
.calendar_calDayColHeader > div[data-date] .long_date {

2
calendar/templates/mobile/app.less
View File

@ -11,7 +11,7 @@
* @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
*/
@import (reference) "../../../pixelegg/less/definitions.less";
@import (reference) "../../../pixelegg/mobile/app_colors.less";
@import (reference) "../../../pixelegg/less/app_colors.less";
@import (less) "../pixelegg/app.less";
/* tablets and smartphones */
@media all {

2
pixelegg/css/modern.less
View File

@ -10,7 +10,7 @@
* @version $Id$
*/
@import "pixelegg.less";
@import "../mobile/app_colors.less";
@import "../less/app_colors.less";
// Addressbook
#egw_fw_sidemenu.egw_fw_sidebar_toggleOn #addressbook_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {

6808
pixelegg/css/traditional.css
View File

File diff suppressed because it is too large Load Diff

4
pixelegg/inc/class.pixelegg_framework.inc.php
View File

@ -177,10 +177,6 @@ div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,
.ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider span.ui-slider-handle,
.ui-widget-header {background-color: $sidebox_color;}
";
if ($GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'traditional')
{
$ret['app_css'] .= ".dialogFooterToolbar {background-color: $color !important;}";
}
}
else
/* Mobile theme custom colors*/

0
pixelegg/mobile/app_colors.less → pixelegg/less/app_colors.less
View File

177
pixelegg/mobile/app_colors.css
View File

@ -1,177 +0,0 @@
/**
*
* Mobile FW - Applications colors
*
* Please do NOT change *.css directly, instead change *.less and compile it!
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Hadi Nategh <hn@stylite.de>
* @package Mobile Framework
* @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
*/
div[id^="addressbook-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="addressbook-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="addressbook-"] .plus_button,
form[id^="addressbook-"] .plus_button,
div[id^="addressbook-"] .search.nm-mob-header,
form[id^="addressbook-"] .search.nm-mob-header,
div[id^="addressbook-"] .dialogHeadbar,
form[id^="addressbook-"] .dialogHeadbar {
background-color: #333399;
}
#addressbook_sidebox_header {
border-left: 6px solid #333399 !important;
}
div[id^="admin-"] .plus_button,
form[id^="admin-"] .plus_button,
div[id^="admin-"] .search.nm-mob-header,
form[id^="admin-"] .search.nm-mob-header,
div[id^="admin-"] .dialogHeadbar,
form[id^="admin-"] .dialogHeadbar {
background-color: #0073ce;
}
#admin_sidebox_header {
border-left: 6px solid #0073ce !important;
}
div[id^="bookmarks-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="bookmarks-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="bookmarks-"] .plus_button,
form[id^="bookmarks-"] .plus_button,
div[id^="bookmarks-"] .search.nm-mob-header,
form[id^="bookmarks-"] .search.nm-mob-header,
div[id^="bookmarks-"] .dialogHeadbar,
form[id^="bookmarks-"] .dialogHeadbar {
background-color: #db0087;
}
#bookmarks_sidebox_header {
border-left: 6px solid #db0087 !important;
}
div[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="calendar-"] .plus_button,
form[id^="calendar-"] .plus_button,
div[id^="calendar-"] .search.nm-mob-header,
form[id^="calendar-"] .search.nm-mob-header,
div[id^="calendar-"] .dialogHeadbar,
form[id^="calendar-"] .dialogHeadbar {
background-color: #CC0033;
}
#calendar_sidebox_header {
border-left: 6px solid #CC0033 !important;
}
div[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="filemanager-"] .plus_button,
form[id^="filemanager-"] .plus_button,
div[id^="filemanager-"] .search.nm-mob-header,
form[id^="filemanager-"] .search.nm-mob-header,
div[id^="filemanager-"] .dialogHeadbar,
form[id^="filemanager-"] .dialogHeadbar {
background-color: #CC6633;
}
#filemanager_sidebox_header {
border-left: 6px solid #CC6633 !important;
}
div[id^="infolog-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="infolog-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="infolog-"] .plus_button,
form[id^="infolog-"] .plus_button,
div[id^="infolog-"] .search.nm-mob-header,
form[id^="infolog-"] .search.nm-mob-header,
div[id^="infolog-"] .dialogHeadbar,
form[id^="infolog-"] .dialogHeadbar {
background-color: #FFB936;
}
#infolog_sidebox_header {
border-left: 6px solid #FFB936 !important;
}
div[id^="mail-"] .plus_button,
form[id^="mail-"] .plus_button,
div[id^="mail-"] .search.nm-mob-header,
form[id^="mail-"] .search.nm-mob-header,
div[id^="mail-"] .dialogHeadbar,
form[id^="mail-"] .dialogHeadbar {
background-color: #47b2d4;
}
#mail_sidebox_header {
border-left: 6px solid #47b2d4 !important;
}
div[id^="projectmanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="projectmanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="projectmanager-"] .plus_button,
form[id^="projectmanager-"] .plus_button,
div[id^="projectmanager-"] .search.nm-mob-header,
form[id^="projectmanager-"] .search.nm-mob-header,
div[id^="projectmanager-"] .dialogHeadbar,
form[id^="projectmanager-"] .dialogHeadbar {
background-color: #75de27;
}
#projectmanager_sidebox_header {
border-left: 6px solid #75de27 !important;
}
div[id^="resources-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="resources-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="resources-"] .plus_button,
form[id^="resources-"] .plus_button,
div[id^="resources-"] .search.nm-mob-header,
form[id^="resources-"] .search.nm-mob-header,
div[id^="resources-"] .dialogHeadbar,
form[id^="resources-"] .dialogHeadbar {
background-color: #009966;
}
#resources_sidebox_header {
border-left: 6px solid #009966 !important;
}
div[id^="timesheet-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="timesheet-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="timesheet-"] .plus_button,
form[id^="timesheet-"] .plus_button,
div[id^="timesheet-"] .search.nm-mob-header,
form[id^="timesheet-"] .search.nm-mob-header,
div[id^="timesheet-"] .dialogHeadbar,
form[id^="timesheet-"] .dialogHeadbar {
background-color: #9d15ea;
}
#timesheet_sidebox_header {
border-left: 6px solid #9d15ea !important;
}
div[id^="tracker-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="tracker-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="tracker-"] .plus_button,
form[id^="tracker-"] .plus_button,
div[id^="tracker-"] .search.nm-mob-header,
form[id^="tracker-"] .search.nm-mob-header,
div[id^="tracker-"] .dialogHeadbar,
form[id^="tracker-"] .dialogHeadbar {
background-color: #006666;
}
#tracker_sidebox_header {
border-left: 6px solid #006666 !important;
}
div[id^="wiki-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="wiki-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="wiki-"] .plus_button,
form[id^="wiki-"] .plus_button,
div[id^="wiki-"] .search.nm-mob-header,
form[id^="wiki-"] .search.nm-mob-header,
div[id^="wiki-"] .dialogHeadbar,
form[id^="wiki-"] .dialogHeadbar {
background-color: #797979;
}
#wiki_sidebox_header {
border-left: 6px solid #797979 !important;
}
div[id^="ranking-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
form[id^="ranking-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
div[id^="ranking-"] .plus_button,
form[id^="ranking-"] .plus_button,
div[id^="ranking-"] .search.nm-mob-header,
form[id^="ranking-"] .search.nm-mob-header,
div[id^="ranking-"] .dialogHeadbar,
form[id^="ranking-"] .dialogHeadbar {
background-color: #404040;
}
#ranking_sidebox_header {
border-left: 6px solid #404040 !important;
}

2
pixelegg/mobile/fw_mobile.less
View File

@ -12,7 +12,7 @@
@import "../css/mobile.less";
@import (reference) "../less/def_mobile.less";
@import "app_colors.less";
@import "../less/app_colors.less";
/********************************/
/* */
/* MEDIA DEFINITION */

3
pixelegg/setup/setup.inc.php
View File

@ -26,7 +26,8 @@ $GLOBALS['egw_info']['template']['pixelegg']['windowed'] = true;
// specify (different) labels for default themes
$GLOBALS['egw_info']['template']['pixelegg']['themes'] = array(
'pixelegg' => 'Standard',
'modern' => 'Standard',
'pixelegg' => 'Monochrome',
'mobile' => 'Compact',
);