diff --git a/module/mr/css/diff.css b/module/mr/css/diff.css index e06c5ca054..ae73402c63 100644 --- a/module/mr/css/diff.css +++ b/module/mr/css/diff.css @@ -9,7 +9,7 @@ table.diff {margin-bottom: 0px;} .diff .line-new, .diff .line-new {background: #CFC;} .diff .line-old, .diff .line-old {background: #FCC;} .diff .line-all, .diff .line-all {background: #FFF;} -.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;} +.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; background: #fafafa; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;} .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;} .repoCode .diff tr.over td.line-new, .repoCode .diff tr.over td.line-new {background: #8eff8e;} diff --git a/module/repo/css/blame.css b/module/repo/css/blame.css index 77e1eacc1f..d5e6bc17c5 100644 --- a/module/repo/css/blame.css +++ b/module/repo/css/blame.css @@ -7,5 +7,5 @@ .topLine {border-top: 1px solid #ccc;} .topLine td.info {padding: 8px 4px;} pre {margin-bottom: 0px; display: block; white-space: pre-wrap; padding: 0px 3px; border: 0px; background: none;} -.line {font-weight: bold; border: 1px solid #E4E4E4; background-color: #ECECEC; text-align: right;} +.line {font-weight: bold; border: 1px solid #E4E4E4; background-color: #fafafa; color: #999; text-align: center;} .panel-actions.pull-right {margin-top: -5px;} diff --git a/module/repo/css/common.css b/module/repo/css/common.css index 639fb35b57..bc5b019850 100644 --- a/module/repo/css/common.css +++ b/module/repo/css/common.css @@ -4,10 +4,9 @@ a:hover, a:active {text-decoration:underline; color: #C61A1A;} #swapper .col-footer a:hover {color: #0c64eb;} h2,h3 {font-size: 20px; margin: 0; clear: both;} h3 {font-size: 16px;} -.revision {font-size: 12px; line-height: 20px; text-align: right; padding-right: 8px;} +.revision {line-height: 20px; text-align: right; padding-right: 8px;} .directory {background-image:url('theme/default/images/repo/dir.png');} .file {background-image:url('theme/default/images/repo/txt.png');} -//.icon {width: 17px; padding-left: 10px; padding-right: 2px;} .mini-icon {display: inline-block; height: 16px; width: 16px; background-color: transparent; background-position: 0 0; background-repeat: no-repeat; vertical-align: text-bottom;} .action {float: left;} .input-group select#encrypt {border-left: 0px;} diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css index 57db0e5265..6656308776 100644 --- a/module/repo/css/diff.css +++ b/module/repo/css/diff.css @@ -9,7 +9,7 @@ table.diff {margin-bottom: 0px;} .diff .line-new, .diff .line-new {background: #CFC;} .diff .line-old, .diff .line-old {background: #FCC;} .diff .line-all, .diff .line-all {background: #FFF;} -.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;} +.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; background: #fafafa; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;} .repoCode .diff tr .comment-btn .icon-wrapper {left: -23px;} .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;} diff --git a/module/repo/css/revision.css b/module/repo/css/revision.css index 8307c26fe6..a4ea875752 100644 --- a/module/repo/css/revision.css +++ b/module/repo/css/revision.css @@ -2,3 +2,4 @@ .change li {list-style: none;} .panel-heading {border-bottom: 1px solid #ddd;} .back-btn {margin-right: 5px !important;} +.compare-all {top: 0 !important;} diff --git a/module/repo/css/view.css b/module/repo/css/view.css index c33bb1fecf..aaeba5de77 100644 --- a/module/repo/css/view.css +++ b/module/repo/css/view.css @@ -2,7 +2,7 @@ .code .content {border: 1px solid #CCC; padding: 0;} .repoCode pre {margin: 0; padding: 0; background: white; border: none;} tr,th,td {border-bottom: none;} -.repoCode pre > table > tbody > tr > th {border-right: 1px solid #E4E4E4; width: 40px; text-align: right; vertical-align: top;} +.repoCode pre > table > tbody > tr > th {border-right: 1px solid #E4E4E4; background: #fafafa; color: #999; width: 40px; text-align: right; vertical-align: top;} .repoCode pre > table > tbody > tr > th, .repoCode pre > table > tbody > tr > td {padding: 1px 3px;} .repoCode pre .commentContent {line-height: 1.4;} .repoCode pre > table {border: 0px; width: 100%;} @@ -14,4 +14,3 @@ tr,th,td {border-bottom: none;} .body-modal .panel-actions {right: 30px;} .icon-angle-left {transform: rotateY(180deg);} #main {padding: 20px 0;} -#sidebar > .side-body {width: 560px;} diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php index da26642871..1fd52e9944 100644 --- a/module/repo/view/revision.html.php +++ b/module/repo/view/revision.html.php @@ -35,8 +35,8 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
- repo->changes;?> -
repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll, '', "data-app='{$app->tab}'");?>
+ repo->changes;?> + repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll, '', "data-app='{$app->tab}'");?>