Merge branch 'sprint/247_wzm_important' into 'master'

* fix bug 28395  && change important theme color

See merge request easycorp/zentaopms!5731
This commit is contained in:
李玉春
2022-10-13 00:53:30 +00:00
7 changed files with 9 additions and 10 deletions
+1 -2
View File
@@ -10,5 +10,4 @@
#taskList .c-progress{padding-right: 8px; text-align: right;}
#datatable-taskList .c-progress{padding-right: 8px; text-align: right;}
.c-finishedBy, .c-lastEditedBy {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
#executionTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
#executionTaskForm table thead th[data-width="auto"] {width: unset;}
#executionTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
+1 -1
View File
@@ -11,7 +11,7 @@ $(function()
var $title = $('#storyList thead th.c-title');
var headerWidth = $('#storyList thead th.c-title a').innerWidth();
var buttonWidth = $('#storyList thead th.c-title button').innerWidth();
if($title.width() < headerWidth + buttonWidth) $title.width(headerWidth + buttonWidth + 10);
if($title.width() < headerWidth + buttonWidth) $title.width(headerWidth + buttonWidth + 20);
});
$('#storyList td.has-child .story-toggle').each(function()
-1
View File
@@ -41,7 +41,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
.btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
#productStoryForm table thead th[data-width="auto"] {width: unset;}
#productStoryForm table tbody tr td.c-actions {overflow: visible;}
#productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
</style>