diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 8c1b1e8824..0cc1af6623 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -2493,7 +2493,6 @@ a.textSidebox { * @package phpgwapi * @version $Id$ */ -@charset "UTF-8"; @font-face { font-family: 'entypo-icon-font'; src: url("../fonts/entypo-icon-font/entypo-icon-font.eot"); @@ -7325,7 +7324,7 @@ div.et2_container div table.et2_grid tbody tr.footer-toolbar select.et2_selectbo * * Version 08.2013 * Author Stefan Reinhardt - * + * */ /* ################################################# * FOOTER diff --git a/pixelegg/fonts/entypo-icon-font/entypo-icon-font.eot b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.eot new file mode 100644 index 0000000000..669a30dad7 Binary files /dev/null and b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.eot differ diff --git a/pixelegg/fonts/entypo-icon-font/entypo-icon-font.svg b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.svg new file mode 100644 index 0000000000..26c5a264d3 --- /dev/null +++ b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.svg @@ -0,0 +1,832 @@ + + + + +Created by FontForge 20100429 at Wed Jan 23 12:28:39 2013 + By root +Copyright (C) 2012 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixelegg/fonts/entypo-icon-font/entypo-icon-font.ttf b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.ttf new file mode 100644 index 0000000000..fefb912822 Binary files /dev/null and b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.ttf differ diff --git a/pixelegg/fonts/entypo-icon-font/entypo-icon-font.woff b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.woff new file mode 100644 index 0000000000..49b2189aae Binary files /dev/null and b/pixelegg/fonts/entypo-icon-font/entypo-icon-font.woff differ diff --git a/pixelegg/setup/setup.inc.php b/pixelegg/setup/setup.inc.php index aa98ffb876..eb1646032f 100755 --- a/pixelegg/setup/setup.inc.php +++ b/pixelegg/setup/setup.inc.php @@ -2,10 +2,6 @@ /** * EGroupware: Stylite Pixelegg template * - * et2 Messages - * - * Please do NOT change css-files directly, instead change less-files and compile them! - * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhard @@ -29,5 +25,12 @@ $GLOBALS['egw_info']['template']['pixelegg']['icon'] = "pixelegg/images/logo.png $GLOBALS['egw_info']['template']['pixelegg']['maintainer'] = array( array('name' => 'Stylite AG', 'url' => 'http://www.stylite.de/') ); -$GLOBALS['egw_info']['template']['pixelegg']['description'] = "Stylite is a new jQuery based template set for EGroupware EPL."; +$GLOBALS['egw_info']['template']['pixelegg']['description'] = "Pixelegg EGroupware template based on Stylite template using jQuery."; $GLOBALS['egw_info']['template']['pixelegg']['windowed'] = true; + +/* Dependencies for this template to work */ +$GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array( + 'appname' => 'jdots', + 'versions' => Array('1.0') +); +