extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-29 01:09:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

todays changes from pixelegg

Browse Source
This commit is contained in:
Ralf Becker 2013-11-12 17:23:52 +00:00
parent ceb55d1c1d
commit 4431e57a61
7 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pixelegg/css/pixelegg.css
View File

@ -793,7 +793,7 @@ td.lettersearch {
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de> * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
* @package phpgwapi * @package phpgwapi
* @version $Id$ * @version $Id$
*/ */
@ -1534,7 +1534,7 @@ button#mail-compose_button[id*="send"]:focus,
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de> * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
* @package phpgwapi * @package phpgwapi
* @version $Id$ * @version $Id$
*/ */
@ -1837,7 +1837,7 @@ h6 {
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de> * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
* @package phpgwapi * @package phpgwapi
* @version $Id$ * @version $Id$
*/ */
@ -2493,6 +2493,7 @@ a.textSidebox {
* @package phpgwapi * @package phpgwapi
* @version $Id$ * @version $Id$
*/ */
@charset "UTF-8";
@font-face { @font-face {
font-family: 'entypo-icon-font'; font-family: 'entypo-icon-font';
src: url("../fonts/entypo-icon-font/entypo-icon-font.eot"); src: url("../fonts/entypo-icon-font/entypo-icon-font.eot");
@ -6388,7 +6389,7 @@ div.egwGridView_scrollarea {
left: 196px; left: 196px;
} }
#egw_fw_topmenu_slide .slidedown { #egw_fw_topmenu_slide .slidedown {
background-image: url("images/slidedown.png"); background-image: url("../images/slidedown.png");
background-position: center center; background-position: center center;
height: 15px; height: 15px;
width: 15px; width: 15px;
@ -6397,7 +6398,7 @@ div.egwGridView_scrollarea {
margin-top: 0px; margin-top: 0px;
} }
#egw_fw_topmenu_slide .slideup { #egw_fw_topmenu_slide .slideup {
background-image: url("images/slideup.png"); background-image: url("../images/slideup.png");
background-position: center center; background-position: center center;
height: 15px; height: 15px;
width: 15px; width: 15px;
@ -6415,7 +6416,7 @@ div.egwGridView_scrollarea {
* */ * */
} }
#egw_fw_topmenu_addons #egw_fw_logout { #egw_fw_topmenu_addons #egw_fw_logout {
background-image: url(../../phpgwapi/templates/pxe/images/logout.png); background-image: url(../images/logout.png);
background-size: 16px 16px; background-size: 16px 16px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -6442,7 +6443,7 @@ div.egwGridView_scrollarea {
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
} }
#egw_fw_topmenu_addons #egw_fw_print { #egw_fw_topmenu_addons #egw_fw_print {
background-image: url(../../phpgwapi/templates/pxe/images/print.png); background-image: url(../images/print.png);
background-size: 16px 16px; background-size: 16px 16px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -6762,6 +6763,10 @@ div.egwGridView_scrollarea {
margin-right: 5px; margin-right: 5px;
min-height: 50px; min-height: 50px;
} }
.egw_fw_ui_category_content img {
height: 16px;
width: 16px;
}
.egw_fw_ui_category_content:hover { .egw_fw_ui_category_content:hover {
background-color: #ffffff; background-color: #ffffff;
border-color: #808080; border-color: #808080;

BIN
pixelegg/images/slidedown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
pixelegg/images/slideup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

28
pixelegg/js/slider.js Normal file
View File

@ -0,0 +1,28 @@
egw_LAB.wait(function() {
$j(document).ready(function() {
$j('#slidetoggle').click(function(){
if ($j('#egw_fw_header').css('display') == 'none') {
$j("#egw_fw_header").slideToggle();
$j("#egw_fw_topmenu_addons").animate({'margin-right': '20px'},1000);
$j("#egw_fw_sidebar").animate({'top':'57px'},1000);
$j(this).removeClass("slidedown");
$j(this).addClass("slideup");
}
else {
$j("#egw_fw_header").slideToggle();
$j("#egw_fw_sidebar").animate({'top':'12px'},1000);
$j("#egw_fw_topmenu_info_items").show();
$j("#egw_fw_logout").show();
$j("#egw_fw_print").show();
$j("#egw_fw_topmenu_addons").animate({'margin-right': '250px'},1000);
$j(this).removeClass("slideup");
$j(this).addClass("slidedown");
}
});
});
});

13
pixelegg/less/layout_raster.less
View File

@ -251,7 +251,7 @@
left: 196px; left: 196px;
.slidedown{ .slidedown{
background-image: url("images/slidedown.png"); background-image: url("../images/slidedown.png");
background-position: center center; background-position: center center;
height: 15px; height: 15px;
width: 15px; width: 15px;
@ -262,7 +262,7 @@
//float:right; //float:right;
} }
.slideup{ .slideup{
background-image: url("images/slideup.png"); background-image: url("../images/slideup.png");
background-position: center center; background-position: center center;
height: 15px; height: 15px;
width: 15px; width: 15px;
@ -276,7 +276,7 @@
// Logout // Logout
#egw_fw_logout { #egw_fw_logout {
background-image: url(../../phpgwapi/templates/pxe/images/logout.png); background-image: url(../images/logout.png);
background-size: 16px 16px; background-size: 16px 16px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -303,7 +303,7 @@
// Print // Print
#egw_fw_print { #egw_fw_print {
background-image: url(../../phpgwapi/templates/pxe/images/print.png); background-image: url(../images/print.png);
background-size: 16px 16px; background-size: 16px 16px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -701,7 +701,7 @@
padding-top: 14px; padding-top: 14px;
margin-right: 5px; margin-right: 5px;
min-height: 50px; min-height: 50px;
img { height: 16px; width: 16px}
&:hover { &:hover {
.background-color-0-gray; .background-color-0-gray;
.border-color-50-gray; .border-color-50-gray;
@ -1232,5 +1232,4 @@ div.et2_container {
} }
} // Ende Dialog } // Ende Dialog

BIN
pixelegg/templates/pixelegg/head.tpl
View File

Binary file not shown.