diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index 4920baa87..5832cf013 100644 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -16,7 +16,7 @@ leimnud.Package.Public({ this.uid = this.parent.tools.createUID(); this.zIndex = 0; this.stepZindex = 5; - this.controlSize= {w:13,h:13}; + this.controlSize= {w:15,h:15}; this.elements = {}; this.setStyle = {}; this.events = {}; diff --git a/gulliver/js/maborak/core/stylesheet/default.css b/gulliver/js/maborak/core/stylesheet/default.css index 765350a48..4e98b5a58 100755 --- a/gulliver/js/maborak/core/stylesheet/default.css +++ b/gulliver/js/maborak/core/stylesheet/default.css @@ -350,6 +350,8 @@ INPUT { border: 1px solid #C0C0C0; border: 1px solid #1983BD; border: 1px solid #66667E; + border:1px solid #AAA; + oveflow:hidden; /*border: 1px solid #5394BF; border-left:1px solid #8BBDDF; @@ -398,8 +400,7 @@ INPUT { height:23px; overflow:hidden; background-color:white; - background-image: url('/images/panel_title.jpg'); - background-image: url('../images/panel.bg.title.1x23.gif'); + background-image:url("/skins/ext/images/gray/window/top-bottom.png"); background-repeat:repeat-x; background-position:0px -1px; border-bottom:0px solid #DBE0E5; @@ -415,6 +416,8 @@ INPUT { padding-left: 5px; padding-top: 5px; z-index: 1; + text-shadow:#fff 0px 1px 1px; + color:#444; } .panel_close___processmaker{ position:absolute; @@ -424,7 +427,7 @@ INPUT { border:0px solid red; z-index:2; cursor:pointer; - background:url(../images/panel.close.static.gif); + background:url("/skins/ext/images/gray/panel/tool-sprites.gif") 0 0 no-repeat; } .panel_roll___processmaker{ position:absolute; diff --git a/workflow/engine/templates/cases/css/extjs-extend/xtheme-gray.css b/workflow/engine/templates/cases/css/extjs-extend/xtheme-gray.css index cb8ae17be..6ede6b2e1 100755 --- a/workflow/engine/templates/cases/css/extjs-extend/xtheme-gray.css +++ b/workflow/engine/templates/cases/css/extjs-extend/xtheme-gray.css @@ -21,14 +21,14 @@ .x-tree-node-icon{ width:18px !important; - background-image:url( /images/icons_silk/sprites.gif.png); + background-image:url( /images/icons_silk/sprites.png); height:18px; } .ICON_FOLDERS { /*.ss_folder_explore*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -7777px !important; } @@ -46,32 +46,32 @@ .ICON_CASES_INBOX { /*ss_folder_page*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -7957px !important; } .ICON_CASES_DRAFT { /*ss_pencil*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -12439px !important; } .ICON_CASES_SENT { /*ss_page_white_go*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -11773px !important; } .ICON_CASES_SELFSERVICE { /*ss_arrow_rotate_anticlockwise */ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -955px !important; } .ICON_CASES_PAUSED { /*ss_clock*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; - background-position:0 -4033px !important; + background-image:url( /images/icons_silk/sprites.png) !important; + background-position:0px -4969px !important; } .ICON_CASES_COMPLETED { @@ -84,7 +84,7 @@ .ICON_CASES_FOLDERS { /*ss_report */ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -13213px !important; } @@ -95,41 +95,41 @@ } .ICON_CASES_SEARCH { /*ss_page_find*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -11089px !important; } .ICON_ADMIN { /*ss_user_suit*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -17371px !important; } .ICON_CASES_TO_REVISE { /*ss_page_white_magnify*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -11881px !important; } .ICON_CASES_TO_REASSIGN { /*ss_arrow_rotate_clockwise*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -973px !important; } .ICON_CASES_START_PAGE { /*ss_chart_pie*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -3925px !important; } .ICON_CASES_START_CASE { /*ss_add*/ - background-image:url( /images/icons_silk/sprites.gif.png) !important; + background-image:url( /images/icons_silk/sprites.png) !important; background-position:0 -19px !important; } .ICON_CASES_HOME { /*ss_house*/ - background-image:url(/images/icons_silk/sprites.gif.png) !important; + background-image:url(/images/icons_silk/sprites.png) !important; background-position:0 -8497px !important; } @@ -179,8 +179,8 @@ } .x-grid3-row:nth-child(odd) { background-color:#FFF; } .x-grid3-row:nth-child(even) { background-color:#F6F6F6; } -.x-grid3-row-over{ - background: #E0EAEF !important; +.x-grid3-row.x-grid3-row-over{ + background: #E0EAEF; cursor: pointer; } .x-grid3-hd-inner{ @@ -196,9 +196,8 @@ .x-grid3-col-openLink a:after{ content:''; } - -.x-grid3-row-selected{ - background-color:#F6E095 !important; +.x-grid3-row.x-grid3-row-selected{ + background-color:#F6E095; } /*Checkboxes*/ .grid_with_checkbox .x-grid3-header-offset{ @@ -262,11 +261,11 @@ Pone en mayúsuclas el texto que se encuentra en el toolbar de arriba } /*Cambiamos el menos y más*/ #ext-gen38.x-tree-root-ct .x-tree-elbow-minus,#ext-gen38.x-tree-root-ct .x-tree-elbow-end-minus{ - background-image:url(/images/icons_silk/sprites.gif.png) !important; + background-image:url(/images/icons_silk/sprites.png) !important; background-position:0 -2395px !important; } #ext-gen38.x-tree-root-ct .x-tree-elbow-plus,#ext-gen38.x-tree-root-ct .x-tree-elbow-end-plus{ - background-image:url(/images/icons_silk/sprites.gif.png) !important; + background-image:url(/images/icons_silk/sprites.png) !important; background-position:0 -2359px !important; } /*Item selecciondo en el TREE*/ @@ -315,10 +314,7 @@ Pone en mayúsuclas el texto que se encuentra en el toolbar de arriba } /*STARTCASE RIGHT PANEL*/ - -#process-detail-panel .details{ - -} +#process-detail-panel .details{} #process-detail-panel .details .details-info{ padding:10px; } @@ -328,12 +324,12 @@ Pone en mayúsuclas el texto que se encuentra en el toolbar de arriba .icon-expand-all{ /*ss_bullet_toggle_plus*/ - background-image:url(/images/icons_silk/sprites.gif.png) !important; + background-image:url(/images/icons_silk/sprites.png) !important; background-position:0 -2359px !important; } .icon-collapse-all{ /*ss_bullet_toggle_minus*/ - background-image:url(/images/icons_silk/sprites.gif.png) !important; + background-image:url(/images/icons_silk/sprites.png) !important; background-position:0 -2395px !important; } #startCaseTreePanel .x-tree-elbow-end-minus, diff --git a/workflow/public_html/images/icons_silk/sprite.css b/workflow/public_html/images/icons_silk/sprite.css index fea4df89c..ec9e057ef 100644 --- a/workflow/public_html/images/icons_silk/sprite.css +++ b/workflow/public_html/images/icons_silk/sprite.css @@ -1,117 +1,41 @@ /* * Blue is the new Green */ -.FormTitle,.FormSubTitle{ - background:#E0E7EF !important; - border-bottom:1px solid #C3D1DF; -} -.FormFieldContent{ - text-align: left; -} - - -.FormTitle .FormTitle{ - border:none; -} -form.formDefault .FormFieldContent{ - background-color:#f9f9f9; -} -form.formDefault .FormTitle { - font-size:11px; -} - +/* form.formDefault .FormTitle,form.formDefault .FormSubTitle{ - color:#333; - text-shadow:0 1px 0px rgba(255,255,255,1); - padding-left:5px; - font-weight: 700; + background:#E0E7EF; } +.pagedTableDefault .pagedTable .RowPointer +{ + background-color:#E0EAEF; +} +.x-grid3-row.x-grid3-row-over{ + background: #E0EAEF; +} +.x-grid3-row.x-grid3-row-selected{ + background-color:#F6E095; +} +*/ - -.pagedTable tr{ - padding:3px 0; -} -.pagedTableDefault .pagedTable .RowLink{ - /*background:#8E9EAF !important;*/ - background:none; -} -.module_app_input___gray{ - max-width: 400px; -} -/*Texto en ExtJS*/ -.x-btn-text,.xtb-text{ - color:#333; - /*text-shadow:0 1px 0px rgba(255,255,255,1);*/ -} -.x-btn-pressed .x-btn-text{ - color:#000; -} -/*Tabs con ícono en EXT*/ -.x-tab-strip span.x-tab-strip-text{ - padding:4px 0; - font-weight: normal; -} -.ext-gecko .x-tab-strip span.x-tab-strip-text, -.ext-webkit .x-tab-strip span.x-tab-strip-text{ - height:12px; -} - - -/*Tablas (archivos adjuntos)*/ -.pagedTableDefault .pagedTable .pagedTableHeader{ - /*para la imagen*/ - text-align: center; -} -.pagedTableDefault .pagedTable .pagedTableHeader a{ - font-size:11px; - font-weight: bold; - color:#666; - text-shadow:#fff 0px 1px 1px; - text-align: left; - display:block; -} /*Menu Principal*/ -.mainMenuBG{ - background-image: url("/skins/ext/images/gray/toolbar/bg.gif") !important; -} #pm_main_table .mainMenuBG{ border-top:2px solid #b1cedb; background-color:#347898; - background-image:none !important; + background-image:none; background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0, rgb(74,149,184)), color-stop(0.97, rgb(46,112,143)) - ) !important; + ); background-image: -moz-linear-gradient( center bottom, rgb(74,149,184) 0%, rgb(46,112,143) 97% - ) !important; + ); } - -.panel_containerWindow___processmaker{ - border:1px solid #AAA; -} -.panel_titleBar___processmaker{ - background-image:url("/skins/ext/images/gray/window/top-bottom.png") !important; -} - -.panel_close___processmaker{ - background:url("/skins/ext/images/gray/panel/tool-sprites.gif") 0 0 no-repeat !important; - height:15px !important; - width:15px !important; -} -.panel_title___processmaker,.x-panel-header-text,.panel_title___processmaker{ - text-shadow:#fff 0px 1px 1px; - color:#444; -} - - - ul#pm_menu{ list-style: none; margin:0; @@ -141,8 +65,6 @@ ul#pm_menu li.SelectedMenu,ul#pm_menu li:hover{ ul#pm_menu li.SelectedMenu a,ul#pm_menu li:hover a{ color:#333; } - - ul#pm_submenu{ list-style: none; margin:0; @@ -173,28 +95,23 @@ ul#pm_submenu li.SelectedSubMenu a,ul#pm_submenu li:hover a{ color:#333; } -.pagedTableDefault .pagedTable .RowLink a{ - display:block; -} -.pagedTableDefault .pagedTable .pagedTableHeader{ -background-color:#F2F2F2; -background-image:url("/skins/ext/images/gray/grid/grid3-hrow2.gif"); -/*height:22px;*/ -background-position: bottom; + +ul#pm_menu a:focus,button.x-btn-text:focus,.x-combo-selected{ + -moz-outline-style:none; + outline:none; } -/*Los botones de EXT solamente s even inguales en los x-form*/ -.x-window button.x-btn-text,.x-form-label-right button.x-btn-text,.x-form button.x-btn-text{ - color:#333; - font-size:10px; - font-weight:400; -} - .x-window .x-btn-small,.x-form-label-right .x-btn-small,.x-form .x-btn-small{ - -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2); - -webkit-box-shadow:0 1px 2px rgba(0,0,0,0.2); +input::-moz-focus-inner { border: 0; } +button::-moz-focus-inner { border: 0; } + +.module_app_input___gray{ + max-width: 400px; } -.pagedTableDefault .pagedTable .RowLink a,.module_app_button___gray,.button_pm,.module_app_buttonjs___gray{/**/ + + +/*Botones*/ +.pagedTableDefault .pagedTable .RowLink a,.module_app_button___gray,.button_pm,.module_app_buttonjs___gray,.module_app_buttonDisabled___gray{ -moz-border-radius:4px; border-radius:4px; -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2); @@ -214,40 +131,12 @@ background-position: bottom; cursor:pointer; border:1px solid #aaa; background:url("/skins/ext/images/gray/button/btn.gif") repeat-x scroll 0 -1096px transparent; - - /* - background-image:-webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(225,225,225)), - color-stop(0.5, rgb(245,245,245)) - );background-image: - -moz-linear-gradient( - center bottom, - rgb(225,225,225) 0%, - rgb(245,245,245) 50% - );*/ } -.pagedTableDefault .pagedTable .RowLink a:hover,.module_app_button___gray:hover,.button_pm:hover,.module_app_buttonHover___gray{/**/ +.pagedTableDefault .pagedTable .RowLink a:hover,.module_app_button___gray:hover,.button_pm:hover,.module_app_buttonHover___gray{ background-color:#AAA; border:1px solid #666; background:url("/skins/ext/images/gray/button/btn.gif") repeat-x scroll 0 -2168px transparent; - /* - background-position: 0 0; - background-image:-webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(239,239,239)), - color-stop(0.5, rgb(225,225,225)) - );background-image: - -moz-linear-gradient( - center bottom, - rgb(239,239,239) 0%, - rgb(225,225,225) 50% - );*/ } .pagedTableDefault .pagedTable .RowLink a:focus,.module_app_button___gray:focus,.button_pm:focus{/*,*/ border:1px solid #45626F; @@ -257,18 +146,18 @@ background-position: bottom; display:none; margin:0; } -ul#pm_menu a:focus,button.x-btn-text:focus,.x-combo-selected{ - -moz-outline-style:none !important; - outline:none !important; +.module_app_buttonDisabled___gray{ + border:1px solid #bbb; + background-position:0 -3240px; + color:#9f9f9f; + cursor:default; } - -.panel_statusButtons___processmaker input{ - margin:0 5px 3px !important; +.module_app_buttonDisabled___gray:hover{ + background:url("/skins/ext/images/gray/button/btn.gif") repeat-x scroll 0 -3240px transparent; } -input::-moz-focus-inner { border: 0; } -button::-moz-focus-inner { border: 0; } + /* Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/ */ @@ -526,6 +415,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/ .ss_computer_key{background-position:0px -4681px !important} .ss_computer_link{background-position:0px -4699px !important} .ss_connect{background-position:0px -4717px !important} +.ss_control_pause{background-position:0px -4969px !important} .ss_controller{background-position:0px -5185px !important} .ss_controller_add{background-position:0px -5203px !important} .ss_controller_delete{background-position:0px -5221px !important} diff --git a/workflow/public_html/skins/ext/pmos-xtheme-gray.css b/workflow/public_html/skins/ext/pmos-xtheme-gray.css index de71aaa44..ce67d41b0 100644 --- a/workflow/public_html/skins/ext/pmos-xtheme-gray.css +++ b/workflow/public_html/skins/ext/pmos-xtheme-gray.css @@ -250,4 +250,37 @@ .x-locationbar .x-btn-pressed .x-btn-center, .x-locationbar .x-btn-menu-active .x-btn-center { background:transparent url(/skins/ext/images/gray/locationbar/tb-btn-sprite.gif) repeat-x scroll 0pt -105px; +} + +/*Los botones de EXT solamente s even iguales en los x-form*/ +.x-window button.x-btn-text,.x-form-label-right button.x-btn-text,.x-form button.x-btn-text{ + color:#333; + font-size:10px; + font-weight:400; +} + .x-window .x-btn-small,.x-form-label-right .x-btn-small,.x-form .x-btn-small{ + -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2); + -webkit-box-shadow:0 1px 2px rgba(0,0,0,0.2); +} + +.x-panel-header-text{ + text-shadow:#fff 0px 1px 1px; + color:#444; +} + +/*Texto en ExtJS*/ +.x-btn-text,.xtb-text{ + color:#333; +} +.x-btn-pressed .x-btn-text{ + color:#000; +} +/*Tabs con ícono en EXT*/ +.x-tab-strip span.x-tab-strip-text{ + padding:4px 0; + font-weight: normal; +} +.ext-gecko .x-tab-strip span.x-tab-strip-text, +.ext-webkit .x-tab-strip span.x-tab-strip-text{ + height:12px; } \ No newline at end of file diff --git a/workflow/public_html/skins/ext/xtheme-gray.css b/workflow/public_html/skins/ext/xtheme-gray.css index b5c13f7f1..d24048650 100755 --- a/workflow/public_html/skins/ext/xtheme-gray.css +++ b/workflow/public_html/skins/ext/xtheme-gray.css @@ -628,7 +628,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as } .x-grid3-row-selected { - background-color:#CCCCCC !important; + background-color:#CCCCCC; background-image: none; border-color:#ACACAC; } diff --git a/workflow/public_html/skins/green/style.css b/workflow/public_html/skins/green/style.css index 5ef179aa5..acb0784a5 100644 --- a/workflow/public_html/skins/green/style.css +++ b/workflow/public_html/skins/green/style.css @@ -320,7 +320,7 @@ span.XtreeMinus:hover /* Menues */ TD.mainMenuBG { - background-image: url(/skins/green/images/bm.jpg); + background-image: url(/skins/ext/images/gray/toolbar/bg.gif); background-repeat: repeat-x; height: 25px; left: 46px; @@ -675,6 +675,9 @@ form.formDefault .FormFieldContent color:#000; background-color:#EFEFEF; padding-left:5px; + text-align: left; + background-color:#f9f9f9; + font-size:11px; } form.formDefault textarea.FormTextArea { @@ -697,11 +700,13 @@ form.formDefault .FormTitle color:#000; padding-left:5px; font-weight:bold; - background-color:#E0EFE6; + background:#E0E7EF; + border-bottom:1px solid #C3D1DF; + } form.formDefault .FormSubTitle { - background-color:#D1DEDF; + background:#E0E7EF; color:black; } form.formDefault .FormButton @@ -725,6 +730,15 @@ form.formDefault td.withoutLabel, form.formDefault td.withoutLabel table td padding:0px; height:8px; } +.FormTitle .FormTitle{ + border:none; +} +form.formDefault .FormTitle,form.formDefault .FormSubTitle{ + color:#333; + text-shadow:0 1px 0px rgba(255,255,255,1); + padding-left:5px; + font-weight: 700; +} /* form END */ /* formSearch BEGIN */ @@ -778,6 +792,7 @@ form.formSearch .FormFieldContent background-color:#EFEFEF; padding-left:5px; width:60%; + text-align: left; } form.formSearch .Record @@ -870,22 +885,30 @@ font-weight:bold; .pagedTableDefault .pagedTable .pagedTableHeader { border-bottom:0px solid #DFDFDF; - background-color:#E0E9EF; background-color:#6F7F75; color:#5B5B5B; font-weight:bold; - background-image:url(/js/maborak/core/images/silverBackgroundTableTitle.jpg); background-repeat:repeat-x; height:26px; padding:0px; overflow:hidden; + text-align: center; + background-color:#F2F2F2; + background-image:url("/skins/ext/images/gray/grid/grid3-hrow2.gif"); + background-position: bottom; + } .pagedTableDefault .pagedTable .pagedTableHeader a { text-decoration:none; - color:#5B5B5B; padding-left:5px; font:normal 8pt Tahoma, sans-serif,MiscFixed; + font-size:11px; + font-weight: bold; + color:#666; + text-shadow:#fff 0px 1px 1px; + text-align: left; + display:block; } .pagedTableDefault .pagedTable .pagedTableHeader a:hover { @@ -919,9 +942,16 @@ font-weight:bold; /*Fin Adicion Rube*/ .pagedTableDefault .pagedTable .RowLink { - background-color:#6F7F75; + /*background-color:#6F7F75;*/ text-align :center; } +.pagedTable tr{ + padding:3px 0; +} +.pagedTableDefault .pagedTable .RowLink a{ + display:block; +} + A.firstPage { background-image: url('/images/firstPage.gif'); background-repeat: no-repeat; @@ -1009,7 +1039,7 @@ div.pattern .FormTitle { font-weight:bold; color: black; - background-color:#E0EFE6; + /*background-color:#E0EFE6;*/ padding:2px; } @@ -1154,7 +1184,7 @@ div.treeParent .FormTitle font:normal 11px sans-serif,MiscFixed;*/ font-weight:bold; color: black; - background-color:#E0EFE6; + /*background-color:#E0EFE6;*/ padding:2px; } /* TreeParent END */