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
0d10e291
Commit
0d10e291
authored
Sep 19, 2019
by
Coung Ngo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix stylelint errors in epics.scss
epics.scss produced stylelint errors which were fixed in this commit
parent
b5bbb71f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
39 deletions
+34
-39
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
changelogs/unreleased/10946-fix-the-following-style-lint-errors-and-warnings-for-ee-app-assets-.yml
...ing-style-lint-errors-and-warnings-for-ee-app-assets-.yml
+5
-0
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_date_picker.vue
...pts/epic/components/sidebar_items/sidebar_date_picker.vue
+4
-4
ee/app/assets/stylesheets/pages/epics.scss
ee/app/assets/stylesheets/pages/epics.scss
+24
-35
No files found.
app/assets/stylesheets/framework/common.scss
View file @
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
;
}
...
...
changelogs/unreleased/10946-fix-the-following-style-lint-errors-and-warnings-for-ee-app-assets-.yml
0 → 100644
View file @
0d10e291
---
title
:
Fix stylelint errors in epics.scss
merge_request
:
17243
author
:
type
:
fixed
ee/app/assets/javascripts/epic/components/sidebar_items/sidebar_date_picker.vue
View file @
0d10e291
...
...
@@ -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"
...
...
ee/app/assets/stylesheets/pages/epics.scss
View file @
0d10e291
@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
;
}
}
}
...
...
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