Commit 2193ccec authored by Fatih Acet's avatar Fatih Acet

Fix warning styling for responsive design.

parent 18165f97
...@@ -133,12 +133,12 @@ ...@@ -133,12 +133,12 @@
var rect = el.getBoundingClientRect(); var rect = el.getBoundingClientRect();
var height = Math.max(document.documentElement.clientHeight, window.innerHeight); var height = Math.max(document.documentElement.clientHeight, window.innerHeight);
return !(rect.bottom - 110 < 0 || rect.top - height >= 0); // -110 for sticky GitLab navigation header return !(rect.bottom - 110 < 0 || rect.top - height >= 0); // -110 for sticky GitLab navigation header
} };
gl.utils.animateToElement = function($el) { gl.utils.animateToElement = function($el) {
return $('body, html').animate({ return $('body, html').animate({
scrollTop: $el.offset().top - 110 scrollTop: $el.offset().top - 110
}, 200); }, 200);
} };
}).call(this); }).call(this);
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
.new-note, .new-note,
.note-edit-form { .note-edit-form {
.note-form-actions { .note-form-actions {
position: relative;
margin-top: $gl-padding; margin-top: $gl-padding;
} }
...@@ -265,3 +266,18 @@ ...@@ -265,3 +266,18 @@
} }
} }
} }
.note-edit-warning.settings-message {
display: none;
padding: 5px 10px;
position: absolute;
left: 127px;
top: 2px;
@media (max-width: $screen-xs-max) {
position: relative;
top: 0;
left: 0;
margin-bottom: 10px;
}
}
...@@ -586,23 +586,6 @@ ul.notes { ...@@ -586,23 +586,6 @@ ul.notes {
} }
} }
// Merge request notes in diffs
.diff-file {
// Diff is side by side
.notes_content.parallel .note-header .note-headline-light {
display: block;
position: relative;
}
// Diff is inline
.notes_content .note-header .note-headline-light {
display: inline-block;
position: relative;
}
}
.note-edit-warning.settings-message { .note-edit-warning.settings-message {
display: none; display: none;
position: relative; position: relative;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
= render 'projects/notes/hints' = render 'projects/notes/hints'
.note-form-actions.clearfix .note-form-actions.clearfix
= submit_tag 'Save Comment', class: 'btn btn-nr btn-save js-comment-button' .settings-message.note-edit-warning.js-edit-warning
%span.settings-message.note-edit-warning.js-edit-warning
Finish editing this message first! Finish editing this message first!
= submit_tag 'Save Comment', class: 'btn btn-nr btn-save js-comment-button'
%button.btn.btn-nr.btn-cancel.note-edit-cancel{ type: 'button' } %button.btn.btn-nr.btn-cancel.note-edit-cancel{ type: 'button' }
Cancel Cancel
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment