Commit 90ec2899 authored by Fatih Acet's avatar Fatih Acet

Merge branch...

Merge branch '27785-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-issues-scss' into 'master'

Fix style-lint warnings for app/assets/stylesheets/pages/issues.scss

See merge request gitlab-org/gitlab!20752
parents 9db6486d 7e3798ba
...@@ -21,16 +21,11 @@ ...@@ -21,16 +21,11 @@
margin-bottom: 2px; margin-bottom: 2px;
} }
.issue-labels { .issue-labels,
.author-link {
display: inline-block; display: inline-block;
} }
.issuable-meta {
.author-link {
display: inline-block;
}
}
.icon-merge-request-unmerged { .icon-merge-request-unmerged {
height: 13px; height: 13px;
margin-bottom: 3px; margin-bottom: 3px;
...@@ -53,16 +48,6 @@ ...@@ -53,16 +48,6 @@
margin-right: 15px; margin-right: 15px;
} }
.issues_content {
.title {
height: 40px;
}
form {
margin: 0;
}
}
form.edit-issue { form.edit-issue {
margin: 0; margin: 0;
} }
...@@ -79,10 +64,6 @@ ul.related-merge-requests > li { ...@@ -79,10 +64,6 @@ ul.related-merge-requests > li {
margin-left: 5px; margin-left: 5px;
} }
.row_title {
vertical-align: bottom;
}
gl-emoji { gl-emoji {
font-size: 1em; font-size: 1em;
} }
...@@ -93,10 +74,6 @@ ul.related-merge-requests > li { ...@@ -93,10 +74,6 @@ ul.related-merge-requests > li {
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
} }
.merge-request-id {
display: inline-block;
}
.merge-request-status { .merge-request-status {
&.merged { &.merged {
color: $blue-500; color: $blue-500;
...@@ -118,11 +95,7 @@ ul.related-merge-requests > li { ...@@ -118,11 +95,7 @@ ul.related-merge-requests > li {
border-color: $issues-today-border; border-color: $issues-today-border;
} }
&.closed { &.closed,
background: $gray-light;
border-color: $border-color;
}
&.merged { &.merged {
background: $gray-light; background: $gray-light;
border-color: $border-color; border-color: $border-color;
...@@ -160,9 +133,12 @@ ul.related-merge-requests > li { ...@@ -160,9 +133,12 @@ ul.related-merge-requests > li {
padding-bottom: 37px; padding-bottom: 37px;
} }
.issues-nav-controls { .issues-nav-controls,
.new-branch-col {
font-size: 0; font-size: 0;
}
.issues-nav-controls {
.btn-group:empty { .btn-group:empty {
display: none; display: none;
} }
...@@ -198,8 +174,6 @@ ul.related-merge-requests > li { ...@@ -198,8 +174,6 @@ ul.related-merge-requests > li {
} }
.new-branch-col { .new-branch-col {
font-size: 0;
.discussion-filter-container { .discussion-filter-container {
&:not(:only-child) { &:not(:only-child) {
margin-right: $gl-padding-8; margin-right: $gl-padding-8;
...@@ -297,11 +271,11 @@ ul.related-merge-requests > li { ...@@ -297,11 +271,11 @@ ul.related-merge-requests > li {
padding-top: 0; padding-top: 0;
align-self: center; align-self: center;
} }
}
.create-mr-dropdown-wrap { .create-mr-dropdown-wrap {
.btn-group:not(.hidden) { .btn-group:not(.hidden) {
display: inline-flex; display: inline-flex;
}
} }
} }
} }
......
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