diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-08 18:53:29 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-29 21:44:15 +0300 |
commit | b3e2fe69c1ea16d1be0a8bd8799c9bf46253e698 (patch) | |
tree | 5b11e9fa0d614afba74fd277e7b12230cd6a80ab /app/assets/stylesheets/pages/commits.scss | |
parent | 714f70a38df10e678bffde6e6081a97e31d8317c (diff) |
Start commits refactor
Diffstat (limited to 'app/assets/stylesheets/pages/commits.scss')
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 145 |
1 files changed, 135 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index e76e1a73b25..abad300a7d1 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -1,3 +1,137 @@ +.commit-title { + display: block; +} + +.commit-author, +.commit-committer { + display: block; + color: $commit-committer-color; + font-weight: normal; + font-style: italic; +} + +.commit-author strong, +.commit-committer strong { + font-weight: bold; + font-style: normal; +} + +.commit-description { + background: none; + border: none; + margin: 0; + padding: 0; + margin-top: 10px; + word-break: normal; + white-space: pre-wrap; +} + +.js-details-expand { + &:hover { + text-decoration: none; + } +} + +.ci-status-link { + svg { + overflow: visible; + } +} + +.commit-box { + border-top: 1px solid $border-color; + padding: $gl-padding 0; + + .commit-title { + margin: 0; + font-size: 23px; + color: $gl-gray-dark; + } + + .commit-description { + margin-top: 15px; + } +} + +.commit-hash-full { + @media (max-width: $screen-sm-max) { + width: 80px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + vertical-align: bottom; + } +} + +.file-stats { + ul { + list-style: none; + margin: 0; + padding: 10px 0; + + li { + padding: 3px 0; + line-height: 20px; + } + } + + .new-file { + a { + color: $gl-text-green; + } + } + + .renamed-file { + a { + color: $gl-text-orange; + } + } + + .deleted-file { + a { + color: $gl-text-red; + } + } + + .edit-file { + a { + color: $gl-text-color; + } + } +} + +/* + * Commit message textarea for web editor and + * custom merge request message + */ +.commit-message-container { + background-color: $body-bg; + position: relative; + font-family: $monospace_font; + $left: 12px; + overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 + .max-width-marker { + width: 72ch; + color: $commit-max-width-marker-color; + font-family: inherit; + left: $left; + height: 100%; + border-right: 1px solid mix($input-border, $white-light); + position: absolute; + z-index: 1; + } + + > textarea { + background-color: $commit-message-text-area-bg; + font-family: inherit; + padding-left: $left; + position: relative; + z-index: 2; + } +} + + .commits-compare-switch { @include btn-default; @include btn-white; @@ -18,7 +152,6 @@ } .commit-row-title { - line-height: 1.35; .notes_count { float: right; @@ -93,21 +226,13 @@ padding-left: 46px; } - &:not(:last-child) { - border-bottom: 1px solid $gray-darker; - } - a, button { color: $gl-dark-link-color; vertical-align: baseline; } - .avatar { - margin-left: -46px; - } - - .item-title { + .commit-content { display: inline-block; @media (min-width: $screen-sm-min) { |