Skip to content

G
gitlab-ce
Commit b74bf5f6 authored by Himanshu Kapoor's avatar Himanshu Kapoor Committed by Kushal Pandya
Browse files
Options

Pull out monaco overrides in a separate file 

Monaco related CSS overrides can should be in a separate file to
reduce the number of stylelint errors in the main file.
parent 5a0c073c
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 200 deletions
app/assets/javascripts/ide/components/commit_sidebar/list.vue
View file @ b74bf5f6
......@@ -94,7 +94,7 @@ export default {
data-boundary="viewport"
@click="openDiscardModal"
>
<icon :size="16" name="remove-all" class="ml-auto mr-auto" />
<icon :size="16" name="remove-all" class="ml-auto mr-auto position-top-0" />
</button>
</div>
</div>
......
app/assets/javascripts/ide/components/pipelines/list.vue
View file @ b74bf5f6
......@@ -59,7 +59,7 @@ export default {
<gl-loading-icon v-if="showLoadingIcon" :size="2" class="prepend-top-default" />
<template v-else-if="hasLoadedPipeline">
<header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header">
<ci-icon :status="latestPipeline.details.status" :size="24" />
<ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" />
<span class="prepend-left-8">
<strong> {{ __('Pipeline') }} </strong>
<a
......@@ -76,6 +76,7 @@ export default {
:help-page-path="links.ciHelpPagePath"
:empty-state-svg-path="pipelinesEmptyStateSvgPath"
:can-set-ci="true"
class="mb-auto mt-auto"
/>
<div v-else-if="latestPipeline.yamlError" class="bs-callout bs-callout-danger">
<p class="append-bottom-0">{{ __('Found errors in your .gitlab-ci.yml:') }}</p>
......
app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss 0 → 100644
View file @ b74bf5f6
// stylelint-disable selector-class-pattern
// stylelint-disable selector-max-compound-selectors
// stylelint-disable stylelint-gitlab/duplicate-selectors
// stylelint-disable stylelint-gitlab/utility-classes
.blob-editor-container {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
justify-content: center;
.vertical-center {
min-height: auto;
}
.monaco-editor .lines-content .cigr {
display: none;
}
.monaco-editor .selected-text {
z-index: 1;
}
.monaco-editor .view-lines {
z-index: 2;
}
.is-readonly,
.editor.original {
.view-lines {
cursor: default;
}
.cursors-layer {
display: none;
}
}
.is-deleted {
.editor.modified {
.margin-view-overlays,
.lines-content,
.decorationsOverviewRuler {
// !important to override monaco inline styles
display: none !important;
}
}
.diffOverviewRuler.modified {
// !important to override monaco inline styles
display: none !important;
}
}
.is-added {
.editor.original {
.margin-view-overlays,
.lines-content,
.decorationsOverviewRuler {
// !important to override monaco inline styles
display: none !important;
}
}
.diffOverviewRuler.original {
// !important to override monaco inline styles
display: none !important;
}
}
.monaco-diff-editor.vs {
.editor.modified {
box-shadow: none;
}
.diagonal-fill {
display: none !important;
}
.diffOverview {
background-color: $white-light;
border-left: 1px solid $white-dark;
cursor: ns-resize;
}
.diffViewport {
display: none;
}
.char-insert {
background-color: $line-added-dark;
}
.char-delete {
background-color: $line-removed-dark;
}
.line-numbers {
color: $black-transparent;
}
.view-overlays {
.line-insert {
background-color: $line-added;
}
.line-delete {
background-color: $line-removed;
}
}
.margin {
background-color: $white-light;
border-right: 1px solid $gray-100;
.line-insert {
border-right: 1px solid $line-added-dark;
}
.line-delete {
border-right: 1px solid $line-removed-dark;
}
}
.margin-view-overlays .insert-sign,
.margin-view-overlays .delete-sign {
opacity: 0.4;
}
}
}
.multi-file-editor-holder {
height: 100%;
min-height: 0; // firefox fix
&.is-readonly .vs,
.vs .editor.original {
.monaco-editor,
.monaco-editor-background,
.monaco-editor .inputarea.ime-input {
background-color: $gray-50;
}
}
}
app/assets/stylesheets/page_bundles/ide.scss
View file @ b74bf5f6
@import 'framework/variables';
@import 'framework/mixins';
@import './ide_mixins';
@import './ide_monaco_overrides';
$search-list-icon-width: 18px;
$ide-activity-bar-width: 60px;
......@@ -16,11 +17,6 @@ $ide-commit-header-height: 48px;
display: inline-block;
}
.fade-enter,
.fade-leave-to {
opacity: 0;
}
.commit-message {
@include str-truncated(250px);
}
......@@ -49,10 +45,6 @@ $ide-commit-header-height: 48px;
flex-direction: column;
flex: 1;
min-height: 0; // firefox fix
a {
color: $gl-text-color;
}
}
.multi-file-loading-container {
......@@ -160,157 +152,6 @@ $ide-commit-header-height: 48px;
height: 0;
}
// stylelint-disable selector-class-pattern
// stylelint-disable selector-max-compound-selectors
// stylelint-disable stylelint-gitlab/duplicate-selectors
// stylelint-disable stylelint-gitlab/utility-classes
.blob-editor-container {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
justify-content: center;
.vertical-center {
min-height: auto;
}
.monaco-editor .lines-content .cigr {
display: none;
}
.monaco-editor .selected-text {
z-index: 1;
}
.monaco-editor .view-lines {
z-index: 2;
}
.is-readonly,
.editor.original {
.view-lines {
cursor: default;
}
.cursors-layer {
display: none;
}
}
.is-deleted {
.editor.modified {
.margin-view-overlays,
.lines-content,
.decorationsOverviewRuler {
// !important to override monaco inline styles
display: none !important;
}
}
.diffOverviewRuler.modified {
// !important to override monaco inline styles
display: none !important;
}
}
.is-added {
.editor.original {
.margin-view-overlays,
.lines-content,
.decorationsOverviewRuler {
// !important to override monaco inline styles
display: none !important;
}
}
.diffOverviewRuler.original {
// !important to override monaco inline styles
display: none !important;
}
}
.monaco-diff-editor.vs {
.editor.modified {
box-shadow: none;
}
.diagonal-fill {
display: none !important;
}
.diffOverview {
background-color: $white-light;
border-left: 1px solid $white-dark;
cursor: ns-resize;
}
.diffViewport {
display: none;
}
.char-insert {
background-color: $line-added-dark;
}
.char-delete {
background-color: $line-removed-dark;
}
.line-numbers {
color: $black-transparent;
}
.view-overlays {
.line-insert {
background-color: $line-added;
}
.line-delete {
background-color: $line-removed;
}
}
.margin {
background-color: $white-light;
border-right: 1px solid $gray-100;
.line-insert {
border-right: 1px solid $line-added-dark;
}
.line-delete {
border-right: 1px solid $line-removed-dark;
}
}
.margin-view-overlays .insert-sign,
.margin-view-overlays .delete-sign {
opacity: 0.4;
}
}
}
.multi-file-editor-holder {
height: 100%;
min-height: 0; // firefox fix
&.is-readonly .vs,
.vs .editor.original {
.monaco-editor,
.monaco-editor-background,
.monaco-editor .inputarea.ime-input {
background-color: $gray-50;
}
}
}
// stylelint-enable selector-class-pattern
// stylelint-enable selector-max-compound-selectors
// stylelint-enable stylelint-gitlab/duplicate-selectors
// stylelint-enable stylelint-gitlab/utility-classes
.preview-container {
flex-grow: 1;
position: relative;
......@@ -671,10 +512,6 @@ $ide-commit-header-height: 48px;
width: $ide-commit-row-height;
height: $ide-commit-row-height;
color: inherit;
> svg {
top: 0;
}
}
.ide-commit-file-count {
......@@ -864,39 +701,39 @@ $ide-commit-header-height: 48px;
margin-left: auto;
}
.ide-nav-dropdown {
width: 100%;
margin-bottom: 12px;
button {
color: $gl-text-color;
}
}
.dropdown-menu {
width: 385px;
max-height: initial;
}
.ide-nav-dropdown {
width: 100%;
margin-bottom: 12px;
.dropdown-menu-toggle {
svg {
vertical-align: middle;
color: $gray-700;
.dropdown-menu {
width: 385px;
max-height: initial;
}
&:hover {
color: $gray-700;
}
}
.dropdown-menu-toggle {
svg {
vertical-align: middle;
color: $gray-700;
&:hover {
background-color: $white-normal;
color: $gray-700;
}
}
&.show {
.dropdown-menu-toggle {
background-color: $white-dark;
}
&:hover {
background-color: $white-normal;
}
}
button {
color: $gl-text-color;
&.show {
.dropdown-menu-toggle {
background-color: $white-dark;
}
}
}
......@@ -945,6 +782,8 @@ $ide-commit-header-height: 48px;
transform: translateY(0);
}
.fade-enter,
.fade-leave-to,
.commit-form-slide-up-enter,
.commit-form-slide-up-leave-to {
opacity: 0;
......@@ -1063,9 +902,6 @@ $ide-commit-header-height: 48px;
@include ide-trace-view();
.empty-state {
margin-top: auto;
margin-bottom: auto;
p {
margin: $grid-size 0;
text-align: center;
......@@ -1092,10 +928,6 @@ $ide-commit-header-height: 48px;
min-height: 55px;
padding-left: $gl-padding;
padding-right: $gl-padding;
.ci-status-icon {
display: flex;
}
}
.ide-job-item {
......@@ -1135,7 +967,7 @@ $ide-commit-header-height: 48px;
}
.ide-nav-form {
.nav-links li {
li {
width: 50%;
padding-left: 0;
padding-right: 0;
......@@ -1222,10 +1054,6 @@ $ide-commit-header-height: 48px;
background-color: $blue-500;
outline: 0;
}
svg {
fill: currentColor;
}
}
.ide-new-btn {
......
spec/frontend/ide/components/pipelines/__snapshots__/list_spec.js.snap
View file @ b74bf5f6
......@@ -8,6 +8,7 @@ exports[`IDE pipelines list when loaded renders empty state when no latestPipeli
<empty-state-stub
cansetci="true"
class="mb-auto mt-auto"
emptystatesvgpath="http://test.host"
helppagepath="http://test.host"
/>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7