From e70a9157d242265bbe634d8ce2f9a89bb3c0a1de Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Thu, 2 Dec 2021 11:08:41 +0800 Subject: [PATCH] * fix different screen scale cause element display different,use scroll bar --- module/bug/css/x.browse.css | 7 +++++-- module/execution/css/x.bug.css | 13 +++++++++---- module/execution/css/x.story.css | 7 +++++-- module/execution/css/x.task.css | 7 +++++-- module/product/css/x.browse.css | 7 +++++-- module/productplan/css/x.view.css | 6 ++++-- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/module/bug/css/x.browse.css b/module/bug/css/x.browse.css index bf6c77e47c..21c6eddfeb 100644 --- a/module/bug/css/x.browse.css +++ b/module/bug/css/x.browse.css @@ -5,11 +5,14 @@ .dropdown {display: none;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} -#main {min-width: unset;} +#main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} .pager > li > .pager-size-menu {display: none;} .table-footer > .table-actions {display: none;} .table-footer{position: fixed; width: 100%; bottom: 0;} .linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} \ No newline at end of file +.main-table a {pointer-events: none; color: unset !important;} +.table-responsive {margin-bottom: unset;} +::-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;} \ No newline at end of file diff --git a/module/execution/css/x.bug.css b/module/execution/css/x.bug.css index 2b68024c6a..18fd094332 100644 --- a/module/execution/css/x.bug.css +++ b/module/execution/css/x.bug.css @@ -5,12 +5,17 @@ .dropdown {display: none;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} -#main {min-width: unset;} +#main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} .pager > li > .pager-size-menu {display: none;} .table-footer > .table-actions {display: none;} -.table-footer{position: fixed; width: 100%; bottom: 0;} -.c-status {width: 70px;} +.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;} +.table-footer .pager:before {display: none !important;} +.table-footer .pager {background-color: #fff !important;} +.table-footer .pager li *{color: #838a9d !important;} .linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} \ No newline at end of file +.main-table a {pointer-events: none; color: unset !important;} +.table-responsive {margin-bottom: unset;} +::-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;} \ No newline at end of file diff --git a/module/execution/css/x.story.css b/module/execution/css/x.story.css index 6c85521631..5ed751d763 100644 --- a/module/execution/css/x.story.css +++ b/module/execution/css/x.story.css @@ -6,7 +6,7 @@ .dropdown {display: none;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} -#main {min-width: unset;} +#main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} .pager > li > .pager-size-menu {display: none;} @@ -21,4 +21,7 @@ body {margin-bottom: 0px !important;} .table-footer .pager {background-color: #fff !important;} .table-footer .pager li *{color: #838a9d !important;} .linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} \ No newline at end of file +.main-table a {pointer-events: none; color: unset !important;} +.table-responsive {margin-bottom: unset;} +::-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;} \ No newline at end of file diff --git a/module/execution/css/x.task.css b/module/execution/css/x.task.css index 2b876d5573..18fd094332 100644 --- a/module/execution/css/x.task.css +++ b/module/execution/css/x.task.css @@ -5,7 +5,7 @@ .dropdown {display: none;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} -#main {min-width: unset;} +#main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} .pager > li > .pager-size-menu {display: none;} @@ -15,4 +15,7 @@ body {margin-bottom: 0px !important;} .table-footer .pager {background-color: #fff !important;} .table-footer .pager li *{color: #838a9d !important;} .linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} \ No newline at end of file +.main-table a {pointer-events: none; color: unset !important;} +.table-responsive {margin-bottom: unset;} +::-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;} \ No newline at end of file diff --git a/module/product/css/x.browse.css b/module/product/css/x.browse.css index 2b876d5573..18fd094332 100644 --- a/module/product/css/x.browse.css +++ b/module/product/css/x.browse.css @@ -5,7 +5,7 @@ .dropdown {display: none;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} -#main {min-width: unset;} +#main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} .pager > li > .pager-size-menu {display: none;} @@ -15,4 +15,7 @@ body {margin-bottom: 0px !important;} .table-footer .pager {background-color: #fff !important;} .table-footer .pager li *{color: #838a9d !important;} .linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} \ No newline at end of file +.main-table a {pointer-events: none; color: unset !important;} +.table-responsive {margin-bottom: unset;} +::-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;} \ No newline at end of file diff --git a/module/productplan/css/x.view.css b/module/productplan/css/x.view.css index 26bc171ab4..22ff8ce82a 100644 --- a/module/productplan/css/x.view.css +++ b/module/productplan/css/x.view.css @@ -1,7 +1,7 @@ .main-content{padding: 0;} .actions{display: none;} #mainMenu{display: none;} -#main {min-width: unset;} +#main {min-width: unset; height:407px; overflow-y: overlay;} .pager-size-menu{display: none;} .table-footer{position: fixed; width: 100%; bottom: 0;} .tab-btn-container{width: 100%; background-color: #f2f2f2;} @@ -9,4 +9,6 @@ .tab-btn-container ul li{list-style: none;} .plan-title{position: absolute; top: 0; left: 0; padding: 8px 15px; font-weight: bolder;} .tab-btn-container ul li span{display: none;} -.tab-btn-container ul li.active span{display: inline-block;} \ No newline at end of file +.tab-btn-container ul li.active span{display: inline-block;} +::-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;} \ No newline at end of file