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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8ab3559c
Commit
8ab3559c
authored
Oct 01, 2021
by
Nicolò Maria Mezzopera
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cngo-delete-issues-css' into 'master'
Delete issues css See merge request gitlab-org/gitlab!71478
parents
2f7db43d
97ffda63
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
60 deletions
+8
-60
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+2
-53
app/views/projects/issues/_nav_btns.html.haml
app/views/projects/issues/_nav_btns.html.haml
+1
-2
app/views/projects/issues/_related_branches.html.haml
app/views/projects/issues/_related_branches.html.haml
+2
-2
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+1
-1
app/views/shared/issue_type/_emoji_block.html.haml
app/views/shared/issue_type/_emoji_block.html.haml
+1
-1
ee/app/views/shared/epic/_search_bar.html.haml
ee/app/views/shared/epic/_search_bar.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/issues.scss
View file @
8ab3559c
...
@@ -7,36 +7,8 @@
...
@@ -7,36 +7,8 @@
opacity
:
1
;
opacity
:
1
;
}
}
.check-all-holder
{
ul
.related-merge-requests
>
li
gl-emoji
{
line-height
:
36px
;
font-size
:
1em
;
float
:
left
;
margin-right
:
15px
;
}
form
.edit-issue
{
margin
:
0
;
}
ul
.related-merge-requests
>
li
{
display
:
flex
;
align-items
:
center
;
.merge-request-id
{
flex-shrink
:
0
;
}
.merge-request-info
{
margin-left
:
5px
;
}
gl-emoji
{
font-size
:
1em
;
}
}
.related-branches-title
{
font-size
:
16px
;
font-weight
:
$gl-font-weight-bold
;
}
}
.merge-request-status
{
.merge-request-status
{
...
@@ -92,35 +64,12 @@ ul.related-merge-requests > li {
...
@@ -92,35 +64,12 @@ ul.related-merge-requests > li {
}
}
}
}
.issues-footer
{
padding-top
:
$gl-padding
;
padding-bottom
:
37px
;
}
.issues-nav-controls
,
.new-branch-col
{
font-size
:
0
;
}
.issues-nav-controls
{
.issues-nav-controls
{
.btn-group
:empty
{
.btn-group
:empty
{
display
:
none
;
display
:
none
;
}
}
}
}
.email-modal-input-group
{
margin-bottom
:
10px
;
.form-control
{
background-color
:
$white
;
}
.btn
{
background-color
:
$gray-light
;
border
:
1px
solid
$border-gray-normal
;
}
}
.recaptcha
{
.recaptcha
{
margin-bottom
:
30px
;
margin-bottom
:
30px
;
}
}
...
...
app/views/projects/issues/_nav_btns.html.haml
View file @
8ab3559c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
can_edit
=
can?
(
current_user
,
:admin_project
,
@project
)
-
can_edit
=
can?
(
current_user
,
:admin_project
,
@project
)
-
notification_email
=
@current_user
.
present?
?
@current_user
.
notification_email_or_default
:
nil
-
notification_email
=
@current_user
.
present?
?
@current_user
.
notification_email_or_default
:
nil
.nav-controls.issues-nav-controls
.nav-controls.issues-nav-controls
.gl-font-size-0
-
if
show_feed_buttons
-
if
show_feed_buttons
=
render
'shared/issuable/feed_buttons'
=
render
'shared/issuable/feed_buttons'
...
@@ -18,4 +18,3 @@
...
@@ -18,4 +18,3 @@
issue:
{
milestone_id:
finder
.
milestones
.
first
.
try
(
:id
)
}),
issue:
{
milestone_id:
finder
.
milestones
.
first
.
try
(
:id
)
}),
class:
"gl-button btn btn-confirm"
,
class:
"gl-button btn btn-confirm"
,
id:
"new_issue_link"
id:
"new_issue_link"
app/views/projects/issues/_related_branches.html.haml
View file @
8ab3559c
-
if
@related_branches
.
any?
-
if
@related_branches
.
any?
%h2
.
related-branches-title
%h2
.
gl-font-lg
=
pluralize
(
@related_branches
.
size
,
'Related Branch'
)
=
pluralize
(
@related_branches
.
size
,
'Related Branch'
)
%ul
.unstyled-list.related-merge-requests
%ul
.unstyled-list.related-merge-requests
-
@related_branches
.
each
do
|
branch
|
-
@related_branches
.
each
do
|
branch
|
%li
%li
.gl-display-flex.gl-align-items-center
-
if
branch
[
:pipeline_status
].
present?
-
if
branch
[
:pipeline_status
].
present?
%span
.related-branch-ci-status
%span
.related-branch-ci-status
=
render
'ci/status/icon'
,
status:
branch
[
:pipeline_status
]
=
render
'ci/status/icon'
,
status:
branch
[
:pipeline_status
]
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
8ab3559c
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
-
if
params
[
:search
].
present?
-
if
params
[
:search
].
present?
=
hidden_field_tag
:search
,
params
[
:search
]
=
hidden_field_tag
:search
,
params
[
:search
]
-
if
@can_bulk_update
-
if
@can_bulk_update
.check-all-holder.
d-none.d-sm-block.hidden
.check-all-holder.
gl-display-none.gl-sm-display-block.hidden.gl-float-left.gl-mr-5.gl-line-height-36
-
checkbox_id
=
'check-all-issues'
-
checkbox_id
=
'check-all-issues'
%label
.gl-sr-only
{
for:
checkbox_id
}=
_
(
'Select all'
)
%label
.gl-sr-only
{
for:
checkbox_id
}=
_
(
'Select all'
)
=
check_box_tag
checkbox_id
,
nil
,
false
,
class:
"check-all-issues left"
=
check_box_tag
checkbox_id
,
nil
,
false
,
class:
"check-all-issues left"
...
...
app/views/shared/issue_type/_emoji_block.html.haml
View file @
8ab3559c
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.row.gl-m-0.gl-justify-content-space-between
.row.gl-m-0.gl-justify-content-space-between
.js-noteable-awards
.js-noteable-awards
=
render
'award_emoji/awards_block'
,
awardable:
issuable
,
inline:
true
,
api_awards_path:
api_awards_path
=
render
'award_emoji/awards_block'
,
awardable:
issuable
,
inline:
true
,
api_awards_path:
api_awards_path
.new-branch-col.gl-my-2
.new-branch-col.gl-my-2
.gl-font-size-0
=
render_if_exists
"projects/issues/timeline_toggle"
,
issuable:
issuable
=
render_if_exists
"projects/issues/timeline_toggle"
,
issuable:
issuable
#js-vue-sort-issue-discussions
#js-vue-sort-issue-discussions
#js-vue-discussion-filter
{
data:
{
default_filter:
current_user
&
.
notes_filter_for
(
issuable
),
notes_filters:
UserPreference
.
notes_filters
.
to_json
}
}
#js-vue-discussion-filter
{
data:
{
default_filter:
current_user
&
.
notes_filter_for
(
issuable
),
notes_filters:
UserPreference
.
notes_filters
.
to_json
}
}
...
...
ee/app/views/shared/epic/_search_bar.html.haml
View file @
8ab3559c
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
-
if
params
[
:search
].
present?
-
if
params
[
:search
].
present?
=
hidden_field_tag
:search
,
params
[
:search
]
=
hidden_field_tag
:search
,
params
[
:search
]
-
if
@can_bulk_update
-
if
@can_bulk_update
.check-all-holder.
d-none.d-sm-block.hidden
.check-all-holder.
gl-display-none.gl-sm-display-block.hidden.gl-float-left.gl-mr-5.gl-line-height-36
-
checkbox_id
=
'check-all-issues'
-
checkbox_id
=
'check-all-issues'
%label
.gl-sr-only
{
for:
checkbox_id
}=
_
(
'Select all'
)
%label
.gl-sr-only
{
for:
checkbox_id
}=
_
(
'Select all'
)
=
check_box_tag
checkbox_id
,
nil
,
false
,
class:
"check-all-issues left"
=
check_box_tag
checkbox_id
,
nil
,
false
,
class:
"check-all-issues left"
...
...
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