diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-09 08:37:44 -0600 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-29 12:44:15 -0600 |
commit | f2bf9443ca0a5b55713dab259edd3c20f42e7099 (patch) | |
tree | 17ab78ce185c0811b8c58b38cc086bb8f330c197 /app/assets | |
parent | b3e2fe69c1ea16d1be0a8bd8799c9bf46253e698 (diff) | |
download | gitlab-ce-f2bf9443ca0a5b55713dab259edd3c20f42e7099.tar.gz |
Add table styling to commits tables
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 38 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 14 |
2 files changed, 40 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 08b88f436c0..bffd0e6f0cd 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -234,6 +234,44 @@ ul.content-list { } } +// Table list +.table-list { + display: table; + width: 100%; + + .table-list-row { + display: table-row; + } + + .table-list-cell { + display: table-cell; + vertical-align: top; + padding: 10px 16px; + border-bottom: 1px solid $gray-darker; + + &.avatar-cell { + width: 36px; + padding-right: 0; + + img { + margin-right: 0; + } + } + } + + &.table-wide { + .table-list-cell { + &:last-of-type { + padding-right: 0; + } + + &:first-of-type { + padding-left: 0; + } + } + } +} + .panel > .content-list > li { padding: $gl-padding-top $gl-padding; } diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index abad300a7d1..feaa04136a9 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -142,7 +142,6 @@ .commit-header { padding: 5px 10px; background-color: $gray-light; - border-top: 1px solid $gray-darker; border-bottom: 1px solid $gray-darker; font-size: 14px; @@ -187,9 +186,8 @@ .commit-actions { @media (min-width: $screen-sm-min) { - float: right; - margin-left: $gl-padding; - margin-top: 2px; + width: 300px; + text-align: right; font-size: 0; } @@ -232,14 +230,6 @@ vertical-align: baseline; } - .commit-content { - display: inline-block; - - @media (min-width: $screen-sm-min) { - max-width: 70%; - } - } - .commit-row-description { font-size: 14px; border-left: 1px solid $white-normal; |