diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css index fd491a5342..eb2e06adff 100644 --- a/module/doc/css/tablecontents.css +++ b/module/doc/css/tablecontents.css @@ -16,7 +16,7 @@ .tail-info, .doc-title, span.item {background: #fff;} span.item>a {padding-left: 6px;} span.dotted-line+a {display: block;} -#modules li.doc:before, .chapterNode:before, .independent:before {content: " "; width: 100%; border-bottom: 1px dashed #b5b9c5; position: absolute; top: 50%; right: 0; left: 30px;} +#modules li.doc:before, .chapterNode:before, .independent:before {content: " "; width: 100%; border-bottom: 1px dashed #b5b9c5; position: absolute; top: 13px; right: 0; left: 30px;} .doc-title {display: inline-block !important; position: relative; padding-right: 10px;} .tree li.has-list.open:before {content: unset;} i.icon-file-text {color: #D0D2D6; font-size: 14px;} diff --git a/module/index/css/index.css b/module/index/css/index.css index 1751aafe4c..a80e9627e8 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -77,8 +77,9 @@ body.menu-hide {padding-left: 0;} #searchbox .dropdown-menu.show-quick-go > li {padding: 0 5px;} #searchbox .dropdown-menu {min-width: 150px;} -#globalSearchInput {width: 150px; height: 28px; padding-left: 10px; border-right: 0px;} +#globalSearchInput {height: 28px; padding-left: 10px; border-right: 0px;} #globalSearchButton {height: 28px;} +#globalSearchButton > i {position: relative; top: -2px} #globalBarLogo {width: 100%; float: right;} #globalBarLogo a:first-child {margin-right: 10px;} diff --git a/module/program/control.php b/module/program/control.php index 0efabdc13c..c9de21ca0f 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -28,7 +28,7 @@ class program extends control */ public function browse($status = 'all', $orderBy = 'order_asc') { - if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), " " . $this->lang->program->create, '', "class='btn btn-primary'"); + if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), " " . $this->lang->program->create, '', "class='btn btn-secondary'"); $this->session->set('programList', $this->app->getURI(true), 'program'); $this->session->set('projectList', $this->app->getURI(true), 'project'); diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php index 1003efc783..19899e96cb 100644 --- a/module/program/view/browse.html.php +++ b/module/program/view/browse.html.php @@ -27,9 +27,9 @@
config->maxVersion)):?> - ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?> + ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?> config->systemMode == 'new'):?> - ' . $lang->project->create, '', 'class="btn btn-secondary"');?> + ' . $lang->project->create, '', 'class="btn btn-primary"');?> pageActions)) echo $lang->pageActions;?>
diff --git a/module/project/css/browse.css b/module/project/css/browse.css index 981f7ce037..e9b0c65e54 100644 --- a/module/project/css/browse.css +++ b/module/project/css/browse.css @@ -10,48 +10,3 @@ td.c-actions {overflow: visible;} #switchButton {background: #fff !important;} .panel-actions {position: relative; padding: 0 0;} .icon-cards-view {padding-left: 7px;} - -#cards {margin: 0 0;} -#cards > .col {width: 25%;} -#cards .panel {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 4px; box-shadow: none; cursor: pointer; height: 170px;} -#cards .pager .btn {padding-top: 4px;} -#cards .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);} -#cards .panel .projectStatus .label{float: right;} -#cards .panel-heading {padding: 12px 24px 10px 16px;} -#cards .panel-body {padding: 0 16px 16px;} -#cards .project-type-label {padding: 1px 0px;} -#cards .icon {font-size: 8px;} -#cards .project-name {font-size: 14px; display: inline-block; max-width: 70%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle;} -#cards .project-infos {font-size: 12px;} -#cards .project-infos > span {display: inline-block; line-height: 12px; border: 1px solid #E4E9F7;} -#cards .project-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px} -#cards .project-infos > span + span {margin-left: 15px;} -#cards .project-infos > .budget {max-width: 75px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} -#cards .project-detail {position: absolute; top: 75px; left: 16px; right: 16px; font-size: 12px;} -#cards .project-footer {position: absolute; bottom: 5px;} -#cards .pager {margin: 0; float: right;} -#cards .pager .btn {border: none} -#cards .panel .label-wait {background: #EFEFEF !important; color: #838A9D;} -#cards .panel .label-doing {background: #E9F2FB !important; color: #2B80FF;} -#cards .panel .label-suspended {background: #AAA !important; color: #FFF;} -#cards .panel .label-closed {background: #D4F7F9 !important; color: #00A78E;} -#cards .panel .label-delay {background: #F85A40 !important; color: #FFF;} -#cards .project-infos .text-red {color: #F85A40 !important;} -#cards .project-detail .progress-pie {width: 24px; position: absolute; top: 5px;} -#cards .project-detail .col-xs-4 {width: 70px;} -#cards .project-members {float: left;} -#cards .project-members .avatar {display: inline-block; width: 25px; height: 25px; line-height: 25px;} -#cards .project-members .avatar:not(:first-child) {margin-left: -15px;} -#cards .project-members .avatar:first-child {z-index: 500;} -#cards .project-members .avatar:nth-child(2) {z-index: 400;} -#cards .project-members .avatar:nth-child(3) {z-index: 300;} -#cards .project-members .avatar:nth-child(4) {z-index: 200;} -#cards .project-members .avatar:nth-child(5) {z-index: 100;} -#cards .project-members .moreMembers{display: inline-block; margin-left: 6px; position: absolute; bottom: 8px;} -#cards .project-actions {float: right;} -#cards .project-actions .menu-actions {padding-right: 20px;} -#cards .project-actions ul {min-width: 35px; padding: 5px 6px;} -#cards .project-actions .dropdown-hover:hover>.dropdown-menu ul, -#cards .project-actions .open>.dropdown-menu ul {display: flex;} -#cards .menu-actions .btn.btn-action {margin-bottom: -3px !important; margin-right: 5px;} -#cards .icon-ellipsis-v {font-size: 13px;} diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php index c88631f78a..b2b2feec1c 100644 --- a/module/project/view/browsebycard.html.php +++ b/module/project/view/browsebycard.html.php @@ -10,6 +10,52 @@ * @link https://www.zentao.net */ ?> +