diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-02 00:47:15 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-04 16:44:37 +0300 |
commit | ff3379641a075748fc6b79e0701e533a763caa85 (patch) | |
tree | 710bb38d8e37f0e8e8d0a6748013fb4b9e3efdc9 /app/assets | |
parent | 30d4cce00c8e98395f177df590b4e2cdc15e0572 (diff) |
Update commit page styles
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 04d2d2ba622..47d3e72679b 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -36,13 +36,17 @@ padding: 10px 0; margin-bottom: 0; - .commitable-meta { - display: inline-block; - line-height: 18px; + @media (min-width: $screen-sm-min) { + display: flex; + align-items: center; + + .commit-meta { + flex: 1; + } } .commit-hash-full { - @media (max-width: $screen-md-min) { + @media (max-width: $screen-sm-max) { width: 80px; white-space: nowrap; overflow: hidden; @@ -52,31 +56,24 @@ } } - .commitable-actions { - @media (min-width: $screen-sm) { - float: right; - padding-top: 0; + .commit-action-buttons { + i { + color: $gl-icon-color; + font-size: 13px; + margin-right: 3px; } - .dropdown { - @media (max-width: $screen-sm) { + @media (max-width: $screen-xs-max) { + .dropdown { width: 100%; margin-top: 10px; } - } - .dropdown-toggle { - @media (max-width: $screen-sm) { + .dropdown-toggle { width: 100%; } } } - - .commit-options-dropdown-caret { - @media (max-width: $screen-sm) { - margin-left: 0; - } - } } .avatar { @@ -224,17 +221,6 @@ } } -.commit-action-buttons { - position: relative; - top: -1px; - - i { - color: $gl-icon-color; - font-size: 13px; - margin-right: 3px; - } -} - /* * Commit message textarea for web editor and * custom merge request message |