Commit c6cb95c5 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '27774-ide-scss-utility-classes' into 'master'

ide.scss: Use utility classes where possible

See merge request gitlab-org/gitlab!24264
parents 95d90d31 42334a24
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
<ci-icon :status="job.status" :borderless="true" :size="24" class="d-flex" /> <ci-icon :status="job.status" :borderless="true" :size="24" class="d-flex" />
<span class="prepend-left-8"> <span class="prepend-left-8">
{{ job.name }} {{ job.name }}
<a :href="job.path" target="_blank" class="ide-external-link"> <a :href="job.path" target="_blank" class="ide-external-link position-relative">
{{ jobId }} <icon :size="12" name="external-link" /> {{ jobId }} <icon :size="12" name="external-link" />
</a> </a>
</span> </span>
......
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
v-tooltip="showTooltip" v-tooltip="showTooltip"
:title="showTooltip ? stage.name : null" :title="showTooltip ? stage.name : null"
data-container="body" data-container="body"
class="prepend-left-8 ide-stage-title" class="prepend-left-8 text-truncate"
> >
{{ stage.name }} {{ stage.name }}
</strong> </strong>
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
</div> </div>
<icon :name="collapseIcon" class="ide-stage-collapse-icon" /> <icon :name="collapseIcon" class="ide-stage-collapse-icon" />
</div> </div>
<div v-show="!stage.isCollapsed" ref="jobList" class="card-body"> <div v-show="!stage.isCollapsed" ref="jobList" class="card-body p-0">
<gl-loading-icon v-if="showLoadingIcon" /> <gl-loading-icon v-if="showLoadingIcon" />
<template v-else> <template v-else>
<item v-for="job in stage.jobs" :key="job.id" :job="job" @clickViewLog="clickViewLog" /> <item v-for="job in stage.jobs" :key="job.id" :job="job" @clickViewLog="clickViewLog" />
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
</script> </script>
<template> <template>
<div class="ide-new-btn"> <div class="ide-new-btn d-none">
<div <div
:class="{ :class="{
show: isOpen, show: isOpen,
......
...@@ -62,7 +62,11 @@ export default { ...@@ -62,7 +62,11 @@ export default {
<ci-icon :status="latestPipeline.details.status" :size="24" /> <ci-icon :status="latestPipeline.details.status" :size="24" />
<span class="prepend-left-8"> <span class="prepend-left-8">
<strong> {{ __('Pipeline') }} </strong> <strong> {{ __('Pipeline') }} </strong>
<a :href="latestPipeline.path" target="_blank" class="ide-external-link"> <a
:href="latestPipeline.path"
target="_blank"
class="ide-external-link position-relative"
>
#{{ latestPipeline.id }} <icon :size="12" name="external-link" /> #{{ latestPipeline.id }} <icon :size="12" name="external-link" />
</a> </a>
</span> </span>
......
...@@ -274,7 +274,7 @@ export default { ...@@ -274,7 +274,7 @@ export default {
<template> <template>
<div id="ide" class="blob-viewer-container blob-editor-container"> <div id="ide" class="blob-viewer-container blob-editor-container">
<div class="ide-mode-tabs clearfix"> <div class="ide-mode-tabs clearfix">
<ul v-if="!shouldHideEditor && isEditModeActive" class="nav-links float-left"> <ul v-if="!shouldHideEditor && isEditModeActive" class="nav-links float-left border-bottom-0">
<li :class="editTabCSS"> <li :class="editTabCSS">
<a <a
href="javascript:void(0);" href="javascript:void(0);"
......
...@@ -25,10 +25,6 @@ $ide-commit-header-height: 48px; ...@@ -25,10 +25,6 @@ $ide-commit-header-height: 48px;
@include str-truncated(250px); @include str-truncated(250px);
} }
.editable-mode {
display: inline-block;
}
.ide-view { .ide-view {
position: relative; position: relative;
margin-top: 0; margin-top: 0;
...@@ -344,13 +340,9 @@ $ide-commit-header-height: 48px; ...@@ -344,13 +340,9 @@ $ide-commit-header-height: 48px;
.ide-mode-tabs { .ide-mode-tabs {
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
.nav-links { li a {
border-bottom: 0; padding: $gl-padding-8 $gl-padding;
line-height: $gl-btn-line-height;
li a {
padding: $gl-padding-8 $gl-padding;
line-height: $gl-btn-line-height;
}
} }
} }
...@@ -1025,8 +1017,6 @@ $ide-commit-header-height: 48px; ...@@ -1025,8 +1017,6 @@ $ide-commit-header-height: 48px;
} }
.ide-external-link { .ide-external-link {
position: relative;
svg { svg {
display: none; display: none;
position: absolute; position: absolute;
...@@ -1129,22 +1119,12 @@ $ide-commit-header-height: 48px; ...@@ -1129,22 +1119,12 @@ $ide-commit-header-height: 48px;
align-items: center; align-items: center;
} }
} }
.card-body {
padding: 0;
}
} }
.ide-stage-collapse-icon { .ide-stage-collapse-icon {
margin: auto 0 auto auto; margin: auto 0 auto auto;
} }
.ide-stage-title {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ide-job-header { .ide-job-header {
min-height: 60px; min-height: 60px;
} }
...@@ -1244,8 +1224,6 @@ $ide-commit-header-height: 48px; ...@@ -1244,8 +1224,6 @@ $ide-commit-header-height: 48px;
} }
.ide-new-btn { .ide-new-btn {
display: none;
.btn { .btn {
padding: 2px 5px; padding: 2px 5px;
} }
......
...@@ -14,7 +14,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = ` ...@@ -14,7 +14,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
/> />
<strong <strong
class="prepend-left-8 ide-stage-title" class="prepend-left-8 text-truncate"
data-container="body" data-container="body"
data-original-title="" data-original-title=""
title="" title=""
...@@ -42,7 +42,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = ` ...@@ -42,7 +42,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
</div> </div>
<div <div
class="card-body" class="card-body p-0"
> >
<item-stub <item-stub
job="[object Object]" job="[object Object]"
......
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