From 29d400ba0d67b282144e04610ab23f45b21fcc41 Mon Sep 17 00:00:00 2001
From: Jason Blanchard <jas.blanchard@gmail.com>
Date: Wed, 19 Feb 2014 20:32:42 -0500
Subject: [PATCH] Fixed attachment identifier displaying underneath note text
---
CHANGELOG | 1 +
app/assets/stylesheets/sections/notes.scss | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
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;
}
--
GitLab