diff options
| author | Jason Blanchard <jas.blanchard@gmail.com> | 2014-02-19 20:32:42 -0500 |
|---|---|---|
| committer | Jason Blanchard <jas.blanchard@gmail.com> | 2014-02-19 20:35:21 -0500 |
| commit | 29d400ba0d67b282144e04610ab23f45b21fcc41 (patch) | |
| tree | 53cefe5f571dce8aa43e56a769cf6c2fc97f79e8 | |
| parent | dad6b0213c96bc0b6a5b78714878ee542b7bee2d (diff) | |
| download | gitlab-ce-29d400ba0d67b282144e04610ab23f45b21fcc41.tar.gz | |
Fixed attachment identifier displaying underneath note text
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5f42f851b05..63265389527 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,7 @@ v 6.6.0 - Restyle Issue#show page and MR#show page - Ability to filter by multiple labels for Issues page - Rails version to 4.0.3 + - Fixed attachment identifier displaying underneath note text (Jason Blanchard) v 6.5.1 - Fix branch selectbox when create merge request from fork diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 9f5f1579fbd..e6eabf47459 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -87,7 +87,6 @@ ul.notes { } .attachment { font-size: 14px; - margin-top: -20px; } .note-body { @include md-typography; @@ -302,6 +301,7 @@ ul.notes { @extend .col-md-4; @extend .thumbnail; margin-left: 45px; + float: none; } |