diff options
| author | Unknwon <u@gogs.io> | 2016-01-06 13:31:36 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-01-06 13:31:36 +0800 |
| commit | 2481fe2f567c99bdeba4c2fd5defe41fe788c8b8 (patch) | |
| tree | f763380ab5c81b1a4e00202319d7ab0f66172330 /public | |
| parent | 19c234db3937e0b704f1d3e69d5346614df6f8f8 (diff) | |
| parent | 20871561192086ab76f153114fe8db6114d515f7 (diff) | |
| download | gitea-2481fe2f567c99bdeba4c2fd5defe41fe788c8b8.tar.gz gitea-2481fe2f567c99bdeba4c2fd5defe41fe788c8b8.zip | |
Merge pull request #2296 from bkcsoft/feature/split-diff
Implement Split Diff-View
Diffstat (limited to 'public')
| -rwxr-xr-x | public/css/gogs.css | 26 | ||||
| -rw-r--r-- | public/less/_base.less | 7 | ||||
| -rw-r--r-- | public/less/_repository.less | 24 |
3 files changed, 57 insertions, 0 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index 459bf5359d..0160c5d91a 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -736,6 +736,11 @@ pre.raw { line-height: 1.5; overflow: auto; } +pre.wrap { + white-space: pre-wrap; + /* CSS 3 */ + word-break: break-word; +} .full.height { padding: 0; margin: 0 0 -80px 0; @@ -2326,6 +2331,10 @@ footer .container .links > *:first-child { background: #fafafa; width: 1%; } +.repository .diff-file-box .file-body.file-code .lines-num span.fold { + display: block; + text-align: center; +} .repository .diff-file-box .file-body.file-code .lines-num-old { border-right: 1px solid #DDD; } @@ -2351,16 +2360,33 @@ footer .container .links > *:first-child { padding-top: 4px; padding-bottom: 4px; } +.repository .diff-file-box .code-diff tbody tr.tag-code td.halfwidth { + width: 50%; +} +.repository .diff-file-box .code-diff tbody tr.del-code td.add-code { + background-color: #eaffea !important; + border-color: #c1e9c1 !important; +} +.repository .diff-file-box .code-diff tbody tr.del-code td.add-code pre { + background-color: #eaffea !important; + border-color: #c1e9c1 !important; +} .repository .diff-file-box .code-diff tbody tr.del-code td, .repository .diff-file-box .code-diff tbody tr.del-code pre { background-color: #ffecec !important; border-color: #f1c0c0 !important; } +.repository .diff-file-box .code-diff tbody tr.del-code td.halfwidth { + width: 50%; +} .repository .diff-file-box .code-diff tbody tr.add-code td, .repository .diff-file-box .code-diff tbody tr.add-code pre { background-color: #eaffea !important; border-color: #c1e9c1 !important; } +.repository .diff-file-box .code-diff tbody tr.add-code td.halfwidth { + width: 50%; +} .repository .diff-file-box.file-content img { max-width: 100%; padding: 5px 5px 0 5px; diff --git a/public/less/_base.less b/public/less/_base.less index 274a5cb779..a63072fdcb 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -20,6 +20,13 @@ pre { line-height: 1.5; overflow: auto; } + &.wrap { + white-space: pre-wrap; /* CSS 3 */ +// white-space: -moz-normal; /* Mozilla, since 1999 */ +// white-space: -normal; /* Opera 4-6 */ +// white-space: -o-normal; /* Opera 7 */ + word-break: break-word; + } } .full.height { padding: 0; diff --git a/public/less/_repository.less b/public/less/_repository.less index 9891886e88..441832daf2 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -668,6 +668,11 @@ color: #A7A7A7; background: #fafafa; width: 1%; + + span.fold { + display: block; + text-align: center; + } } .lines-num-old { border-right: 1px solid #DDD; @@ -698,6 +703,9 @@ padding-top: 4px; padding-bottom: 4px; } + td.halfwidth { + width: 50%; + } // td.selected-line, td.selected-line pre { // background-color: #ffffdd !important; // } @@ -708,10 +716,23 @@ // } // } &.del-code { + td.add-code { + background-color: #eaffea !important; + border-color: #c1e9c1 !important; + pre { + background-color: #eaffea !important; + border-color: #c1e9c1 !important; + + } + } td, pre { background-color: #ffecec !important; border-color: #f1c0c0 !important; } + + td.halfwidth { + width: 50%; + } // td.selected-line, td.selected-line pre { // background-color: #ffffdd !important; // } @@ -721,6 +742,9 @@ background-color: #eaffea !important; border-color: #c1e9c1 !important; } + td.halfwidth { + width: 50%; + } // td.selected-line, td.selected-line pre { // background-color: #ffffdd !important; // } |