Commit a03ad6ba authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch...

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

Fix stylelint errors and warnings for epics.scss

Closes #10946

See merge request gitlab-org/gitlab!17243
parents e00c53be 0d10e291
......@@ -387,6 +387,7 @@ img.emoji {
.prepend-top-16 { margin-top: 16px; }
.prepend-top-20 { margin-top: 20px; }
.prepend-top-32 { margin-top: 32px; }
.prepend-left-2 { margin-left: 2px; }
.prepend-left-4 { margin-left: 4px; }
.prepend-left-5 { margin-left: 5px; }
.prepend-left-8 { margin-left: 8px; }
......
---
title: Fix stylelint errors in epics.scss
merge_request: 17243
author:
type: fixed
......@@ -220,7 +220,7 @@ export default {
<div class="value">
<div
:class="{ 'is-option-selected': selectedDateIsFixed, 'd-flex': !editing }"
class="value-type-fixed"
class="value-type-fixed text-secondary"
>
<input
v-if="canUpdate && !editing"
......@@ -237,7 +237,7 @@ export default {
@newDateSelected="newDateSelected"
@hidePicker="stopEditing"
/>
<span v-else class="d-flex value-content">
<span v-else class="d-flex value-content prepend-left-2">
<template v-if="dateFixed">
<span>{{ dateFixedWords }}</span>
<icon
......@@ -265,7 +265,7 @@ export default {
v-tooltip
:title="dateFromMilestonesTooltip"
:class="{ 'is-option-selected': !selectedDateIsFixed }"
class="value-type-dynamic d-flex prepend-top-10"
class="value-type-dynamic text-secondary d-flex prepend-top-10"
data-placement="bottom"
data-html="true"
>
......@@ -277,7 +277,7 @@ export default {
@click="toggleDateType(false)"
/>
<span class="prepend-left-5">{{ __('From milestones:') }}</span>
<span class="value-content">{{ dateFromMilestonesWords }}</span>
<span class="value-content prepend-left-2">{{ dateFromMilestonesWords }}</span>
<icon
v-if="isDateInvalid && !selectedDateIsFixed"
v-popover="dateInvalidPopoverOptions"
......
@include media-breakpoint-down(sm) {
.epics-other-filters .filter-dropdown-container {
.epics-other-filters {
.epics-sort-btn i {
position: absolute;
top: 11px;
......@@ -17,46 +17,35 @@
}
.epic-sidebar {
.block.date {
.help-icon,
.date-warning-icon {
&:hover {
cursor: pointer;
}
}
.help-icon {
color: $gl-text-color-secondary;
}
.btn-sidebar-action {
line-height: $gl-font-size;
.help-icon,
.date-warning-icon {
&:hover {
cursor: pointer;
}
}
.btn-sidebar-date-remove {
height: $gl-font-size;
line-height: $gl-btn-horz-padding;
}
.help-icon {
color: $gl-text-color-secondary;
}
.date-warning-icon {
color: $orange-500;
margin-top: -1px;
}
.btn-sidebar-action {
line-height: $gl-font-size;
}
.value-type-fixed,
.value-type-dynamic {
color: $gl-text-color-secondary;
.btn-sidebar-date-remove {
height: $gl-font-size;
line-height: $gl-btn-horz-padding;
}
.value-content {
margin-left: 2px;
}
.date-warning-icon {
color: $orange-500;
margin-top: -1px;
}
&.is-option-selected {
> span {
color: $gl-text-color;
font-weight: $gl-font-weight-bold;
}
}
.is-option-selected {
> span {
color: $gl-text-color;
font-weight: $gl-font-weight-bold;
}
}
}
......
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