diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 0cc1af6623..e6ce438e45 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -793,7 +793,7 @@ td.lettersearch { * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Stefan Reinhard + * @author Stefan Reinhardt * @package phpgwapi * @version $Id$ */ @@ -1534,7 +1534,7 @@ button#mail-compose_button[id*="send"]:focus, * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Stefan Reinhard + * @author Stefan Reinhardt * @package phpgwapi * @version $Id$ */ @@ -1837,7 +1837,7 @@ h6 { * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Stefan Reinhard + * @author Stefan Reinhardt * @package phpgwapi * @version $Id$ */ @@ -2493,6 +2493,7 @@ 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"); @@ -6388,7 +6389,7 @@ div.egwGridView_scrollarea { left: 196px; } #egw_fw_topmenu_slide .slidedown { - background-image: url("images/slidedown.png"); + background-image: url("../images/slidedown.png"); background-position: center center; height: 15px; width: 15px; @@ -6397,7 +6398,7 @@ div.egwGridView_scrollarea { margin-top: 0px; } #egw_fw_topmenu_slide .slideup { - background-image: url("images/slideup.png"); + background-image: url("../images/slideup.png"); background-position: center center; height: 15px; width: 15px; @@ -6415,7 +6416,7 @@ div.egwGridView_scrollarea { * */ } #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-position: center center; background-repeat: no-repeat; @@ -6442,7 +6443,7 @@ div.egwGridView_scrollarea { box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); } #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-position: center center; background-repeat: no-repeat; @@ -6762,6 +6763,10 @@ div.egwGridView_scrollarea { margin-right: 5px; min-height: 50px; } +.egw_fw_ui_category_content img { + height: 16px; + width: 16px; +} .egw_fw_ui_category_content:hover { background-color: #ffffff; border-color: #808080; @@ -7324,7 +7329,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/images/slidedown.png b/pixelegg/images/slidedown.png new file mode 100644 index 0000000000..d2dda2c380 Binary files /dev/null and b/pixelegg/images/slidedown.png differ diff --git a/pixelegg/images/slideup.png b/pixelegg/images/slideup.png new file mode 100644 index 0000000000..864665e7f8 Binary files /dev/null and b/pixelegg/images/slideup.png differ diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js new file mode 100644 index 0000000000..78abb3b2ab --- /dev/null +++ b/pixelegg/js/slider.js @@ -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"); + + } + }); + + }); + +}); \ No newline at end of file diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index db42da51c2..575c98eed3 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -251,7 +251,7 @@ left: 196px; .slidedown{ - background-image: url("images/slidedown.png"); + background-image: url("../images/slidedown.png"); background-position: center center; height: 15px; width: 15px; @@ -262,7 +262,7 @@ //float:right; } .slideup{ - background-image: url("images/slideup.png"); + background-image: url("../images/slideup.png"); background-position: center center; height: 15px; width: 15px; @@ -276,7 +276,7 @@ // Logout #egw_fw_logout { - background-image: url(../../phpgwapi/templates/pxe/images/logout.png); + background-image: url(../images/logout.png); background-size: 16px 16px; background-position: center center; background-repeat: no-repeat; @@ -303,7 +303,7 @@ // Print #egw_fw_print { - background-image: url(../../phpgwapi/templates/pxe/images/print.png); + background-image: url(../images/print.png); background-size: 16px 16px; background-position: center center; background-repeat: no-repeat; @@ -701,7 +701,7 @@ padding-top: 14px; margin-right: 5px; min-height: 50px; - + img { height: 16px; width: 16px} &:hover { .background-color-0-gray; .border-color-50-gray; @@ -1232,5 +1232,4 @@ div.et2_container { } -} // Ende Dialog - +} // Ende Dialog \ No newline at end of file diff --git a/pixelegg/less/print.less b/pixelegg/less/print.less index 10e2ef6218..2de125eb49 100644 --- a/pixelegg/less/print.less +++ b/pixelegg/less/print.less @@ -2,4 +2,4 @@ Printing */ @media screen { .onlyPrint { display: none; } } -@media print { .noPrint { display: none; } } \ No newline at end of file +@media print { .noPrint { display: none; } } diff --git a/pixelegg/templates/pixelegg/head.tpl b/pixelegg/templates/pixelegg/head.tpl index cb8158441c..50b9223d2b 100644 Binary files a/pixelegg/templates/pixelegg/head.tpl and b/pixelegg/templates/pixelegg/head.tpl differ