diff --git a/module/bug/css/x.view.css b/module/bug/css/x.view.css index 03eed93c6a..11e7188688 100644 --- a/module/bug/css/x.view.css +++ b/module/bug/css/x.view.css @@ -6,13 +6,11 @@ #mainContent .col-4 {display: none;} .modal-dialog {width: 90%;} #mainMenu {position: fixed; width: 100%; z-index: 999;} -#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;} -#wholeContent:hover{overflow: overlay;} +#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} +#scrollContent:hover{overflow: overlay;} html, body, #main, .container { height: 100%;} -#actionbox {display: none;} body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} .page-title > .label-id {min-width: 25px; line-height: 13px;} ::-webkit-scrollbar {width: 10px; height: 10px;} ::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;} -.m-bug-view:hover{overflow: overlay;} -.m-bug-view{overflow: hidden;} +.btn span{line-height: 16px; vertical-align: middle;} diff --git a/module/bug/js/x.view.js b/module/bug/js/x.view.js index 9c48ea0651..0b628edb24 100644 --- a/module/bug/js/x.view.js +++ b/module/bug/js/x.view.js @@ -28,8 +28,11 @@ $(function() xuanAction += "' + action + ""; }); - xuanAction += ''; - - $('body').append(xuanAction); + if(xuanAction != "
"){ + xuanAction += '
'; + $('body').append(xuanAction); + }else{ + $('#scrollContent').css('height', 'calc(100% - 36px)'); + } $('.xuancard-actions a.iframe').modalTrigger(); }) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index dd09dc2346..bb5d11e559 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -38,7 +38,7 @@ app->getViewType() == 'xhtml'):?> -
+
@@ -68,7 +68,9 @@ ?>
printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?> -
+ app->getViewType() != 'xhtml'):?> +
+ id"; $extraParams = "extras=bugID=$bug->id"; diff --git a/module/story/css/x.view.css b/module/story/css/x.view.css index ce9389ac43..60a94c41f8 100644 --- a/module/story/css/x.view.css +++ b/module/story/css/x.view.css @@ -7,11 +7,11 @@ .col-8>.cell {min-height: 300px;} .modal-dialog {width: 90%;} #mainMenu {position: fixed; width: 100%; z-index: 999;} -#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;} -#wholeContent:hover{overflow: overlay;} +#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} +#scrollContent:hover{overflow: overlay;} html, body, #main, .container { height: 100%;} -#actionbox {display: none;} body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} .page-title > .label-id {min-width: 25px; line-height: 13px;} ::-webkit-scrollbar {width: 10px; height: 10px;} ::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;} +.btn span{line-height: 16px; vertical-align: middle;} \ No newline at end of file diff --git a/module/story/js/x.view.js b/module/story/js/x.view.js index 4bc8e30157..f7b27cba61 100644 --- a/module/story/js/x.view.js +++ b/module/story/js/x.view.js @@ -29,7 +29,11 @@ $(function() xuanAction += "' + action + ""; }); - xuanAction += '
'; - $('body').append(xuanAction); + if(xuanAction != "
"){ + xuanAction += '
'; + $('body').append(xuanAction); + }else{ + $('#scrollContent').css('height', 'calc(100% - 36px)'); + } $('.xuancard-actions a.iframe').modalTrigger(); }) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 078ecc8a8f..69772a6eed 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -63,7 +63,7 @@
app->getViewType() == 'xhtml'):?> -
+
@@ -184,7 +184,9 @@
printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?> + app->getViewType() != 'xhtml'):?>
+
diff --git a/module/task/css/x.view.css b/module/task/css/x.view.css index 35671ec69b..e5a29e584d 100644 --- a/module/task/css/x.view.css +++ b/module/task/css/x.view.css @@ -7,13 +7,11 @@ .col-8 > .cell {min-height: 300px;} .modal-dialog {width: 90%;} #mainMenu {position: fixed; width: 100%; z-index: 999;} -#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;} -#wholeContent:hover{overflow: overlay;} +#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} +#scrollContent:hover{overflow: overlay;} html, body, #main, .container { height: 100%;} -#actionbox {display: none;} body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} .page-title > .label-id {min-width: 25px; line-height: 13px;} ::-webkit-scrollbar {width: 10px; height: 10px;} ::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;} -.m-task-view:hover{overflow: overlay;} -.m-task-view{overflow: hidden;} +.btn span{line-height: 16px; vertical-align: middle;} diff --git a/module/task/js/x.view.js b/module/task/js/x.view.js index 52c944d43c..c13caa5b5b 100644 --- a/module/task/js/x.view.js +++ b/module/task/js/x.view.js @@ -28,7 +28,11 @@ $(function() xuanAction += "' + action + ""; }); - xuanAction += '
'; - $('body').append(xuanAction); + if(xuanAction != "
"){ + xuanAction += '
'; + $('body').append(xuanAction); + }else{ + $('#scrollContent').css('height', 'calc(100% - 36px)'); + } $('.xuancard-actions a.iframe').modalTrigger(); }) diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index d409b0fbcd..7b5b8be611 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -47,7 +47,7 @@
app->getViewType() == 'xhtml'):?> -
+
@@ -153,7 +153,9 @@ ?>
printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?> + app->getViewType() != 'xhtml'):?>
+
diff --git a/www/theme/default/x.style.css b/www/theme/default/x.style.css index cc2bbff026..ba7f5b51ea 100644 --- a/www/theme/default/x.style.css +++ b/www/theme/default/x.style.css @@ -8,5 +8,5 @@ body{padding:0px; margin: 0px;background-color: #fff;} #mainContent .cell{box-shadow:none; -webkit-box-shadow: none;} .xuanxuan-card{padding-bottom:55px;} -.xuancard-actions{width: 100%;text-align: center; padding: 10px 0;} -.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999; box-shadow: 0 -2px 10px rgba(0,0,0,0.15);} +.xuancard-actions{width: 100%;text-align: center; height: 34px;} +.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999;}