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
6f40aaac
Commit
6f40aaac
authored
Feb 02, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/improve-issue-note-dropdown' into 'master'
Improve issue note dropdown and mr button See merge request gitlab-org/gitlab-ce!16758
parents
f016c780
ec918997
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+0
-1
_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+2
-2
fix-improve-issue-note-dropdown.yml
changelogs/unreleased/fix-improve-issue-note-dropdown.yml
+5
-0
No files found.
app/assets/stylesheets/pages/note_form.scss
View file @
6f40aaac
...
@@ -410,7 +410,6 @@
...
@@ -410,7 +410,6 @@
width
:
298px
;
width
:
298px
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
display
:
flex
;
display
:
flex
;
width
:
100%
;
width
:
100%
;
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
6f40aaac
...
@@ -15,10 +15,10 @@
...
@@ -15,10 +15,10 @@
%span
.text
%span
.text
Checking branch availability…
Checking branch availability…
.btn-group.available.hide
.btn-group.available.hide
%button
.btn.js-create-merge-request.btn-
default
{
type:
'button'
,
data:
{
action:
data_action
}
}
%button
.btn.js-create-merge-request.btn-
success.btn-inverted
{
type:
'button'
,
data:
{
action:
data_action
}
}
=
value
=
value
%button
.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-
default
.js-dropdown-toggle
{
type:
'button'
,
data:
{
dropdown:
{
trigger:
'#create-merge-request-dropdown'
}
}
}
%button
.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-
success.btn-inverted
.js-dropdown-toggle
{
type:
'button'
,
data:
{
dropdown:
{
trigger:
'#create-merge-request-dropdown'
}
}
}
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
%ul
#create-merge-request-dropdown
.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors
{
data:
{
dropdown:
true
}
}
%ul
#create-merge-request-dropdown
.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors
{
data:
{
dropdown:
true
}
}
...
...
changelogs/unreleased/fix-improve-issue-note-dropdown.yml
0 → 100644
View file @
6f40aaac
---
title
:
Improve issue note dropdown and mr button
merge_request
:
16758
author
:
George Tsiolis
type
:
changed
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