diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-12-01 01:51:04 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-12-01 01:51:04 +0200 |
commit | 570f63daaff7ef2b7b05c83714c78755b5d07101 (patch) | |
tree | 81ef24a4b508a76c442590aed44bf746c686c59d /app/assets | |
parent | b60b7b2e2b6880306d701e6607fe7bf89f4de137 (diff) | |
download | gitlab-ce-570f63daaff7ef2b7b05c83714c78755b5d07101.tar.gz |
line links for commit diff, css fixed for line diff
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/application.css | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/commits.css.scss | 59 | ||||
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 16 |
3 files changed, 64 insertions, 18 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8fc87d0d653..47ec5f5a91f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -49,10 +49,3 @@ .no-padding { padding:0 !important; } - - -/** COMMIT BLOCK **/ -.commit-title{display: block;} -.commit-title{margin-bottom: 10px} -.commit-author{color: #999; font-weight: normal; font-style: italic;} -.commit-author strong{font-weight: bold; font-style: normal;} diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss index 23a8add96c8..e88c56c5519 100644 --- a/app/assets/stylesheets/commits.css.scss +++ b/app/assets/stylesheets/commits.css.scss @@ -27,14 +27,44 @@ } .diff_file_content{ + table { + border:none; + margin:0px; + padding:0px; + } .old_line, .new_line { - background:#ECECEC; - color:#777; - width:35px; - float:left; + margin:0px; + padding:0px; + border:none; + background:#F7F7F7; + color:#333; padding: 0px 5px; border-right: 1px solid #ccc; text-align:right; + min-width:35px; + max-width:35px; + width:35px; + a { + float:left; + width:35px; + font-weight:normal; + &:hover { + text-decoration:underline; + } + } + } + .line_content { + white-space:pre; + height:14px; + margin:0px; + padding:0px; + border:none; + &.new { + background: #DFD; + } + &.old { + background: #FDD; + } } } @@ -45,3 +75,24 @@ pre.commit_message { font-weight:bold; font-size:15px; } + +/** COMMIT BLOCK **/ +.commit-title{display: block;} +.commit-title{margin-bottom: 10px} +.commit-author{color: #999; font-weight: normal; font-style: italic;} +.commit-author strong{font-weight: bold; font-style: normal;} + +/** bordered list **/ +ul.bordered-list { + margin:5px 0px; + padding:0px; + li { + padding: 5px; + border-bottom: 1px solid #EEE; + overflow: hidden; + display: block; + margin:0px; + } +} + +ul.bordered-list li:last-child { border:none } diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 8cfe58b2100..344190e6318 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -66,11 +66,8 @@ a { } } -.view_file { - border:1px solid #CCC; - margin-bottom:1em; - - .view_file_header { +.view_file .view_file_header, +.diff_file .diff_file_header { background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); @@ -81,8 +78,13 @@ a { text-align: left; color: #666; border-bottom: 1px solid #DEE2E3; - padding: .9em 1em; - } + padding: 7px 10px; +} + +.view_file { + border:1px solid #CCC; + margin-bottom:1em; + .view_file_content { background:#fff; color:#514721; |