Commit 3b081dce authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '273555-move-time-tracker-help-state-to-the-sidebar-component' into 'master'

Remove duplicated css for time tracking componenet

See merge request gitlab-org/gitlab!77087
parents b66d65b9 010bca71
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
/> />
</template> </template>
</div> </div>
<board-sidebar-time-tracker class="swimlanes-sidebar-time-tracker" /> <board-sidebar-time-tracker />
<sidebar-date-widget <sidebar-date-widget
:iid="activeBoardItem.iid" :iid="activeBoardItem.iid"
:full-path="fullPath" :full-path="fullPath"
......
...@@ -94,15 +94,3 @@ $epic-icons-spacing: 40px; ...@@ -94,15 +94,3 @@ $epic-icons-spacing: 40px;
max-width: calc(100vw - #{$contextual-sidebar-width} - #{$gutter-width} - #{$epic-icons-spacing}); max-width: calc(100vw - #{$contextual-sidebar-width} - #{$gutter-width} - #{$epic-icons-spacing});
} }
} }
.swimlanes-sidebar-time-tracker {
.time-tracking-help-state {
margin: 16px -24px 0;
@include gl-px-6;
@include gl-py-2;
@include gl-border-gray-100;
@include gl-border-t-solid;
@include gl-border-t-1;
@include gl-border-b-0;
}
}
...@@ -57,9 +57,7 @@ exports[`ee/BoardContentSidebar matches the snapshot 1`] = ` ...@@ -57,9 +57,7 @@ exports[`ee/BoardContentSidebar matches the snapshot 1`] = `
/> />
</div> </div>
<boardsidebartimetracker-stub <boardsidebartimetracker-stub />
class="swimlanes-sidebar-time-tracker"
/>
<sidebardatewidget-stub <sidebardatewidget-stub
data-testid="sidebar-due-date" data-testid="sidebar-due-date"
......
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