Author: ralfbecker
New Revision: 55973
URL: http://svn.stylite.de/viewvc/egroupware?rev=55973&view=rev
Log:
remove dependency on phpgwapi as far as css is concerned
Added:
trunk/egroupware/api/templates/default/def_tutorials.css
- copied unchanged from r55957, trunk/phpgwapi/templates/default/def_tutorials.css
trunk/egroupware/api/templates/default/def_tutorials.less
- copied unchanged from r55957, trunk/phpgwapi/templates/default/def_tutorials.less
trunk/egroupware/api/templates/default/default.css
- copied, changed from r55957, trunk/phpgwapi/templates/idots/css/traditional.css
trunk/egroupware/api/templates/default/print.css
- copied unchanged from r55957, trunk/phpgwapi/templates/idots/print.css
Removed:
trunk/phpgwapi/templates/default/def_buttons.less
trunk/phpgwapi/templates/default/def_content_elements.less
trunk/phpgwapi/templates/default/def_design_pattern_color_font_shadow.less
trunk/phpgwapi/templates/default/def_icons.less
trunk/phpgwapi/templates/default/def_messages.less
trunk/phpgwapi/templates/default/def_tutorials.css
trunk/phpgwapi/templates/default/def_tutorials.less
trunk/phpgwapi/templates/idots/css/traditional.css
trunk/phpgwapi/templates/idots/print.css
Modified:
trunk/egroupware/Gruntfile.js
trunk/egroupware/api/lang/ (props changed)
trunk/egroupware/api/src/Framework.php
trunk/egroupware/package.json
trunk/jdots/css/jdots.css
trunk/jdots/print.css
trunk/phpgwapi/templates/idots/css/idots.css
trunk/pixelegg/css/pixelegg.css
trunk/pixelegg/css/pixelegg.less
trunk/pixelegg/less/layout_tutorials.css
trunk/pixelegg/less/layout_tutorials.less
— trunk/egroupware/Gruntfile.js (original)
+++ trunk/egroupware/Gruntfile.js Mon May 2 14:31:24 2016
@@ -77,6 +77,7 @@
“api/js/jsapi/egw_tail.js”,
“api/js/jsapi/egw_inheritance.js”,
“api/js/jsapi/egw_message.js”,
-
"api\/js\/jsapi\/egw_notification.js",
"api\/js\/es6-promise.min.js",
"api\/js\/jsapi\/app_base.js",
"api\/js\/dhtmlxtree\/codebase\/dhtmlxcommon.js",
@@ -279,12 +280,12 @@
“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",
"api\/templates\/default\/etemplate2.css",
"pixelegg\/css\/pixelegg.css",
@@ -295,12 +296,12 @@
“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",
"api\/templates\/default\/etemplate2.css",
"pixelegg\/css\/mobile.css",
@@ -311,12 +312,12 @@
“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",
"api\/templates\/default\/etemplate2.css",
"pixelegg\/mobile\/fw_mobile.css",
@@ -331,16 +332,16 @@
“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",
-
"api\/templates\/default\/etemplate2.css",
-
"phpgwapi\/templates\/default\/def_tutorials.css",
-
"phpgwapi\/templates\/idots\/css\/traditional.css",
-
"api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css",
-
"api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css",
-
"api\/js\/etemplate\/lib\/jsdifflib\/diffview.css",
-
"api\/templates\/default\/etemplate2.css",
-
"api\/templates\/default\/def_tutorials.css",
-
"api\/templates\/default\/default.css",
"jdots\/egw_fw.css",
"jdots\/css\/jdots.css",
"jdots\/css\/high-contrast.css",
@@ -350,15 +351,15 @@
“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",
-
"api\/templates\/default\/etemplate2.css",
-
"phpgwapi\/templates\/default\/def_tutorials.css",
-
"phpgwapi\/templates\/idots\/css\/traditional.css",
-
"api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css",
-
"api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css",
-
"api\/js\/etemplate\/lib\/jsdifflib\/diffview.css",
-
"api\/templates\/default\/etemplate2.css",
-
"api\/templates\/default\/def_tutorials.css",
-
"api\/templates\/default\/default.css",
"jdots\/egw_fw.css",
"jdots\/css\/jdots.css",
@@ -368,16 +369,16 @@
“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",
-
"api\/templates\/default\/etemplate2.css",
-
"phpgwapi\/templates\/default\/def_tutorials.css",
-
"phpgwapi\/templates\/idots\/css\/traditional.css",
-
"api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css",
-
"api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css",
-
"api\/js\/etemplate\/lib\/jsdifflib\/diffview.css",
-
"api\/templates\/default\/etemplate2.css",
-
"api\/templates\/default\/def_tutorials.css",
-
"api\/templates\/default\/default.css",
"jdots\/egw_fw.css",
"jdots\/css\/jdots.css",
"jdots\/css\/orange-green.css",
@@ -385,7 +386,9 @@
},
hub: {
all: {
-
src: [
-
"*\/Gruntfile.js"
-
]
}
}
});
Propchange: trunk/egroupware/api/lang/
— svn:ignore (original)
+++ svn:ignore Mon May 2 14:31:24 2016
@@ -42,3 +42,5 @@
egw_vi.lang.old
egw_zh-tw.lang.old
egw_zh.lang.old
+.!29303!egw_tr.lang
+.!29302!egw_th.lang
— trunk/egroupware/api/src/Framework.php (original)
+++ trunk/egroupware/api/src/Framework.php Mon May 2 14:31:24 2016
@@ -855,7 +855,7 @@
$print_css = $this->template_dir.’/print.css’;
if(!file_exists(EGW_SERVER_ROOT.$print_css))
{
— trunk/phpgwapi/templates/idots/css/traditional.css (original)
+++ trunk/egroupware/api/templates/default/default.css Mon May 2 14:31:24 2016
@@ -3,7 +3,7 @@
allowed attributes: font-family,font-size,color,font-weight
*/
-/@import url("…/…/default/def_tutorials.css");/
+/@import url("/api/templates/default/def_tutorials.css");/
body
{
— trunk/egroupware/package.json (original)
+++ trunk/egroupware/package.json Mon May 2 14:31:24 2016
@@ -9,6 +9,7 @@
“grunt”: “^0.4.5”,
“grunt-contrib-cssmin”: “^1.0.1”,
“grunt-contrib-uglify”: “^0.11.1”,
- “grunt-hub”: “^0.7.0”,
- “grunt-newer”: “^1.2.0”
}
}
— trunk/jdots/css/jdots.css (original)
+++ trunk/jdots/css/jdots.css Mon May 2 14:31:24 2016
@@ -10,11 +10,11 @@
*/
/* These imports processed by framework /
-/@import url("…/…/phpgwapi/templates/idots/css/traditional.css");/
+/@import url("/api/templates/default/default.css");/
/@import url("…/egw_fw.css");*/
/**
-
- theme changes from idots-traditional follow
-
- theme changes from api/default.css (former idots-traditional) follow
*/
body {
@@ -63,7 +63,7 @@
background-color:#dddddd;
}
-div.navButton {
+div.navButton {
background-color:#dddddd;
float:left;
padding: 2px;
@@ -71,7 +71,7 @@
border: solid #dddddd 1px;
}
-div.navButton:hover, div.navButtonHover {
+div.navButton:hover, div.navButtonHover {
background-color:#eeeeee;
float:left;
padding: 2px;
@@ -82,7 +82,7 @@
position: relative;
}
-div.navButton:active, div.navButtonActive {
+div.navButton:active, div.navButtonActive {
background-color:#dddddd;
float:left;
padding: 2px;
@@ -93,7 +93,7 @@
position: relative;
}
-div.navSeparator {
+div.navSeparator {
background-color:#dddddd;
float:left;
padding: 0px;
— trunk/jdots/print.css (original)
+++ trunk/jdots/print.css Mon May 2 14:31:24 2016
@@ -9,7 +9,7 @@
-/@import url("…/phpgwapi/templates/idots/print.css");/
+/@import url("…/api/templates/default/print.css");/
/**
— trunk/phpgwapi/templates/idots/css/idots.css (original)
+++ trunk/phpgwapi/templates/idots/css/idots.css Mon May 2 14:31:24 2016
@@ -1,4 +1,4 @@
-/@import url(“traditional.css”);/
+/@import url(“api/templates/default/default.css”);/
/**
— trunk/pixelegg/css/pixelegg.css (original)
+++ trunk/pixelegg/css/pixelegg.css Mon May 2 14:31:24 2016
@@ -11,10 +11,6 @@
/
/*
- addapted from orginal styles.php
-
/
-/*
-
- EGroupware general def_.less are moved to phpgwapi/templates/default/.less
-
- so they can be included from app specific files and are independent of Pixelegg template
/
/*
- All app_* files are now again in $app/templates/default/app.less&css and will be included independent
@@ -1021,7 +1017,6 @@
display: none !important;
}
}
-/@import “…/…/phpgwapi/templates/idots/css/traditional.css”;/
/**
- EGroupware: Stylite Pixelegg template
-
@@ -1470,6 +1465,26 @@
.ms-ctn .ms-trigger {
border-left: none;
}
+/**
-
- EGroupware: CSS with less preprocessor
-
-
-
- included in pixelegg.less since 17/03/2014
-
-
-
-
- Please do NOT change css-files directly, instead change less-files and compile them!
-
-
-
-
-
-
- /
+/
- font styling
- allowed attributes: font-family,font-size,color,font-weight
+*/
/**
- layout_*.less files are Pixelegg template specific
/
@@ -2444,6 +2459,7 @@
button[id=“add”]:active {
background-color: #1aa200 !important;
}
+/Button Ende #######################################################/
/*
- EGroupware: Stylite Pixelegg template
-
@@ -3371,6 +3387,10 @@
td.lettersearch {
background-image: none;
}
+/*.nextmatch_header table {
-
border: none !important;
-
width: 99% !important;
+}*/
/**
- EGroupware: CSS with less preprocessor
-
@@ -5127,6 +5147,21 @@
-
@package pixelegg
-
@version $Id$
/
+/ disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails
+//SVG Filter / not for Logo
+#egw_fw_sidebar img[src$=“svg”]{
+}
+
+#egw_fw_main img[src$=“svg”],
+#egw_fw_footer img[src$=“svg”]{
-
//.gradient_vertical (@egw_color_2_a, @egw_color_2_a);
-
.gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%));
-
+}*/
/**
- EGroupware: Stylite Pixelegg template
-
@@ -5767,7 +5802,7 @@
*
-
-
@author Hadi Nategh hn@stylite.de
-
@package phpgwapi
-
@version $Id$
*/
— trunk/pixelegg/css/pixelegg.less (original)
+++ trunk/pixelegg/css/pixelegg.less Mon May 2 14:31:24 2016
@@ -13,18 +13,6 @@
- addapted from orginal styles.php
/
/*
-
- EGroupware general def_.less are moved to phpgwapi/templates/default/.less
-
- so they can be included from app specific files and are independent of Pixelegg template
-
/
-//@import “…/…/phpgwapi/templates/idots/css/traditional.less”;
-//@import “…/…/phpgwapi/templates/default/def_buttons.less”;
-//@import “…/…/phpgwapi/templates/default/def_design_pattern_color_font_shadow.less”;
-// next two moved to pixelegg (layouts - not definitions)
-//@import “…/…/phpgwapi/templates/default/def_messages.less”;
-//@import “…/…/phpgwapi/templates/default/def_content_elements.less”;
-// next one disabled - not in use - (yet)
-//@import “…/…/phpgwapi/templates/default/def_icons.less”;
-/*
- All app_* files are now again in $app/templates/default/app.less&css and will be included independent
-
- If some settings are Pixelegg template specific, please create $app/templates/pixelegg.less&css
@@ -39,16 +27,9 @@
@import “…/less/etemplate2.less”;
// print ausgabe
@import “…/less/print.less”;
-/@import “…/…/phpgwapi/templates/idots/css/traditional.css”;/
@import “…/less/jquery-ui.less”;
@import “…/less/magicsuggest.less”;
@import “…/less/traditional.less”;
-// next one transferred to layout_chosen.less
-//@import “…/less/chosen.less”;
-// next one sounds et2 specific, in which case it should go to etemplate …
-// ==> now transferred to layout_table.less
-//@import “…/less/et2_table.less”;
-
/**
- layout_*.less files are Pixelegg template specific
— trunk/pixelegg/less/layout_tutorials.css (original)
+++ trunk/pixelegg/less/layout_tutorials.css Mon May 2 14:31:24 2016
@@ -7,7 +7,7 @@
*
-
-
@author Hadi Nategh hn@stylite.de
-
@package phpgwapi
-
@version $Id$
*/
— trunk/pixelegg/less/layout_tutorials.less (original)
+++ trunk/pixelegg/less/layout_tutorials.less Mon May 2 14:31:24 2016
@@ -7,12 +7,12 @@
*
-
-
@author Hadi Nategh hn@stylite.de
-
@package phpgwapi
-
@version $Id$
*/
@import (reference) “definitions.less”;
-@import (less) “…/…/phpgwapi/templates/default/def_tutorials.css”;
+@import (less) “…/…/api/templates/default/def_tutorials.css”;
span.egw_tutorial_title {
color: #FFFFFF;
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
