Commit 8ab3559c authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'cngo-delete-issues-css' into 'master'

Delete issues css

See merge request gitlab-org/gitlab!71478
parents 2f7db43d 97ffda63
...@@ -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;
} }
......
...@@ -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"
- 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]
......
...@@ -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"
......
...@@ -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 } }
......
...@@ -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"
......
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