BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2193ccec
Commit
2193ccec
authored
Nov 16, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warning styling for responsive design.
parent
18165f97
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
21 deletions
+20
-21
common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+2
-2
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+16
-0
notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-17
_edit_form.html.haml
app/views/projects/notes/_edit_form.html.haml
+2
-2
No files found.
app/assets/javascripts/lib/utils/common_utils.js
View file @
2193ccec
...
...
@@ -133,12 +133,12 @@
var
rect
=
el
.
getBoundingClientRect
();
var
height
=
Math
.
max
(
document
.
documentElement
.
clientHeight
,
window
.
innerHeight
);
return
!
(
rect
.
bottom
-
110
<
0
||
rect
.
top
-
height
>=
0
);
// -110 for sticky GitLab navigation header
}
}
;
gl
.
utils
.
animateToElement
=
function
(
$el
)
{
return
$
(
'body, html'
).
animate
({
scrollTop
:
$el
.
offset
().
top
-
110
},
200
);
}
}
;
}).
call
(
this
);
app/assets/stylesheets/pages/note_form.scss
View file @
2193ccec
...
...
@@ -27,6 +27,7 @@
.new-note
,
.note-edit-form
{
.note-form-actions
{
position
:
relative
;
margin-top
:
$gl-padding
;
}
...
...
@@ -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
;
}
}
app/assets/stylesheets/pages/notes.scss
View file @
2193ccec
...
...
@@ -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
{
display
:
none
;
position
:
relative
;
...
...
app/views/projects/notes/_edit_form.html.haml
View file @
2193ccec
...
...
@@ -8,8 +8,8 @@
=
render
'projects/notes/hints'
.note-form-actions.clearfix
=
submit_tag
'Save Comment'
,
class:
'btn btn-nr btn-save js-comment-button'
%span
.settings-message.note-edit-warning.js-edit-warning
.settings-message.note-edit-warning.js-edit-warning
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'
}
Cancel
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment