From ad135f8edfd006ca0decc5eaea53fa5ced0dcbc6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 6 Jan 2014 17:23:06 +0000 Subject: [PATCH] pixelegg changes from Monday --- pixelegg/css/pixelegg.css | 14 +++++++++++++- pixelegg/js/slider.js | 2 +- pixelegg/less/layout_raster.less | 17 ++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index b00c2b2ccf..7f708be156 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -5411,8 +5411,17 @@ img { position: relative; z-index: 1000; margin-right: 20px; - display: inline-flex; float: right; + display: flex; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + flex-direction: row; + justify-content: flex-start; + -webkit-flex-direction: row; + -webkit-justify-content: flex-start; + -ms-flex-direction: row; + -ms-justify-content: flex-start; /*postion: bottom*/ /* bottom: 3px; right: 5px; @@ -5420,6 +5429,9 @@ img { position: fixed; z-index: 1000;*/ } +#egw_fw_topmenu_info_items .topmenu_info_item { + overflow: visible; +} #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) { /*float: right;*/ margin-top: 0; diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index 642275f72e..48992aef0d 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -15,7 +15,7 @@ function show_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").animate({"margin-right": "20px","bottom": "0px","padding-right" : "0"},_delay); $j("#egw_fw_topmenu_info_items").css("position", "relative"); - $j("#egw_fw_topmenu_info_items").css("display", "inline-flex"); + $j("#egw_fw_topmenu_info_items").css("display", "flex"); $j("#egw_fw_topmenu_info_items").css("float", "right"); $j("#egw_fw_sidebar").animate({'top':'57px'},_delay); diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 4dd5430961..58fc1fd1f5 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -420,9 +420,22 @@ position: relative; z-index: 1000; margin-right: 20px; - display: inline-flex; + float: right; + display: flex; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + + flex-direction: row; + justify-content: flex-start; + + -webkit-flex-direction: row; + -webkit-justify-content: flex-start; + -ms-flex-direction: row; + -ms-justify-content: flex-start; + /*postion: bottom*/ /* bottom: 3px; @@ -432,6 +445,8 @@ z-index: 1000;*/ .topmenu_info_item { + + overflow: visible; // Info Bell &:nth-child(1) {