Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'

Browse Source 
* fix scroll bar css invalid after merge

See merge request easycorp/zentaopms!582
This commit is contained in:
王怡栋
2021-11-22 08:15:47 +00:00
parent 4801bd8ea7 f5d89fee3d
commit 6b32de5910
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/bug/css/x.view.css
View File

@@ -6,12 +6,13 @@
#mainContent .col-4 {display: none;}
.modal-dialog {width: 90%;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#wholeContent {margin-top: 35px; height: calc(100% - 75px); display: block; overflow-y: auto;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent: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;}
::-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;}

9
module/story/css/x.view.css
View File

@@ -7,12 +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% - 75px); display: block; overflow-y: auto;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent: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-story-view:hover{overflow: overlay;}
.m-story-view{overflow: hidden;}
::-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;}

7
module/task/css/x.view.css
View File

@@ -7,12 +7,13 @@
.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% - 75px); display: block; overflow-y: auto;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent: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;}
::-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;}