diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2015-12-26 12:26:26 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2016-01-05 19:21:41 +0100 |
| commit | 0df39b33ebcff50df537f4682a72dcc29f046d01 (patch) | |
| tree | 9454f38fb3a9ce16d58d20dc9a9a7016dba3359f /public | |
| parent | 7392b6a755300e9f921535d2c1ec6358d4e8bfe8 (diff) | |
| download | gitea-0df39b33ebcff50df537f4682a72dcc29f046d01.tar.gz gitea-0df39b33ebcff50df537f4682a72dcc29f046d01.zip | |
Implement Split Diff-View
- Unified/Inline Diff-View Selectable
Diffstat (limited to 'public')
| -rwxr-xr-x | public/css/gogs.css | 33 | ||||
| -rw-r--r-- | public/less/_base.less | 7 | ||||
| -rw-r--r-- | public/less/_repository.less | 24 |
3 files changed, 64 insertions, 0 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index 1ed66997d2..27f3211e7a 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -735,6 +735,18 @@ pre.raw { line-height: 1.5; overflow: auto; } +pre.wrap { + white-space: pre-wrap; + /* CSS 3 */ + white-space: -moz-pre-wrap; + /* Mozilla, since 1999 */ + white-space: -pre-wrap; + /* Opera 4-6 */ + white-space: -o-pre-wrap; + /* Opera 7 */ + word-wrap: break-word; + /* Internet Explorer 5.5+ */ +} .full.height { padding: 0; margin: 0 0 -80px 0; @@ -2325,6 +2337,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; } @@ -2350,16 +2366,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 ab2785ff57..c07c81db4f 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -19,6 +19,13 @@ pre { line-height: 1.5; overflow: auto; } + &.wrap { + white-space: pre-wrap; /* CSS 3 */ + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ + } } .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; // } |