Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
1d2b4144
Commit
1d2b4144
authored
May 24, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix new issue page breakpoints
parent
c6d1ce20
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+3
-1
app/views/shared/issuable/form/_metadata.html.haml
app/views/shared/issuable/form/_metadata.html.haml
+7
-7
app/views/shared/issuable/form/_metadata_issue_assignee.html.haml
...s/shared/issuable/form/_metadata_issue_assignee.html.haml
+2
-2
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
1d2b4144
...
@@ -43,7 +43,9 @@ a {
...
@@ -43,7 +43,9 @@ a {
.form-group.row
.col-form-label
{
.form-group.row
.col-form-label
{
// Bootstrap 4 aligns labels to the left
// Bootstrap 4 aligns labels to the left
// for horizontal forms
// for horizontal forms
@include
media-breakpoint-up
(
md
)
{
text-align
:
right
;
text-align
:
right
;
}
}
}
table
{
table
{
...
...
app/views/shared/issuable/form/_metadata.html.haml
View file @
1d2b4144
...
@@ -8,28 +8,28 @@
...
@@ -8,28 +8,28 @@
%hr
%hr
.row
.row
%div
{
class:
(
has_due_date
?
"col-lg-6"
:
"col-
sm-
12"
)
}
%div
{
class:
(
has_due_date
?
"col-lg-6"
:
"col-12"
)
}
.form-group.row.issue-assignee
.form-group.row.issue-assignee
-
if
issuable
.
is_a?
(
Issue
)
-
if
issuable
.
is_a?
(
Issue
)
=
render
"shared/issuable/form/metadata_issue_assignee"
,
issuable:
issuable
,
form:
form
,
has_due_date:
has_due_date
=
render
"shared/issuable/form/metadata_issue_assignee"
,
issuable:
issuable
,
form:
form
,
has_due_date:
has_due_date
-
else
-
else
=
render
"shared/issuable/form/metadata_merge_request_assignee"
,
issuable:
issuable
,
form:
form
,
has_due_date:
has_due_date
=
render
"shared/issuable/form/metadata_merge_request_assignee"
,
issuable:
issuable
,
form:
form
,
has_due_date:
has_due_date
.form-group.row.issue-milestone
.form-group.row.issue-milestone
=
form
.
label
:milestone_id
,
"Milestone"
,
class:
"col-form-label
#{
has_due_date
?
"col-
lg-4"
:
"col-sm
-2"
}
"
=
form
.
label
:milestone_id
,
"Milestone"
,
class:
"col-form-label
#{
has_due_date
?
"col-
md-2 col-lg-4"
:
"col
-2"
}
"
.col-
sm-10
{
class:
(
"col-lg
-8"
if
has_due_date
)
}
.col-
10
{
class:
(
"col-md
-8"
if
has_due_date
)
}
.issuable-form-select-holder
.issuable-form-select-holder
=
render
"shared/issuable/milestone_dropdown"
,
selected:
issuable
.
milestone
,
name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[milestone_id]"
,
show_any:
false
,
show_upcoming:
false
,
show_started:
false
,
extra_class:
"js-issuable-form-dropdown js-dropdown-keep-input"
,
dropdown_title:
"Select milestone"
=
render
"shared/issuable/milestone_dropdown"
,
selected:
issuable
.
milestone
,
name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[milestone_id]"
,
show_any:
false
,
show_upcoming:
false
,
show_started:
false
,
extra_class:
"js-issuable-form-dropdown js-dropdown-keep-input"
,
dropdown_title:
"Select milestone"
.form-group.row
.form-group.row
-
has_labels
=
@labels
&&
@labels
.
any?
-
has_labels
=
@labels
&&
@labels
.
any?
=
form
.
label
:label_ids
,
"Labels"
,
class:
"col-form-label
#{
has_due_date
?
"col-
lg-4"
:
"col-sm
-2"
}
"
=
form
.
label
:label_ids
,
"Labels"
,
class:
"col-form-label
#{
has_due_date
?
"col-
md-2 col-lg-4"
:
"col
-2"
}
"
=
form
.
hidden_field
:label_ids
,
multiple:
true
,
value:
''
=
form
.
hidden_field
:label_ids
,
multiple:
true
,
value:
''
.col-
sm-10
{
class:
"#{"
col
-
lg
-
8
" if has_due_date} #{'issuable-form-padding-top' if !has_labels}"
}
.col-
10
{
class:
"#{"
col
-
md
-
8
" if has_due_date} #{'issuable-form-padding-top' if !has_labels}"
}
.issuable-form-select-holder
.issuable-form-select-holder
=
render
"shared/issuable/label_dropdown"
,
classes:
[
"js-issuable-form-dropdown"
],
selected:
issuable
.
labels
,
data_options:
{
field_name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[label_ids][]"
,
show_any:
false
},
dropdown_title:
"Select label"
=
render
"shared/issuable/label_dropdown"
,
classes:
[
"js-issuable-form-dropdown"
],
selected:
issuable
.
labels
,
data_options:
{
field_name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[label_ids][]"
,
show_any:
false
},
dropdown_title:
"Select label"
-
if
has_due_date
-
if
has_due_date
.col-lg-6
.col-lg-6
.form-group.row
.form-group.row
=
form
.
label
:due_date
,
"Due date"
,
class:
"col-form-label col-
sm-2
"
=
form
.
label
:due_date
,
"Due date"
,
class:
"col-form-label col-
md-2 col-lg-4
"
.col-
sm-10
.col-
8
.issuable-form-select-holder
.issuable-form-select-holder
=
form
.
text_field
:due_date
,
id:
"issuable-due-date"
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
=
form
.
text_field
:due_date
,
id:
"issuable-due-date"
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
app/views/shared/issuable/form/_metadata_issue_assignee.html.haml
View file @
1d2b4144
=
form
.
label
:assignee_ids
,
"Assignee"
,
class:
"col-form-label
#{
"col-lg-4"
if
has_due_date
}
"
=
form
.
label
:assignee_ids
,
"Assignee"
,
class:
"col-form-label
#{
"col-
md-2 col-
lg-4"
if
has_due_date
}
"
.col-sm-10
{
class:
(
"col-
lg
-8"
if
has_due_date
)
}
.col-sm-10
{
class:
(
"col-
md
-8"
if
has_due_date
)
}
.issuable-form-select-holder.selectbox
.issuable-form-select-holder.selectbox
-
issuable
.
assignees
.
each
do
|
assignee
|
-
issuable
.
assignees
.
each
do
|
assignee
|
=
hidden_field_tag
"
#{
issuable
.
to_ability_name
}
[assignee_ids][]"
,
assignee
.
id
,
id:
nil
,
data:
{
meta:
assignee
.
name
,
avatar_url:
assignee
.
avatar_url
,
name:
assignee
.
name
,
username:
assignee
.
username
}
=
hidden_field_tag
"
#{
issuable
.
to_ability_name
}
[assignee_ids][]"
,
assignee
.
id
,
id:
nil
,
data:
{
meta:
assignee
.
name
,
avatar_url:
assignee
.
avatar_url
,
name:
assignee
.
name
,
username:
assignee
.
username
}
...
...
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