From 476b7f902280ffc65ae77e7be9674b811a4fede5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 16 Oct 2015 12:16:08 +0000 Subject: [PATCH] fix include of tutorial css --- pixelegg/css/mobile.css | 112 ++++++++++++++++++++++++++-- pixelegg/css/pixelegg.css | 110 +++++++++++++++++++++++++-- pixelegg/less/layout_tutorials.css | 101 ++++++++++++++++++++++++- pixelegg/less/layout_tutorials.less | 2 +- 4 files changed, 312 insertions(+), 13 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 0c2d8f4989..b87c77ed9f 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -47,7 +47,6 @@ * Stefan Reinhardt */ /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/ -@import "../../phpgwapi/templates/default/def_tutorials.css"; @media all { /** * Top level @@ -2197,6 +2196,7 @@ body { * @package pixelegg * @version $Id$ */ +@import-once "def_colors.less"; #socialMedia { position: relative; bottom: 20px; @@ -4274,7 +4274,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -4298,7 +4298,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.1px; + font-size: 12.100000000000001px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4694,7 +4694,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4866,7 +4866,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; @@ -6368,6 +6368,106 @@ a.textSidebox { * @package phpgwapi * @version $Id$ */ +/** + * EGroupware: CSS with less preprocessor + * + * Definitions for tutorials + * + * 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 Hadi NAtegh + * @package phpgwapi + * @version $Id$ + */ +span.egw_tutorial_title { + color: black; + font-weight: bold; + text-align: left; + width: 95%; + background-color: #D6DEF0; + border: 1px solid #B3B3B3; + padding-top: 4px; + padding-left: 5px; + padding-bottom: 5px; + border-radius: 2px; + text-overflow: ellipsis; + white-space: nowrap; + overflow-x: hidden; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn { + background-color: #FF0000; + opacity: 0.68; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn > div { + border-left-color: white; +} +.egw_tutorial_thumb { + background-repeat: no-repeat; + background-position: -2px; + border-radius: 5px; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +#home-tutorial_play.egw_tutorial_playBtn { + display: block; + margin: 10%; + border: 2px solid rgba(0, 0, 0, 0.7); + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100%; + width: 40px; + height: 40px; + cursor: pointer; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +#home-tutorial_play.egw_tutorial_playBtn > div { + display: block; + position: relative; + top: 10px; + left: 45%; + width: 0; + height: 0; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid rgba(0, 0, 0, 0.8); +} +[id^="egw_tutorial_"][id$="sidebox_list"] { + overflow-x: hidden; + overflow-y: auto; +} +#home-tutorial_list { + float: left; +} +#home-tutorial_list .egw_tutorial_thumb { + display: block; +} +#home-tutorial_list .th .et2_label { + font-size: 12px; + padding-left: 7px; +} +#home-tutorial_list .th #home-tutorial_apps { + margin-left: 5px; +} +#home-tutorial_list tbody td:first-child { + padding-top: 4px; +} +#home-tutorial_src { + border-left: 6px solid #E0E0E0; +} +.tutorial_popup { + background-color: white; + padding-top: 5px; + overflow-y: hidden; +} +.tutorial_videoList { + overflow-x: hidden; + overflow-y: auto; + height: 100%; + display: inline-block !important; +} span.egw_tutorial_title { color: #FFFFFF; font-weight: bold; @@ -6954,7 +7054,7 @@ span.egw_tutorial_title { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 6ccc1db21f..cf509b3b78 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -36,7 +36,6 @@ * Stefan Reinhardt */ /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/ -@import "../../phpgwapi/templates/default/def_tutorials.css"; @media all { /** * Top level @@ -2186,6 +2185,7 @@ body { * @package pixelegg * @version $Id$ */ +@import-once "def_colors.less"; #socialMedia { position: relative; bottom: 20px; @@ -4263,7 +4263,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -4287,7 +4287,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.1px; + font-size: 12.100000000000001px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4683,7 +4683,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4855,7 +4855,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; @@ -6357,6 +6357,106 @@ a.textSidebox { * @package phpgwapi * @version $Id$ */ +/** + * EGroupware: CSS with less preprocessor + * + * Definitions for tutorials + * + * 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 Hadi NAtegh + * @package phpgwapi + * @version $Id$ + */ +span.egw_tutorial_title { + color: black; + font-weight: bold; + text-align: left; + width: 95%; + background-color: #D6DEF0; + border: 1px solid #B3B3B3; + padding-top: 4px; + padding-left: 5px; + padding-bottom: 5px; + border-radius: 2px; + text-overflow: ellipsis; + white-space: nowrap; + overflow-x: hidden; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn { + background-color: #FF0000; + opacity: 0.68; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn > div { + border-left-color: white; +} +.egw_tutorial_thumb { + background-repeat: no-repeat; + background-position: -2px; + border-radius: 5px; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +#home-tutorial_play.egw_tutorial_playBtn { + display: block; + margin: 10%; + border: 2px solid rgba(0, 0, 0, 0.7); + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100%; + width: 40px; + height: 40px; + cursor: pointer; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +#home-tutorial_play.egw_tutorial_playBtn > div { + display: block; + position: relative; + top: 10px; + left: 45%; + width: 0; + height: 0; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid rgba(0, 0, 0, 0.8); +} +[id^="egw_tutorial_"][id$="sidebox_list"] { + overflow-x: hidden; + overflow-y: auto; +} +#home-tutorial_list { + float: left; +} +#home-tutorial_list .egw_tutorial_thumb { + display: block; +} +#home-tutorial_list .th .et2_label { + font-size: 12px; + padding-left: 7px; +} +#home-tutorial_list .th #home-tutorial_apps { + margin-left: 5px; +} +#home-tutorial_list tbody td:first-child { + padding-top: 4px; +} +#home-tutorial_src { + border-left: 6px solid #E0E0E0; +} +.tutorial_popup { + background-color: white; + padding-top: 5px; + overflow-y: hidden; +} +.tutorial_videoList { + overflow-x: hidden; + overflow-y: auto; + height: 100%; + display: inline-block !important; +} span.egw_tutorial_title { color: #FFFFFF; font-weight: bold; diff --git a/pixelegg/less/layout_tutorials.css b/pixelegg/less/layout_tutorials.css index 9539e03c6d..df3727c49c 100644 --- a/pixelegg/less/layout_tutorials.css +++ b/pixelegg/less/layout_tutorials.css @@ -11,7 +11,106 @@ * @package phpgwapi * @version $Id$ */ -@import "../../phpgwapi/templates/default/def_tutorials.css"; +/** + * EGroupware: CSS with less preprocessor + * + * Definitions for tutorials + * + * 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 Hadi NAtegh + * @package phpgwapi + * @version $Id$ + */ +span.egw_tutorial_title { + color: black; + font-weight: bold; + text-align: left; + width: 95%; + background-color: #D6DEF0; + border: 1px solid #B3B3B3; + padding-top: 4px; + padding-left: 5px; + padding-bottom: 5px; + border-radius: 2px; + text-overflow: ellipsis; + white-space: nowrap; + overflow-x: hidden; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn { + background-color: #FF0000; + opacity: 0.68; +} +.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn > div { + border-left-color: white; +} +.egw_tutorial_thumb { + background-repeat: no-repeat; + background-position: -2px; + border-radius: 5px; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn, +#home-tutorial_play.egw_tutorial_playBtn { + display: block; + margin: 10%; + border: 2px solid rgba(0, 0, 0, 0.7); + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100%; + width: 40px; + height: 40px; + cursor: pointer; +} +[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn > div, +#home-tutorial_play.egw_tutorial_playBtn > div { + display: block; + position: relative; + top: 10px; + left: 45%; + width: 0; + height: 0; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid rgba(0, 0, 0, 0.8); +} +[id^="egw_tutorial_"][id$="sidebox_list"] { + overflow-x: hidden; + overflow-y: auto; +} +#home-tutorial_list { + float: left; +} +#home-tutorial_list .egw_tutorial_thumb { + display: block; +} +#home-tutorial_list .th .et2_label { + font-size: 12px; + padding-left: 7px; +} +#home-tutorial_list .th #home-tutorial_apps { + margin-left: 5px; +} +#home-tutorial_list tbody td:first-child { + padding-top: 4px; +} +#home-tutorial_src { + border-left: 6px solid #E0E0E0; +} +.tutorial_popup { + background-color: white; + padding-top: 5px; + overflow-y: hidden; +} +.tutorial_videoList { + overflow-x: hidden; + overflow-y: auto; + height: 100%; + display: inline-block !important; +} span.egw_tutorial_title { color: #FFFFFF; font-weight: bold; diff --git a/pixelegg/less/layout_tutorials.less b/pixelegg/less/layout_tutorials.less index fcfab31a10..6f5ea2d0e7 100644 --- a/pixelegg/less/layout_tutorials.less +++ b/pixelegg/less/layout_tutorials.less @@ -12,7 +12,7 @@ * @version $Id$ */ @import (reference) "definitions.less"; -@import "../../phpgwapi/templates/default/def_tutorials.css"; +@import (less) "../../phpgwapi/templates/default/def_tutorials.css"; span.egw_tutorial_title { color: #FFFFFF;