diff --git a/Gruntfile.js b/Gruntfile.js index 78c9b9544a..1b05c19946 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -77,6 +77,7 @@ module.exports = function (grunt) { "api\/js\/jsapi\/egw_tail.js", "api\/js\/jsapi\/egw_inheritance.js", "api\/js\/jsapi\/egw_message.js", + "api\/js\/jsapi\/egw_notification.js", "api\/js\/es6-promise.min.js", "api\/js\/jsapi\/app_base.js", "api\/js\/dhtmlxtree\/codebase\/dhtmlxcommon.js", @@ -279,12 +280,12 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", "pixelegg\/css\/pixelegg.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css", "pixelegg\/print.css" ], @@ -295,12 +296,12 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", "pixelegg\/css\/mobile.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css", "pixelegg\/print.css" ], @@ -311,12 +312,12 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", "pixelegg\/mobile\/fw_mobile.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css", "pixelegg\/print.css" ] @@ -331,16 +332,16 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", - "phpgwapi\/templates\/default\/def_tutorials.css", - "phpgwapi\/templates\/idots\/css\/traditional.css", + "api\/templates\/default\/def_tutorials.css", + "api\/templates\/default\/default.css", "jdots\/egw_fw.css", "jdots\/css\/jdots.css", "jdots\/css\/high-contrast.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css" ], "jdots\/css\/jdots.min.css": [ @@ -350,15 +351,15 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", - "phpgwapi\/templates\/default\/def_tutorials.css", - "phpgwapi\/templates\/idots\/css\/traditional.css", + "api\/templates\/default\/def_tutorials.css", + "api\/templates\/default\/default.css", "jdots\/egw_fw.css", "jdots\/css\/jdots.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css" ], "jdots\/css\/orange-green.min.css": [ @@ -368,16 +369,16 @@ module.exports = function (grunt) { "api\/js\/jquery\/jpicker\/css\/jPicker-1.1.6.min.css", "api\/js\/jquery\/jquery-ui-timepicker-addon.css", "api\/js\/jquery\/blueimp\/css\/blueimp-gallery.min.css", - "api\/js\/dhtmlxtree\/codebase\/dhtmlXTree.css", + "api\/js\/dhtmlxtree\/codebase\/dhtmlxtree.css", "api\/js\/egw_action\/test\/skins\/dhtmlxmenu_egw.css", "api\/js\/etemplate\/lib\/jsdifflib\/diffview.css", "api\/templates\/default\/etemplate2.css", - "phpgwapi\/templates\/default\/def_tutorials.css", - "phpgwapi\/templates\/idots\/css\/traditional.css", + "api\/templates\/default\/def_tutorials.css", + "api\/templates\/default\/default.css", "jdots\/egw_fw.css", "jdots\/css\/jdots.css", "jdots\/css\/orange-green.css", - "phpgwapi\/templates\/idots\/print.css", + "api\/templates\/default\/print.css", "jdots\/print.css" ] } @@ -385,7 +386,9 @@ module.exports = function (grunt) { }, hub: { all: { - src: ['*/Gruntfile.js'] + src: [ + "*\/Gruntfile.js" + ] } } }); diff --git a/api/src/Framework.php b/api/src/Framework.php index 4ac2f2eb5f..a46461d774 100644 --- a/api/src/Framework.php +++ b/api/src/Framework.php @@ -855,7 +855,7 @@ abstract class Framework extends Framework\Extra $print_css = $this->template_dir.'/print.css'; if(!file_exists(EGW_SERVER_ROOT.$print_css)) { - $print_css = '/phpgwapi/templates/idots/print.css'; + $print_css = '/api/templates/default/print.css'; } self::includeCSS($print_css); } diff --git a/phpgwapi/templates/default/def_tutorials.css b/api/templates/default/def_tutorials.css similarity index 100% rename from phpgwapi/templates/default/def_tutorials.css rename to api/templates/default/def_tutorials.css diff --git a/phpgwapi/templates/default/def_tutorials.less b/api/templates/default/def_tutorials.less similarity index 100% rename from phpgwapi/templates/default/def_tutorials.less rename to api/templates/default/def_tutorials.less diff --git a/phpgwapi/templates/idots/css/traditional.css b/api/templates/default/default.css similarity index 99% rename from phpgwapi/templates/idots/css/traditional.css rename to api/templates/default/default.css index 1ab0e53615..585c980bb4 100755 --- a/phpgwapi/templates/idots/css/traditional.css +++ b/api/templates/default/default.css @@ -3,7 +3,7 @@ allowed attributes: font-family,font-size,color,font-weight */ -/*@import url("../../default/def_tutorials.css");*/ +/*@import url("/api/templates/default/def_tutorials.css");*/ body { diff --git a/phpgwapi/templates/idots/print.css b/api/templates/default/print.css similarity index 100% rename from phpgwapi/templates/idots/print.css rename to api/templates/default/print.css diff --git a/package.json b/package.json index 3863c18321..6810c21f28 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "grunt": "^0.4.5", "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-uglify": "^0.11.1", - "grunt-newer": "^1.1.2" + "grunt-hub": "^0.7.0", + "grunt-newer": "^1.2.0" } } diff --git a/phpgwapi/templates/default/def_buttons.less b/phpgwapi/templates/default/def_buttons.less deleted file mode 100755 index ba14a15be0..0000000000 Binary files a/phpgwapi/templates/default/def_buttons.less and /dev/null differ diff --git a/phpgwapi/templates/default/def_content_elements.less b/phpgwapi/templates/default/def_content_elements.less deleted file mode 100755 index cd6cf85599..0000000000 --- a/phpgwapi/templates/default/def_content_elements.less +++ /dev/null @@ -1,791 +0,0 @@ -/** - * EGroupware: CSS with less preprocessor - * - * Definitions for content-elements - * - * 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 Reinhardt - * @package phpgwapi - * @version $Id$ - */ - -@import (reference) "def_design_pattern_color_font_shadow.less"; -@import (reference) "def_buttons.less"; - -/* ####################################################################################### -* -* -* Inhaltselemente -* -* -* ######################################################################################## -*/ - -//Reset - -html * { - font-size: 100%; -} - - -//############################################### - -body{ - background-image:none; - - .background-color-0-gray; - .color-100-gray; // Schriftfarbe schwarz - - margin: 0px !important; - padding: 0px !important; - width: 100% !important; - height: 100% !important; -} - -body, td, textarea {.basefontfamily;} - -#egw_fw_basecontainer { - position: fixed; - width: 100%; - height: 100%; - padding: 0px; - margin: 0px; - - .basefontfamily; -// font-size: 8pt; - - .background-color-5-gray ; -} - -//########################## - -input { - - .Complete_Button_input; - - &:hover{.Complete_Button_input_hover;} - &:focus{.Complete_Button_input_focus;} - -} - -select { - - .Complete_Button_select; - padding:3px; - margin: 0; - .rounded (4px); -// .drop-shadow( 0, 3px, 0, 191, 191, 191, 0.1, inset); - -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset; - -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset; - box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset; - background: #f8f8f8; - color:#888; - border:none; - outline:none; - display: inline-block; - -webkit-appearance:none; - -moz-appearance:none; - appearance:none; - cursor:pointer; - - &:hover{.Complete_Button_select_hover;} - &:focus{.Complete_Button_select_focus;} - -} - - -//select { - -//} - - -// ############################# -// Schriftformate - -p { font-size: 12px;} - -li {} - - -h1 { - font-size: 200%; - line-height: 1.2em; - margin: 0.4em 0 0; -} -h2 { - font-size: 170%; - line-height: 1.2em; - margin: 0.6em 0 0; -} -h3 { - font-size: 150%; - line-height: 0.8571em; - margin: 0.8571em 0 0; -} -h3 a { - color: #999999; -} -h4 { - font-size: 110%; - line-height: 1.125em; - margin: 1.125em 0 0; -} -h5 { - font-size: 100%; - line-height: 1.2857em; - margin: 1.2857em 0 0; -} -h6 { - font-size: 100%; - font-weight: bold; - line-height: 1.5em; - margin: 1.5em 0 0; -} - - - - -// -/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - select {padding-right:18px} -} - -select {position:relative} -select:after { - content:'<>'; - font:11px "Consolas", monospace; - color:#aaa; - -webkit-transform:rotate(90deg); - -moz-transform:rotate(90deg); - -ms-transform:rotate(90deg); - transform:rotate(90deg); - right:8px; top:2px; - padding:0 0 2px; - border-bottom:1px solid #ddd; - position:absolute; - pointer-events:none; -} -select:before { - content:''; - right:6px; top:0px; - width:20px; height:20px; - background:#f8f8f8; - position:absolute; - pointer-events:none; - display:block; -} - -div.selectbox-wrapper { - - ul { - list-style-type:none; - margin:0px; - padding:0px; - - li.selected { - background-color: #EAF2FB; - } - li.current { - background-color: #CDD8E4; - } - - li { - list-style-type:none; - display:block; - margin:0; - padding:2px; - cursor:pointer; - } - } - - - - -} - - -.sbHolder{ - .Complete_Button_select; -// background-color: #2d2d2d; -// border: solid 1px #515151; -// font-family: Arial, sans-serif; - .basefontfamily; - font-size: 1.2em; - font-weight: normal; - height: 30px; - position: relative; - width: 10em; - - &:hover{.Complete_Button_select_hover;} - &:focus{.Complete_Button_select_focus;} - -} -.sbHolder:focus .sbSelector{} - -.sbSelector{ - display: block; - height: 30px; - left: 0; - line-height: 30px; - outline: none; - overflow: hidden; - position: absolute; - text-indent: 10px; - top: 0; - width: 170px; -} -.sbSelector:link, .sbSelector:visited, .sbSelector:hover{ -// color: #EBB52D; - .color-50-gray; - outline: none; - text-decoration: none; -} -.sbToggle{ - background: url(../img/select-icons.png) 0 -116px no-repeat; - display: block; - height: 30px; - outline: none; - position: absolute; - right: 0; - top: 0; - width: 30px; -} -.sbToggle:hover{ - background: url(../images/select-icons.png) 0 -167px no-repeat; -} -.sbToggleOpen{ - background: url(../images/select-icons.png) 0 -16px no-repeat; -} -.sbToggleOpen:hover{ - background: url(../images/select-icons.png) 0 -66px no-repeat; -} -.sbHolderDisabled{ - background-color: #3C3C3C; - border: solid 1px #515151; -} -.sbHolderDisabled .sbHolder{ - -} -.sbHolderDisabled .sbToggle{ - -} - -// Ausklappliste - -.sbOptions{ -// background-color: #212121; - .background-color-0-gray; - border: solid 1px #515151; - list-style: none; - left: -1px; - margin: 0; - padding: 0; - position: absolute; - top: 30px; - width: 200px; - z-index: 1; - overflow-y: auto; - - li{ - padding: 0 7px; - } - - a{ - border-bottom: dotted 1px #515151; - display: block; - outline: none; - padding: 7px 0 7px 3px; - } - - a:link, - a:visited{ - .color-100-gray; - text-decoration: none; - } - a:hover, - a:focus, - a.sbFocus{ - color: #EBB52D; - } - li.last a{ - border-bottom: none; - } - - - .sbDisabled{ - border-bottom: dotted 1px #515151; - color: #999; - display: block; - padding: 7px 0 7px 3px; - } - .sbGroup{ - border-bottom: dotted 1px #515151; - color: #EBB52D; - display: block; - font-weight: bold; - padding: 7px 0 7px 3px; - } - .sbSub{ - padding-left: 17px; - } -} - -// Tabellen - -.th { - background-color: #e0e0e0; -} - -// Links - -a:link, a:visited, select, input, textarea { - color : @link-color; -} - -select,input,button -{ - .color-100-gray; - font-size:99%; - padding: 0.2em 0; - border-width: 1px; - border-style: solid; - .border-color-15-gray; -} - -select -{ - font-size:100%; -} - -a:link,a:visited -{ - cursor:pointer; - color: @link-color; - text-decoration: none; -} - -a:hover,a:active -{ - cursor:pointer; - color:@link-color-active; - text-decoration: underline; -} - -.divLoginboxHeader, -.divSideboxHeader, -a.appTitles, -.appTitles, -a.textSidebox, -.textSidebox,#fmStatusBar -{ - font-size:90%; -} - -.prefSection -{ - font-weight:bold; - font-size:145%; - line-height:40px; -} - -#divAppboxHeader -{ - line-height:28px; - font-size:125%; - font-weight:bold; - color:#666666; -} - -#divGenTime,#divPoweredBy -{ - font-size: 80%; - color: #ff0000; -} - -#divPoweredBy -{ - color: #000000; -} - -#sideboxdragarea { - z-index:100; - position:absolute; - left:0px; - top:105px; -} - -#menu2handle { - padding-top: 10px; -} - -#menu1close { - position: absolute; - right: 7px; - top: 7px; -} - - -//############################################################################################################## - -// Lettersearch - -.lettersearch { - .Complete_Button_lettersearch; -} - -.lettersearch:hover { - .background-color-30-gray; - .color-0-gray; - } - - -.lettersearch_active{ - .Complete_Button_lettersearch; - .background-color-30-gray; -// background-color: #808080 !important; - font-weight: bold; - } - -td.lettersearch { -// border-color: #E0E0E0; - background-image: none; -} - - -.nextmatch_header table { - border: none !important; - width: 99% !important; -} - - -.egw_fw_ui_sidemenu_marker { - display: block; - height: 20px; - padding: 2px 5px 2px 34px; - margin: 0; - border-width: 0px 1px 0px 1px; - border-style: solid; - border-color: #c6ced6; - cursor: pointer; - color: gray; - background-color: RGB(250, 250, 250); - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - - h1{ - display: inline; - font-size: 10pt; - font-weight: bold; - } -} - - - -.egw_fw_ui_ajaxloader { - display: inline-block; - width: 16px; - height: 16px; - background-image:url(images/ajax-loader.gif); - background-repeat: no-repeat; - background-position: center; - float: right; -} - - - - - - -/* traditional */ - - - -form -{ - margin:0px; - padding:0px; -} - -img -{ - border:0; -} - - -input,button,select -{ - border: solid 1px #bbbbbb; - padding: 0.2em; - font-size: 1.1em; -} - -input[type=submit],input[type=button],input[type=reset],button,.egwbutton -{ - .background-color-10-gray; - background-image: none; - border: outset 1px #b9d5e3; - margin: 1px; - padding: 1px; - cursor: pointer; - color: #004e7d; -} - -input[type=submit]:hover,input[type=button]:hover,input[type=reset]:hover,button:hover,.egwbutton:hover -{ - .background-color-15-gray; - background-image: none; - border: outset 1px #b9d5e3; - color: #004e7d; -} - -input[type=submit]:active,input[type=button]:active,input[type=reset]:active,button:active,.egwbutton:active -{ - border: inset 1px #bbbbbb; -} - -input[type=submit]:disabled,input[type=button]:disabled,input[type=reset]:disabled,button:disabled,.egwbutton:disabled -{ - background-color: transparent; - color: gray; -} - -input.egwbutton -{ - background-color:#b9d5e3; - border: outset 1px #b9d5e3; - margin: 1px; - padding: 1px; - cursor: pointer; - color: #004e7d; -} - -input.egwbutton:hover -{ - background-color:#94bfd4; - border: outset 1px #b9d5e3; - color: #004e7d; -} -input.egwbutton:active -{ - border: inset 1px #bbbbbb; -} - -input[type=image] -{ - cursor: pointer; - border: 0; -} - -#thesideboxcolumn -{ - width: 177px; - position:relative; -} - -#sideresize -{ - background-image:url(../images/resize.png); - width:13px; - height:13px; - right:1px; - top:1px; - position:absolute; - z-index:9999; -} - - - - - -.divSidebox -{ - position:relative; - border: #9c9c9c 1px solid; - overflow:auto; -} - -.divSideboxHeader -{ - text-align:center; - .background-color-15-gray; - padding-top:2px; - .color-50-gray; -} - - -a.divSideboxEntry, .divSideboxEntry -{ - text-align:left; - background-color:#FDFDFD; -} - -a.appTitles,.appTitles -{ - height:18px; - padding-top:2px; - padding-bottom:2px; -} - -a.textSidebox -{ - padding: 0; - border-top: 0; -} - -.textSidebox -{ - padding-top:3px; - padding-bottom:3px; - padding-left: 1px; - border-top: solid #aaaaaa 1px; - overflow: auto; -} - -.sideboxSpace -{ - height:9px; -} - -.greyLine -{ - margin:1px; - border-top:solid 1px #7e7e7e; - height:1px; -} - -#extraIcons -{ - background-color:#eeeeee; - border:solid 1px #7e7e7e; -} - -.extraIconsRow -{ - border:solid 1px #dddddd; - padding:2px; -} - -#topmenu -{ - background-color: #0081c1; - background-image: url(../images/bgtopmenu2.png); - color:#006699; - /*border-top: solid 1px #7e7e7e;*/ - border-bottom: solid #5793ff 1px; - height:20px; - padding-top:4px ; - line-height:16px; -} -#topmenu a -{ - color:#006699; -} - -#topmenu_items -{ - float:left; -} -#topmenu_info -{ - float:right; -} - -#divUpperTabs -{ - text-align:right; - height: 15px; - margin-right: 10px; -} - -#divUpperTabs ul -{ - display:inline; - margin:0; - padding:10px 10px 0 1px; - list-style:none; -} - -#divUpperTabs li -{ - float:right; - margin:0 5px 0 0; - padding:0 5px 0 5px; - border:solid 1px #9c9c9c; - border-bottom: 0px; -} - -//#divAppIconBar -//{ -// background-color:silver; -// border:solid 1px #9c9c9c; -// background-image: url(../images/background-icon-bar.png); -// background-repeat: repeat-x; -// overflow:visible; -// height: 45px; /* prevents text line to show in IE7+8(Compatibilitymode) */ -//} - -/* Star-Plus-HTML Hack fix for the above */ -*:first-child+html #divAppIconBar -{ - height: 60px; -} - -#divAppTextBar -{ - background-color:white; -} - -#divStatusBar -{ - background-color:white; - height:18px; - padding-left:3px; -} - -#tdSidebox -{ - width:170px; - background-color:white; - overflow:visible; -} - -#tdAppbox -{ - background-color:white; - padding-left:5px; - width: 100%; -} - -#divAppboxHeader -{ - background-image:url(../images/appbox-header-background.png); - background-repeat: repeat-x; - height: 25px; - border-bottom:solid 1px #c0c0c0; - text-align:center; - padding-bottom:0px; - border-top:solid 1px #9c9c9c; - border-left:solid 1px #9c9c9c; - border-right:solid 1px #9c9c9c; -} - -#divAppbox -{ - background-color:#ffffff; - padding:5px; - border-bottom:solid 1px #9c9c9c; - border-left:solid 1px #9c9c9c; - border-right:solid 1px #9c9c9c; -} - -#divGenTime,#divPoweredBy -{ - bottom:4px; - text-align:center; - width:99%; -} \ No newline at end of file diff --git a/phpgwapi/templates/default/def_design_pattern_color_font_shadow.less b/phpgwapi/templates/default/def_design_pattern_color_font_shadow.less deleted file mode 100755 index 1e1f0f1616..0000000000 --- a/phpgwapi/templates/default/def_design_pattern_color_font_shadow.less +++ /dev/null @@ -1,532 +0,0 @@ -/** - * EGroupware: CSS with less preprocessor - * - * Definitions for colors, fonts, borders and box shadow - * - * 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 - * @package phpgwapi - * @version $Id$ - */ - - // Farben -// CI EGW - -// Orange -@egw_color_1 : rgb(255, 194, 0); // #ffc200 -@egw_color_1_a : #ffc200; -@egw_color_1_b : #BF9D30; -@egw_color_1_c : #A67E00; -@egw_color_1_d : #FFD140; -@egw_color_1_e : #FFDD73; - -// BLUE -@egw_color_2_a : #0C5DA5; -@egw_color_2_b : #26537C; -@egw_color_2_c : #043A6B; -@egw_color_2_d : #408DD2; -@egw_color_2_e : #679FD2; - - -// Lila -@egw_color_3_a : #560EAD; -@egw_color_3_b : #512882; -@egw_color_3_c : #360570; -@egw_color_3_d : #8643D6; -@egw_color_3_e : #9B6AD6; - - - - -@egw_color_blue : #1D1AB2; - -@egw_color_blue_lighter : #0B5FA4 ; - -@egw_color_blue_lightest :#66A1D2; - -//Berechnung der EGW Farben - -.background-color-egw-normal {background-color : @egw_color_1_a !important;} -.background-color-egw-light {background-color : @egw_color_1_d;} -.background-color-egw-lighter {background-color : @egw_color_1_e;} -.background-color-egw-dark {background-color : @egw_color_2_a;} -.background-color-egw-darker {background-color : @egw_color_2_b;} - - - - -@blue : blue; - -@gray : #000000; - -@red: #FF0000; - -@yellow : #FFD40F; - -@lightgray : #E4E7EA; - -@link-color : #000000; - -@link-color-active: @link-color*010101; - -@active_button_border_bottom : @egw_color_2_d; // soll EGROUPWARE FARBE GEBEN - -@color-hint : @egw_color_1_a; - -// aktiverte Zeilen in allen APP mit Listenausgabe -@active_row : #679FD2; - -// Grauwerte - -.color-0-gray { color : lighten(@gray, 100%);} -.color-5-gray { color : lighten(@gray, 95%);} -.color-10-gray { color : lighten(@gray, 90%);} -.color-15-gray { color : lighten(@gray, 85%);} -.color-25-gray { color : lighten(@gray, 75%);} -.color-30-gray { color : lighten(@gray, 70%);} -.color-40-gray { color : lighten(@gray, 60%);} -.color-50-gray { color : lighten(@gray, 50%);} -.color-100-gray { color : @gray; } - -// Hintergrundfarben - -// Warnung - -.background-color-warning {background-color : @red;} - -.background-color-hint {background-color : darken(@red, 5%);} - - -//Grautöne - -.background-color-0-gray { background-color : lighten(@gray, 100%);} -.background-color-5-gray { background-color : lighten(@gray, 98%); } -.background-color-10-gray { background-color : lighten(@gray, 94%); } -.background-color-15-gray { background-color : lighten(@gray, 85%); } -.background-color-25-gray { background-color : lighten(@gray, 75%); } -.background-color-30-gray { background-color : lighten(@gray, 70%) !important; } -.background-color-40-gray { background-color : lighten(@gray, 60%); } -.background-color-50-gray { background-color : lighten(@gray, 50%); } - -//Contexthilfe - -.background-color-Context-Help{ background-color: @egw_color_1;} - - - -.background-color-required-field { - background-color : #FFF; - color: #000; - border: 1px solid red;} - -.background-color-dialog-container {background-color : lighten(@gray, 100%); } - -.background-color-search {background-color : lighten(@egw_color_1, 15%); } - -// cal Heute - -.background-table-cal-head { background-color : @egw_color_1_a;} - -// Bordercolor - -.border-color-10-gray { border-color : lighten(@gray, 94%); } -.border-color-15-gray { border-color : lighten(@gray, 85%); } -.border-color-25-gray { border-color : lighten(@gray, 75%); } -.border-color-50-gray { border-color : lighten(@gray, 50%); } - -//Bilder - -// Schriften - -.basefontfamily{ - //font-family: Verdana, Helvetica, Sans-Serif; - font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif; -// font-size: 16px; - font-size: 87.5%; -} - - - -// Radius - -.border_radius_button_lefttop { - -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topleft: 20px; - border-radius: 3px; - border-top-left-radius: 20px; -} - -.border_radius_button_righttop { - -webkit-border-radius: 3px; - -webkit-border-top-right-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topright: 20px; - border-radius: 3px; - border-top-right-radius: 20px; -} - -.border_radius_button_normal { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - - -// Box Shadow -// auf hellem Hintergrund - -.box_shadow_standard_light { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - } - - -// wird dunkler - -.box_shadow_standard_light_hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); -// -webkit-box-shadow: none; -// -moz-box-shadow: none; -// box-shadow:none; - - } - -// für focus und active - -.box_shadow_standard_light_inset { - -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - } - - - -// Rahmen um Hauptinhalt - -.box_shadow_dialog { -// -webkit-box-shadow: -3px 20px 29px @egw_color_1; -// -moz-box-shadow: -3px 20px 29px @egw_color_1; -// box-shadow: -3px 20px 29px @egw_color_1; - } - - -// Rahmen für Dialoge - -.box_shadow_edit_dialog { -// -webkit-box-shadow: 1px 2px 3px rgba(50, 50, 50, 0.75); -// -moz-box-shadow: 1px 2px 3px rgba(50, 50, 50, 0.75); -// box-shadow: 2px 2px 3px rgba(50, 50, 50, 0.75); - - -moz-box-shadow: inset 0 0 5px 5px #888; - -webkit-box-shadow: inset 0 0 5px 5px #888; - box-shadow: inset 0 0 5px 5px #888; - - margin: 5px ; - padding: 0%; - width: 100%; - } - - -// ############################# -// Verlauf - -.background_verlauf_diagonal_gray (@i: #d8d8d8, @j: #a3a3a3) { - background: -webkit-gradient(linear, 0 0, 0 bottom, @i, @j), - -moz-linear-gradient(@i, @j), - -o-linear-gradient(@i, @j), - linear-gradient(@i, @j); - -pie-background: linear-gradient(@i, @j); - behavior: url(/PIE.htc); - } - -.background_linear_gradient(@i: #ffb76b, @j: #ff7f04) { - background: -webkit-gradient(linear, 0 0, 0 bottom, @i, @j), - -moz-linear-gradient(@i, @j), - -o-linear-gradient(@i, @j), - linear-gradient(@i, @j); - -pie-background: linear-gradient(@i, @j); - behavior: url(/PIE.htc); - } - -.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) { - background: @color, - -webkit-gradient(linear, - left bottom, - left top, - color-stop(0, @start), - color-stop(1, @stop)), - -ms-linear-gradient(bottom, @start, @stop), - -moz-linear-gradient(center bottom, @start 0%, @stop 100%), - -o-linear-gradient(@stop, @start); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@stop,@start)); -} - - -.bw_gradient(@color: #F5F5F5, @start: 0, @stop: 255) { - background: @color, - -webkit-gradient(linear, - left bottom, - left top, - color-stop(0, rgb(@start,@start,@start)), - color-stop(1, rgb(@stop,@stop,@stop))), - -ms-linear-gradient(bottom, - rgb(@start,@start,@start) 0%, - rgb(@stop,@stop,@stop) 100%), - -moz-linear-gradient(center bottom, - rgb(@start,@start,@start) 0%, - rgb(@stop,@stop,@stop) 100%), - -o-linear-gradient(rgb(@stop,@stop,@stop), - rgb(@start,@start,@start)); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",rgb(@stop,@stop,@stop),rgb(@start,@start,@start))); -} - -// ############################# -// Transparenz - -.transparent_50 { - /* Required for IE 5, 6, 7 */ - /* ...or something to trigger hasLayout, like zoom: 1; */ - width: 100%; - - /* Theoretically for IE 8 & 9 (more valid) */ - /* ...but not required as filter works too */ - /* should come BEFORE filter */ - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - - /* This works in IE 8 & 9 too */ - /* ... but also 5, 6, 7 */ - filter: alpha(opacity=50); - - /* Older than Firefox 0.9 */ - -moz-opacity:0.5; - - /* Safari 1.x (pre WebKit!) */ - -khtml-opacity: 0.5; - - /* Modern! - /* Firefox 0.9+, Safari 2?, Chrome any? - /* Opera 9+, IE 9+ */ - opacity: 0.5; -} -// ############################# -// Button Größen - -.Button_size_square_32{ - width: 32px; - height: 32px; - -} - -.Button_size_square_16{ - width: 16px; - height: 16px; -} - -.Button_size_square_8{ - width: 8px; - height: 8px; -} - -.Button_size_h32_auto{ - width: auto; - height: 32px; -} - -// Rahmen für Schaltflächen - -.border_normal{ - border: 1px solid rgba(0, 0, 0, 0.15); -} - -.border_hover{ - border: 1px solid rgba(0, 0, 0, 0.5); -} -.border_active{ - border: 1px solid rgba(0, 0, 0, 0.9); -} - - - -// Flächen - -// Hintergrund für Filter -// Filterfläche - -.Rectangle_filters { - - padding: 0 0 0 1em; - - .background-color-10-gray; - margin-bottom: 3px; - margin: 0em; -// vertical-align: top; - border-width: 0 0 1px 0; - .border-color-15-gray; - background-image: none; - -} - -/*--------------------------------------------------- - LESS Elements 0.9 - --------------------------------------------------- - A set of useful LESS mixins - More info at: http://lesselements.com - ---------------------------------------------------*/ - -.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) { - background: @color, - -webkit-gradient(linear, - left bottom, - left top, - color-stop(0, @start), - color-stop(1, @stop)), - -ms-linear-gradient(bottom, - @start, - @stop), - -moz-linear-gradient(center bottom, - @start 0%, - @stop 100%), - -o-linear-gradient(@stop, - @start); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@stop,@start)); -} -.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) { - background: @color, - -webkit-gradient(linear, - left bottom, - left top, - color-stop(0, rgb(@start,@start,@start)), - color-stop(1, rgb(@stop,@stop,@stop))), - -ms-linear-gradient(bottom, - rgb(@start,@start,@start) 0%, - rgb(@stop,@stop,@stop) 100%), - -moz-linear-gradient(center bottom, - rgb(@start,@start,@start) 0%, - rgb(@stop,@stop,@stop) 100%), - -o-linear-gradient(rgb(@stop,@stop,@stop), - rgb(@start,@start,@start)); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",rgb(@stop,@stop,@stop),rgb(@start,@start,@start))); -} -.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) { - border-top: solid 1px @top-color; - border-left: solid 1px @left-color; - border-right: solid 1px @right-color; - border-bottom: solid 1px @bottom-color; -} -.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @r:0, @g:0, @b:0, @alpha: 0.1, @inset:inset) { - -webkit-box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; - -moz-box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; - box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; -} -.rounded(@radius: 2px) { - -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; -} -.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) { - -webkit-border-top-right-radius: @topright; - -webkit-border-bottom-right-radius: @bottomright; - -webkit-border-bottom-left-radius: @bottomleft; - -webkit-border-top-left-radius: @topleft; - -moz-border-radius-topright: @topright; - -moz-border-radius-bottomright: @bottomright; - -moz-border-radius-bottomleft: @bottomleft; - -moz-border-radius-topleft: @topleft; - border-top-right-radius: @topright; - border-bottom-right-radius: @bottomright; - border-bottom-left-radius: @bottomleft; - border-top-left-radius: @topleft; - .background-clip(padding-box); -} -.opacity(@opacity: 0.5) { - -moz-opacity: @opacity; - -khtml-opacity: @opacity; - -webkit-opacity: @opacity; - opacity: @opacity; - @opperc: @opacity * 100; - -ms-filter: ~"progid:DXImageTransform.Microsoft.Alpha(opacity=@{opperc})"; - filter: ~"alpha(opacity=@{opperc})"; -} -.transition-duration(@duration: 0.2s) { - -moz-transition-duration: @duration; - -webkit-transition-duration: @duration; - -o-transition-duration: @duration; - transition-duration: @duration; -} -.transform(...) { - -webkit-transform: @arguments; - -moz-transform: @arguments; - -o-transform: @arguments; - -ms-transform: @arguments; - transform: @arguments; -} -.rotation(@deg:5deg){ - .transform(rotate(@deg)); -} -.scale(@ratio:1.5){ - .transform(scale(@ratio)); -} -.transition(@duration:0.2s, @ease:ease-out) { - -webkit-transition: all @duration @ease; - -moz-transition: all @duration @ease; - -o-transition: all @duration @ease; - transition: all @duration @ease; -} -.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) { - -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); - -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); - box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); -} -.box-shadow(@arguments) { - -webkit-box-shadow: @arguments; - -moz-box-shadow: @arguments; - box-shadow: @arguments; -} -.box-sizing(@sizing: border-box) { - -ms-box-sizing: @sizing; - -moz-box-sizing: @sizing; - -webkit-box-sizing: @sizing; - box-sizing: @sizing; -} -.user-select(@argument: none) { - -webkit-user-select: @argument; - -moz-user-select: @argument; - -ms-user-select: @argument; - user-select: @argument; -} -.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) { - -moz-column-width: @colwidth; - -moz-column-count: @colcount; - -moz-column-gap: @colgap; - -moz-column-rule-color: @columnRuleColor; - -moz-column-rule-style: @columnRuleStyle; - -moz-column-rule-width: @columnRuleWidth; - -webkit-column-width: @colwidth; - -webkit-column-count: @colcount; - -webkit-column-gap: @colgap; - -webkit-column-rule-color: @columnRuleColor; - -webkit-column-rule-style: @columnRuleStyle; - -webkit-column-rule-width: @columnRuleWidth; - column-width: @colwidth; - column-count: @colcount; - column-gap: @colgap; - column-rule-color: @columnRuleColor; - column-rule-style: @columnRuleStyle; - column-rule-width: @columnRuleWidth; -} -.translate(@x:0, @y:0) { - .transform(translate(@x, @y)); -} -.background-clip(@argument: padding-box) { - -moz-background-clip: @argument; - -webkit-background-clip: @argument; - background-clip: @argument; -} \ No newline at end of file diff --git a/phpgwapi/templates/default/def_icons.less b/phpgwapi/templates/default/def_icons.less deleted file mode 100755 index 0d40e84ed9..0000000000 --- a/phpgwapi/templates/default/def_icons.less +++ /dev/null @@ -1,339 +0,0 @@ -/** - * EGroupware: CSS with less preprocessor - * - * Definitions for icons using entypo-icon-font - * - * 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 - * @package phpgwapi - * @version $Id$ - */ - -@import (reference) "def_design_pattern_color_font_shadow.less"; -//######################################################################################################## -// Icons -// -//######################################################################################################## - -@charset "UTF-8"; - -@font-face { - 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?#iefix") format('embedded-opentype'), url("../fonts/entypo-icon-font/entypo-icon-font.woff") format('woff'), url("../fonts/entypo-icon-font/entypo-icon-font.ttf") format('truetype'), url("../fonts/entypo-icon-font/entypo-icon-font.svg#entypo-icon-font") format('svg'); - font-weight: normal; - font-style: normal; -} -[class^="icon-"]:before, -[class*=" icon-"]:before, -[class*=" ui-icon-"]:before, -[class*="ui-icon-"]:before -{ - font-family: 'entypo-icon-font'; - font-style: normal; - font-weight: normal; - speak: none; - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: 0.2em; - text-align: center; - /*opacity: 0.8;*/ -/* fix buttons height, for twitter bootstrap */ - line-height: 1em; -/* Animation center compensation - magrins should be symmetric */ -/* remove if not needed */ - margin-left: 0.2em; -/* you can be more comfortable with increased icons size */ - font-size: 120%; -/* Uncomment for 3D effect */ -/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ -} - -.icon-plus:before { content: '\2b'; } /* '+' */ -.icon-minus:before { content: '\2d'; } /* '-' */ -.icon-info:before { content: '\2139'; } /* 'ℹ' */ -.icon-left-thin:before { content: '\2190'; } /* '←' */ -.icon-up-thin:before { content: '\2191'; } /* '↑' */ -.icon-right-thin:before { content: '\2192'; } /* '→' */ -.icon-down-thin:before { content: '\2193'; } /* '↓' */ -.icon-level-up:before { content: '\21b0'; } /* '↰' */ -.icon-level-down:before { content: '\21b3'; } /* '↳' */ -.icon-switch:before { content: '\21c6'; } /* '⇆' */ -.icon-infinity:before { content: '\221e'; } /* '∞' */ -.icon-plus-squared:before { content: '\229e'; } /* '⊞' */ -.icon-minus-squared:before { content: '\229f'; } /* '⊟' */ -.icon-home:before { content: '\2302'; } /* '⌂' */ -.icon-keyboard:before { content: '\2328'; } /* '⌨' */ -.icon-erase:before { content: '\232b'; } /* '⌫' */ -.icon-pause:before { content: '\2389'; } /* '⎉' */ -.icon-fast-forward:before { content: '\23e9'; } /* '⏩' */ -.icon-fast-backward:before { content: '\23ea'; } /* '⏪' */ -.icon-to-end:before { content: '\23ed'; } /* '⏭' */ -.icon-to-start:before { content: '\23ee'; } /* '⏮' */ -.icon-hourglass:before { content: '\23f3'; } /* '⏳' */ -.icon-stop:before { content: '\25a0'; } /* '■' */ -.icon-up-dir:before { content: '\25b4'; } /* '▴' */ -.icon-play:before { content: '\25b6'; } /* '▶' */ -.icon-right-dir:before { content: '\25b8'; } /* '▸' */ -.icon-down-dir:before { content: '\25be'; } /* '▾' */ -.icon-left-dir:before { content: '\25c2'; } /* '◂' */ -.icon-adjust:before { content: '\25d1'; } /* '◑' */ -.icon-cloud:before { content: '\2601'; } /* '☁' */ -.icon-star:before { content: '\2605'; } /* '★' */ -.icon-star-empty:before { content: '\2606'; } /* '☆' */ -.icon-cup:before { content: '\2615'; } /* '☕' */ -.icon-menu:before { content: '\2630'; } /* '☰' */ -.icon-moon:before { content: '\263d'; } /* '☽' */ -.icon-heart-empty:before { content: '\2661'; } /* '♡' */ -.icon-heart:before { content: '\2665'; } /* '♥' */ -.icon-note:before { content: '\266a'; } /* '♪' */ -.icon-note-beamed:before { content: '\266b'; } /* '♫' */ -.icon-layout:before { content: '\268f'; } /* '⚏' */ -.icon-flag:before { content: '\2691'; } /* '⚑' */ -.icon-tools:before { content: '\2692'; } /* '⚒' */ -.icon-cog:before { content: '\2699'; } /* '⚙' */ -.icon-attention:before { content: '\26a0'; } /* '⚠' */ -.icon-flash:before { content: '\26a1'; } /* '⚡' */ -.icon-record:before { content: '\26ab'; } /* '⚫' */ -.icon-cloud-thunder:before { content: '\26c8'; } /* '⛈' */ -.icon-tape:before { content: '\2707'; } /* '✇' */ -.icon-flight:before { content: '\2708'; } /* '✈' */ -.icon-mail:before { content: '\2709'; } /* '✉' */ -.icon-pencil:before { content: '\270e'; } /* '✎' */ -.icon-feather:before { content: '\2712'; } /* '✒' */ -.icon-check:before { content: '\2713'; } /* '✓' */ -.icon-cancel:before { content: '\2715'; } /* '✕' */ -.icon-cancel-circled:before { content: '\2716'; } /* '✖' */ -.icon-cancel-squared:before { content: '\274e'; } /* '❎' */ -.icon-help:before { content: '\2753'; } /* '❓' */ -.icon-quote:before { content: '\275e'; } /* '❞' */ -.icon-plus-circled:before { content: '\2795'; } /* '➕' */ -.icon-minus-circled:before { content: '\2796'; } /* '➖' */ -.icon-right:before { content: '\27a1'; } /* '➡' */ -.icon-direction:before { content: '\27a2'; } /* '➢' */ -.icon-forward:before { content: '\27a6'; } /* '➦' */ -.icon-ccw:before { content: '\27f2'; } /* '⟲' */ -.icon-cw:before { content: '\27f3'; } /* '⟳' */ -.icon-left:before { content: '\2b05'; } /* '⬅' */ -.icon-up:before { content: '\2b06'; } /* '⬆' */ -.icon-down:before { content: '\2b07'; } /* '⬇' */ -.icon-list-add:before { content: '\e003'; } /* '' */ -.icon-list:before { content: '\e005'; } /* '' */ -.icon-left-bold:before { content: '\e4ad'; } /* '' */ -.icon-right-bold:before { content: '\e4ae'; } /* '' */ -.icon-up-bold:before { content: '\e4af'; } /* '' */ -.icon-down-bold:before { content: '\e4b0'; } /* '' */ -.icon-user-add:before { content: '\e700'; } /* '' */ -.icon-help-circled:before { content: '\e704'; } /* '' */ -.icon-info-circled:before { content: '\e705'; } /* '' */ -.icon-eye:before { content: '\e70a'; } /* '' */ -.icon-tag:before { content: '\e70c'; } /* '' */ -.icon-upload-cloud:before { content: '\e711'; } /* '' */ -.icon-reply:before { content: '\e712'; } /* '' */ -.icon-reply-all:before { content: '\e713'; } /* '' */ -.icon-code:before { content: '\e714'; } /* '' */ -.icon-export:before { content: '\e715'; } /* '' */ -.icon-print:before { content: '\e716'; } /* '' */ -.icon-retweet:before { content: '\e717'; } /* '' */ -.icon-comment:before { content: '\e718'; } /* '' */ -.icon-chat:before { content: '\e720'; } /* '' */ -.icon-vcard:before { content: '\e722'; } /* '' */ -.icon-address:before { content: '\e723'; } /* '' */ -.icon-location:before { content: '\e724'; } /* '' */ -.icon-map:before { content: '\e727'; } /* '' */ -.icon-compass:before { content: '\e728'; } /* '' */ -.icon-trash:before { content: '\e729'; } /* '' */ -.icon-doc:before { content: '\e730'; } /* '' */ -.icon-doc-text-inv:before { content: '\e731'; } /* '' */ -.icon-docs:before { content: '\e736'; } /* '' */ -.icon-doc-landscape:before { content: '\e737'; } /* '' */ -.icon-archive:before { content: '\e738'; } /* '' */ -.icon-rss:before { content: '\e73a'; } /* '' */ -.icon-share:before { content: '\e73c'; } /* '' */ -.icon-basket:before { content: '\e73d'; } /* '' */ -.icon-shareable:before { content: '\e73e'; } /* '' */ -.icon-login:before { content: '\e740'; } /* '' */ -.icon-logout:before { content: '\e741'; } /* '' */ -.icon-volume:before { content: '\e742'; } /* '' */ -.icon-resize-full:before { content: '\e744'; } /* '' */ -.icon-resize-small:before { content: '\e746'; } /* '' */ -.icon-popup:before { content: '\e74c'; } /* '' */ -.icon-publish:before { content: '\e74d'; } /* '' */ -.icon-window:before { content: '\e74e'; } /* '' */ -.icon-arrow-combo:before { content: '\e74f'; } /* '' */ -.icon-chart-pie:before { content: '\e751'; } /* '' */ -.icon-language:before { content: '\e752'; } /* '' */ -.icon-air:before { content: '\e753'; } /* '' */ -.icon-database:before { content: '\e754'; } /* '' */ -.icon-drive:before { content: '\e755'; } /* '' */ -.icon-bucket:before { content: '\e756'; } /* '' */ -.icon-thermometer:before { content: '\e757'; } /* '' */ -.icon-down-circled:before { content: '\e758'; } /* '' */ -.icon-left-circled:before { content: '\e759'; } /* '' */ -.icon-right-circled:before { content: '\e75a'; } /* '' */ -.icon-up-circled:before { content: '\e75b'; } /* '' */ -.icon-down-open:before { content: '\e75c'; } /* '' */ -.icon-left-open:before { content: '\e75d'; } /* '' */ -.icon-right-open:before { content: '\e75e'; } /* '' */ -.icon-up-open:before { content: '\e75f'; } /* '' */ -.icon-down-open-mini:before { content: '\e760'; } /* '' */ -.icon-left-open-mini:before { content: '\e761'; } /* '' */ -.icon-right-open-mini:before { content: '\e762'; } /* '' */ -.icon-up-open-mini:before { content: '\e763'; } /* '' */ -.icon-down-open-big:before { content: '\e764'; } /* '' */ -.icon-left-open-big:before { content: '\e765'; } /* '' */ -.icon-right-open-big:before { content: '\e766'; } /* '' */ -.icon-up-open-big:before { content: '\e767'; } /* '' */ -.icon-progress-0:before { content: '\e768'; } /* '' */ -.icon-progress-1:before { content: '\e769'; } /* '' */ -.icon-progress-2:before { content: '\e76a'; } /* '' */ -.icon-progress-3:before { content: '\e76b'; } /* '' */ -.icon-back-in-time:before { content: '\e771'; } /* '' */ -.icon-network:before { content: '\e776'; } /* '' */ -.icon-inbox:before { content: '\e777'; } /* '' */ -.icon-install:before { content: '\e778'; } /* '' */ -.icon-lifebuoy:before { content: '\e788'; } /* '' */ -.icon-mouse:before { content: '\e789'; } /* '' */ -.icon-dot:before { content: '\e78b'; } /* '' */ -.icon-dot-2:before { content: '\e78c'; } /* '' */ -.icon-dot-3:before { content: '\e78d'; } /* '' */ -.icon-suitcase:before { content: '\e78e'; } /* '' */ -.icon-flow-cascade:before { content: '\e790'; } /* '' */ -.icon-flow-branch:before { content: '\e791'; } /* '' */ -.icon-flow-tree:before { content: '\e792'; } /* '' */ -.icon-flow-line:before { content: '\e793'; } /* '' */ -.icon-flow-parallel:before { content: '\e794'; } /* '' */ -.icon-brush:before { content: '\e79a'; } /* '' */ -.icon-paper-plane:before { content: '\e79b'; } /* '' */ -.icon-magnet:before { content: '\e7a1'; } /* '' */ -.icon-gauge:before { content: '\e7a2'; } /* '' */ -.icon-traffic-cone:before { content: '\e7a3'; } /* '' */ -.icon-cc:before { content: '\e7a5'; } /* '' */ -.icon-cc-by:before { content: '\e7a6'; } /* '' */ -.icon-cc-nc:before { content: '\e7a7'; } /* '' */ -.icon-cc-nc-eu:before { content: '\e7a8'; } /* '' */ -.icon-cc-nc-jp:before { content: '\e7a9'; } /* '' */ -.icon-cc-sa:before { content: '\e7aa'; } /* '' */ -.icon-cc-nd:before { content: '\e7ab'; } /* '' */ -.icon-cc-pd:before { content: '\e7ac'; } /* '' */ -.icon-cc-zero:before { content: '\e7ad'; } /* '' */ -.icon-cc-share:before { content: '\e7ae'; } /* '' */ -.icon-cc-remix:before { content: '\e7af'; } /* '' */ -.icon-github:before { content: '\f300'; } /* '' */ -.icon-github-circled:before { content: '\f301'; } /* '' */ -.icon-flickr:before { content: '\f303'; } /* '' */ -.icon-flickr-circled:before { content: '\f304'; } /* '' */ -.icon-vimeo:before { content: '\f306'; } /* '' */ -.icon-vimeo-circled:before { content: '\f307'; } /* '' */ -.icon-twitter:before { content: '\f309'; } /* '' */ -.icon-twitter-circled:before { content: '\f30a'; } /* '' */ -.icon-facebook:before { content: '\f30c'; } /* '' */ -.icon-facebook-circled:before { content: '\f30d'; } /* '' */ -.icon-facebook-squared:before { content: '\f30e'; } /* '' */ -.icon-gplus:before { content: '\f30f'; } /* '' */ -.icon-gplus-circled:before { content: '\f310'; } /* '' */ -.icon-pinterest:before { content: '\f312'; } /* '' */ -.icon-pinterest-circled:before { content: '\f313'; } /* '' */ -.icon-tumblr:before { content: '\f315'; } /* '' */ -.icon-tumblr-circled:before { content: '\f316'; } /* '' */ -.icon-linkedin:before { content: '\f318'; } /* '' */ -.icon-linkedin-circled:before { content: '\f319'; } /* '' */ -.icon-dribbble:before { content: '\f31b'; } /* '' */ -.icon-dribbble-circled:before { content: '\f31c'; } /* '' */ -.icon-stumbleupon:before { content: '\f31e'; } /* '' */ -.icon-stumbleupon-circled:before { content: '\f31f'; } /* '' */ -.icon-lastfm:before { content: '\f321'; } /* '' */ -.icon-lastfm-circled:before { content: '\f322'; } /* '' */ -.icon-rdio:before { content: '\f324'; } /* '' */ -.icon-rdio-circled:before { content: '\f325'; } /* '' */ -.icon-spotify:before { content: '\f327'; } /* '' */ -.icon-spotify-circled:before { content: '\f328'; } /* '' */ -.icon-qq:before { content: '\f32a'; } /* '' */ -.icon-instagram:before { content: '\f32d'; } /* '' */ -.icon-dropbox:before { content: '\f330'; } /* '' */ -.icon-evernote:before { content: '\f333'; } /* '' */ -.icon-flattr:before { content: '\f336'; } /* '' */ -.icon-skype:before { content: '\f339'; } /* '' */ -.icon-skype-circled:before { content: '\f33a'; } /* '' */ -.icon-renren:before { content: '\f33c'; } /* '' */ -.icon-sina-weibo:before { content: '\f33f'; } /* '' */ -.icon-paypal:before { content: '\f342'; } /* '' */ -.icon-picasa:before { content: '\f345'; } /* '' */ -.icon-soundcloud:before { content: '\f348'; } /* '' */ -.icon-mixi:before { content: '\f34b'; } /* '' */ -.icon-behance:before { content: '\f34e'; } /* '' */ -.icon-google-circles:before { content: '\f351'; } /* '' */ -.icon-vkontakte:before { content: '\f354'; } /* '' */ -.icon-smashing:before { content: '\f357'; } /* '' */ -.icon-db-shape:before { content: '\f600'; } /* '' */ -.icon-sweden:before { content: '\f601'; } /* '' */ -.icon-logo-db:before { content: '\f603'; } /* '' */ -.icon-picture:before { content: '🌄'; } /* '\1f304' */ -.icon-globe:before { content: '🌎'; } /* '\1f30e' */ -.icon-leaf:before { content: '🍂'; } /* '\1f342' */ -.icon-graduation-cap:before { content: '🎓'; } /* '\1f393' */ -.icon-mic:before { content: '🎤'; } /* '\1f3a4' */ -.icon-palette:before { content: '🎨'; } /* '\1f3a8' */ -.icon-ticket:before { content: '🎫'; } /* '\1f3ab' */ -.icon-video:before { content: '🎬'; } /* '\1f3ac' */ -.icon-target:before { content: '🎯'; } /* '\1f3af' */ -.icon-music:before { content: '🎵'; } /* '\1f3b5' */ -.icon-trophy:before { content: '🏆'; } /* '\1f3c6' */ -.icon-thumbs-up:before { content: '👍'; } /* '\1f44d' */ -.icon-thumbs-down:before { content: '👎'; } /* '\1f44e' */ -.icon-bag:before { content: '👜'; } /* '\1f45c' */ -.icon-user:before { content: '👤'; } /* '\1f464' */ -.icon-users:before { content: '👥'; } /* '\1f465' */ -.icon-lamp:before { content: '💡'; } /* '\1f4a1' */ -.icon-alert:before { content: '💥'; } /* '\1f4a5' */ -.icon-water:before { content: '💦'; } /* '\1f4a6' */ -.icon-droplet:before { content: '💧'; } /* '\1f4a7' */ -.icon-credit-card:before { content: '💳'; } /* '\1f4b3' */ -.icon-monitor:before { content: '💻'; } /* '\1f4bb' */ -.icon-briefcase:before { content: '💼'; } /* '\1f4bc' */ -.icon-floppy:before { content: '💾'; } /* '\1f4be' */ -.icon-cd:before { content: '💿'; } /* '\1f4bf' */ -.icon-folder:before { content: '📁'; } /* '\1f4c1' */ -.icon-doc-text:before { content: '📄'; } /* '\1f4c4' */ -.icon-calendar:before { content: '📅'; } /* '\1f4c5' */ -.icon-chart-line:before { content: '📈'; } /* '\1f4c8' */ -.icon-chart-bar:before { content: '📊'; } /* '\1f4ca' */ -.icon-clipboard:before { content: '📋'; } /* '\1f4cb' */ -.icon-attach:before { content: '📎'; } /* '\1f4ce' */ -.icon-bookmarks:before { content: '📑'; } /* '\1f4d1' */ -.icon-book:before { content: '📕'; } /* '\1f4d5' */ -.icon-book-open:before { content: '📖'; } /* '\1f4d6' */ -.icon-phone:before { content: '📞'; } /* '\1f4de' */ -.icon-megaphone:before { content: '📣'; } /* '\1f4e3' */ -.icon-upload:before { content: '📤'; } /* '\1f4e4' */ -.icon-download:before { content: '📥'; } /* '\1f4e5' */ -.icon-box:before { content: '📦'; } /* '\1f4e6' */ -.icon-newspaper:before { content: '📰'; } /* '\1f4f0' */ -.icon-mobile:before { content: '📱'; } /* '\1f4f1' */ -.icon-signal:before { content: '📶'; } /* '\1f4f6' */ -.icon-camera:before { content: '📷'; } /* '\1f4f7' */ -.icon-shuffle:before { content: '🔀'; } /* '\1f500' */ -.icon-loop:before { content: '🔁'; } /* '\1f501' */ -.icon-arrows-ccw:before { content: '🔄'; } /* '\1f504' */ -.icon-light-down:before { content: '🔅'; } /* '\1f505' */ -.icon-light-up:before { content: '🔆'; } /* '\1f506' */ -.icon-mute:before { content: '🔇'; } /* '\1f507' */ -.icon-sound:before { content: '🔊'; } /* '\1f50a' */ -.icon-battery:before { content: '🔋'; } /* '\1f50b' */ -.icon-search:before { content: '🔍'; } /* '\1f50d' */ -.icon-key:before { content: '🔑'; } /* '\1f511' */ -.icon-lock:before { content: '🔒'; } /* '\1f512' */ -.icon-lock-open:before { content: '🔓'; } /* '\1f513' */ -.icon-bell:before { content: '🔔'; } /* '\1f514' */ -.icon-bookmark:before { content: '🔖'; } /* '\1f516' */ -.icon-link:before { content: '🔗'; } /* '\1f517' */ -.icon-back:before { content: '🔙'; } /* '\1f519' */ -.icon-flashlight:before { content: '🔦'; } /* '\1f526' */ -.icon-chart-area:before { content: '🔾'; } /* '\1f53e' */ -.icon-clock:before { content: '🕔'; } /* '\1f554' */ -.icon-rocket:before { content: '🚀'; } /* '\1f680' */ -.icon-block:before { content: '🚫'; } /* '\1f6ab' */ \ No newline at end of file diff --git a/phpgwapi/templates/default/def_messages.less b/phpgwapi/templates/default/def_messages.less deleted file mode 100755 index f145d6f9e5..0000000000 --- a/phpgwapi/templates/default/def_messages.less +++ /dev/null @@ -1,52 +0,0 @@ -/** - * EGroupware: CSS with less preprocessor - * - * 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 Reinhardt - * @package phpgwapi - * @version $Id$ - */ - -@import (reference) "def_design_pattern_color_font_shadow.less"; -//@import "def_buttons.less"; - -.egw_fw_ui_app_header_container { - - border-width: 9px 0px 0px 9px; - border-style: solid; - .border-color-25-gray; - .background-color-25-gray; - - - - // Meldung oberhalb iFrame - .egw_fw_ui_app_header { - // display: none !important; - border-width: 0px 0px 0px 0px; - border-style: solid; - border-color: #D5DDE6; - .border_radius_button_righttop; - padding: 14px 2px 4px 15px; - font-size: 1em; - font-weight: normal; - .background-color-10-gray; - color: @egw_color_2_d; - width: 80%; - - &:before {content: "! "; color: @egw_color_1_a; font-size: 1em; } - } - - - - } - - .colselection.ui-widget-content { - width: 33%; -// margin-left: 49%; - - } \ No newline at end of file diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index c0ae643ba7..036e5b0167 100644 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -1,4 +1,4 @@ -/*@import url("traditional.css");*/ +/*@import url("api/templates/default/default.css");*/ /** * Stylite theme changes diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index caff5c6202..f74dd7042f 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -12,10 +12,6 @@ /** * addapted from orginal styles.php */ -/** - * EGroupware general def_*.less are moved to phpgwapi/templates/default/*.less - * so they can be included from app specific files and are independent of Pixelegg template - */ /** * All app_* files are now again in $app/templates/default/app.less&css and will be included independent * @@ -1021,7 +1017,6 @@ display: none !important; } } -/*@import "../../phpgwapi/templates/idots/css/traditional.css";*/ /** * EGroupware: Stylite Pixelegg template * @@ -1470,6 +1465,26 @@ div#ui-datepicker-div { .ms-ctn .ms-trigger { border-left: none; } +/** + * EGroupware: CSS with less preprocessor + + * traditional.less + * included in pixelegg.less since 17/03/2014 + + + * + * 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 + * @package phpgwapi + * @version $Id$ + */ +/* + font styling + allowed attributes: font-family,font-size,color,font-weight +*/ /** * layout_*.less files are Pixelegg template specific */ @@ -2444,6 +2459,7 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } +/*Button Ende #######################################################*/ /** * EGroupware: Stylite Pixelegg template * @@ -3371,6 +3387,10 @@ h6 { td.lettersearch { background-image: none; } +/*.nextmatch_header table { + border: none !important; + width: 99% !important; +}*/ /** * EGroupware: CSS with less preprocessor * @@ -5127,6 +5147,21 @@ button.image_button { * @package pixelegg * @version $Id$ */ +/* disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails + +//SVG Filter / not for Logo +#egw_fw_sidebar img[src$="svg"]{ + .gradient_vertical (@gray_60, @gray_60); + .rounded(3px); + border: 1px solid @gray_0;; +} + +#egw_fw_main img[src$="svg"], +#egw_fw_footer img[src$="svg"]{ + //.gradient_vertical (@egw_color_2_a, @egw_color_2_a); + .gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%)); + +}*/ /** * EGroupware: Stylite Pixelegg template * @@ -5767,7 +5802,7 @@ a.textSidebox { * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Hadi NAtegh + * @author Hadi Nategh * @package phpgwapi * @version $Id$ */ diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index 4786d29050..070fb5dd91 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -12,18 +12,6 @@ /** * addapted from orginal styles.php */ -/** - * EGroupware general def_*.less are moved to phpgwapi/templates/default/*.less - * so they can be included from app specific files and are independent of Pixelegg template - */ -//@import "../../phpgwapi/templates/idots/css/traditional.less"; -//@import "../../phpgwapi/templates/default/def_buttons.less"; -//@import "../../phpgwapi/templates/default/def_design_pattern_color_font_shadow.less"; -// next two moved to pixelegg (layouts - not definitions) -//@import "../../phpgwapi/templates/default/def_messages.less"; -//@import "../../phpgwapi/templates/default/def_content_elements.less"; -// next one disabled - not in use - (yet) -//@import "../../phpgwapi/templates/default/def_icons.less"; /** * All app_* files are now again in $app/templates/default/app.less&css and will be included independent * @@ -39,16 +27,9 @@ @import "../less/etemplate2.less"; // print ausgabe @import "../less/print.less"; -/*@import "../../phpgwapi/templates/idots/css/traditional.css";*/ @import "../less/jquery-ui.less"; @import "../less/magicsuggest.less"; @import "../less/traditional.less"; -// next one transferred to layout_chosen.less -//@import "../less/chosen.less"; -// next one sounds et2 specific, in which case it should go to etemplate ... -// ==> now transferred to layout_table.less -//@import "../less/et2_table.less"; - /** * layout_*.less files are Pixelegg template specific diff --git a/pixelegg/less/layout_tutorials.css b/pixelegg/less/layout_tutorials.css index 094cd035e3..c817fb9d95 100644 --- a/pixelegg/less/layout_tutorials.css +++ b/pixelegg/less/layout_tutorials.css @@ -7,7 +7,7 @@ * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Hadi NAtegh + * @author Hadi Nategh * @package phpgwapi * @version $Id$ */ diff --git a/pixelegg/less/layout_tutorials.less b/pixelegg/less/layout_tutorials.less index 6f5ea2d0e7..28f3a36d38 100644 --- a/pixelegg/less/layout_tutorials.less +++ b/pixelegg/less/layout_tutorials.less @@ -7,12 +7,12 @@ * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Hadi NAtegh + * @author Hadi Nategh * @package phpgwapi * @version $Id$ */ @import (reference) "definitions.less"; -@import (less) "../../phpgwapi/templates/default/def_tutorials.css"; +@import (less) "../../api/templates/default/def_tutorials.css"; span.egw_tutorial_title { color: #FFFFFF;