Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss1
-rw-r--r--app/assets/stylesheets/framework/calendar.scss8
-rw-r--r--app/assets/stylesheets/framework/ci_variable_list.scss77
-rw-r--r--app/assets/stylesheets/framework/diffs.scss247
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss1
-rw-r--r--app/assets/stylesheets/framework/flash.scss27
-rw-r--r--app/assets/stylesheets/framework/flex_grid.scss52
-rw-r--r--app/assets/stylesheets/framework/gfm.scss6
-rw-r--r--app/assets/stylesheets/framework/lists.scss7
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss29
-rw-r--r--app/assets/stylesheets/framework/memory_graph.scss4
-rw-r--r--app/assets/stylesheets/framework/tables.scss16
-rw-r--r--app/assets/stylesheets/framework/timeline.scss26
-rw-r--r--app/assets/stylesheets/framework/toggle.scss131
-rw-r--r--app/assets/stylesheets/framework/typography.scss12
-rw-r--r--app/assets/stylesheets/framework/variables.scss21
-rw-r--r--app/assets/stylesheets/framework/wells.scss9
17 files changed, 81 insertions, 593 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index f947042ba51..799777977ed 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -66,7 +66,6 @@
}
&.content-component-block {
- padding: 8px 0;
background-color: $body-bg;
}
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index b1e5ca50a8b..e69d7b4462d 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -1,9 +1,17 @@
.user-contrib-cell {
+ stroke: $t-gray-a-08;
+
&:hover {
cursor: pointer;
stroke: $black;
}
+ &:focus {
+ @include gl-outline-none;
+ stroke: $white;
+ filter: drop-shadow(1px 0 0.5px $blue-400) drop-shadow(0 1px 0.5px $blue-400) drop-shadow(-1px 0 0.5px $blue-400) drop-shadow(0 -1px 0.5px $blue-400);
+ }
+
// `app/assets/javascripts/pages/users/activity_calendar.js` sets this attribute
@for $i from 1 through length($calendar-activity-colors) {
$color: nth($calendar-activity-colors, $i);
diff --git a/app/assets/stylesheets/framework/ci_variable_list.scss b/app/assets/stylesheets/framework/ci_variable_list.scss
deleted file mode 100644
index ef4355ad157..00000000000
--- a/app/assets/stylesheets/framework/ci_variable_list.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-.ci-variable-list {
- margin-left: 0;
- margin-bottom: 0;
- padding-left: 0;
- list-style: none;
- clear: both;
-}
-
-.ci-variable-row {
- display: flex;
- align-items: flex-start;
-
- @include media-breakpoint-down(xs) {
- align-items: flex-end;
- }
-
- &:not(:last-child) {
- margin-bottom: $gl-btn-padding;
-
- @include media-breakpoint-down(xs) {
- margin-bottom: 3 * $gl-btn-padding;
- }
- }
-
- &:last-child {
- .ci-variable-body-item:last-child {
- margin-right: $ci-variable-remove-button-width;
-
- @include media-breakpoint-down(xs) {
- margin-right: 0;
- }
- }
-
- .ci-variable-row-remove-button {
- display: none;
- }
-
- @include media-breakpoint-down(xs) {
- .ci-variable-row-body {
- margin-right: $ci-variable-remove-button-width;
- }
- }
- }
-}
-
-.ci-variable-row-body {
- display: flex;
- align-items: flex-start;
- width: 100%;
- padding-bottom: $gl-padding;
-
- @include media-breakpoint-down(xs) {
- display: block;
- }
-}
-
-.ci-variable-body-item {
- flex: 1;
-
- &:not(:last-child) {
- margin-right: $gl-btn-padding;
-
- @include media-breakpoint-down(xs) {
- margin-right: 0;
- margin-bottom: $gl-btn-padding;
- }
- }
-}
-
-.ci-variable-masked-item,
-.ci-variable-protected-item {
- flex: 0 1 auto;
- display: flex;
- align-items: center;
- padding-top: 5px;
- padding-bottom: 5px;
-}
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index 8d1fb5eb55f..f7cd5d7e183 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -43,7 +43,7 @@
z-index: 120;
&.is-sidebar-moved {
- --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 28px});
+ --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 24px});
}
.with-system-header & {
@@ -578,78 +578,6 @@ table.code {
}
}
-// Merge request diff grid layout
-.diff-grid {
- .diff-td {
- // By default min-width is auto with 1fr which causes some overflow problems
- // https://gitlab.com/gitlab-org/gitlab/-/issues/296222
- min-width: 0;
- }
-
- .diff-grid-row {
- display: grid;
- grid-template-columns: 1fr 1fr;
-
- &.diff-grid-row-full {
- grid-template-columns: 1fr;
- }
- }
-
- .diff-grid-left,
- .diff-grid-right {
- display: grid;
- // Zero width column is a placeholder for the EE inline code quality diff
- // see ee/.../diffs.scss for more details
- grid-template-columns: 50px 8px 0 1fr;
- }
-
- .diff-grid-2-col {
- grid-template-columns: 100px 1fr !important;
-
- &.parallel {
- grid-template-columns: 50px 1fr !important;
- }
- }
-
- .diff-grid-comments {
- display: grid;
- grid-template-columns: 1fr 1fr;
- }
-
- .diff-grid-drafts {
- display: grid;
- grid-template-columns: 1fr 1fr;
- }
-
- &.inline-diff-view {
- .diff-grid-comments {
- display: grid;
- grid-template-columns: 1fr;
- }
-
- .diff-grid-drafts {
- display: grid;
- grid-template-columns: 1fr;
- }
-
- .diff-grid-row {
- grid-template-columns: 1fr;
- }
-
- .diff-grid-left,
- .diff-grid-right {
- // Zero width column is a placeholder for the EE inline code quality diff
- // see ee/../diffs.scss for more details
- grid-template-columns: 50px 50px 8px 0 1fr;
- }
- }
-}
-
-// Merge request diff grid layout overrides
-.diff-table.code .diff-tr.line_holder .diff-td.line_content.parallel {
- width: unset;
-}
-
.diff-stats {
align-items: center;
padding: 0 1rem;
@@ -730,68 +658,6 @@ table.code {
}
}
-.diff-comment-avatar-holders {
- position: absolute;
- margin-left: -$gl-padding;
- z-index: 100;
- @include code-icon-size();
-
- &:hover {
- .diff-comment-avatar,
- .diff-comments-more-count {
- @for $i from 1 through 4 {
- $x-pos: 14px;
-
- &:nth-child(#{$i}) {
- @if $i == 4 {
- $x-pos: 14.5px;
- }
-
- transform: translateX((($i * $x-pos) - $x-pos));
-
- &:hover {
- transform: translateX((($i * $x-pos) - $x-pos));
- }
- }
- }
- }
-
- .diff-comments-more-count {
- padding-left: 2px;
- padding-right: 2px;
- width: auto;
- }
- }
-}
-
-.diff-comment-avatar,
-.diff-comments-more-count {
- position: absolute;
- left: 0;
- margin-right: 0;
- border-color: $white;
- cursor: pointer;
- transition: all 0.1s ease-out;
- @include code-icon-size();
-
- @for $i from 1 through 4 {
- &:nth-child(#{$i}) {
- z-index: (4 - $i);
- }
- }
-
- .avatar {
- @include code-icon-size();
- }
-}
-
-.diff-comments-more-count {
- padding-left: 0;
- padding-right: 0;
- overflow: hidden;
- @include code-icon-size();
-}
-
.diff-comments-more-count,
.diff-notes-collapse,
.diff-codequality-collapse {
@@ -867,70 +733,6 @@ table.code {
}
}
-
-.diff-file-changes {
- max-width: 560px;
- width: 100%;
- z-index: 150;
- min-height: $dropdown-min-height;
- max-height: $dropdown-max-height;
- overflow-y: auto;
- margin-bottom: 0;
-
- @include media-breakpoint-up(sm) {
- left: $gl-padding;
- }
-
- .dropdown-input .dropdown-input-search {
- pointer-events: all;
- }
-
- .diff-changed-file {
- display: flex;
- padding-top: 8px;
- padding-bottom: 8px;
- min-width: 0;
- }
-
- .diff-file-changed-icon {
- margin-top: 2px;
- }
-
- .diff-changed-file-content {
- display: flex;
- flex-direction: column;
- min-width: 0;
- }
-
- .diff-changed-file-name,
- .diff-changed-blank-file-name {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .diff-changed-blank-file-name {
- color: $gl-text-color-tertiary;
- font-style: italic;
- }
-
- .diff-changed-file-path {
- color: $gl-text-color-tertiary;
- }
-
- .diff-changed-stats {
- margin-left: auto;
- white-space: nowrap;
- }
-}
-
-.diff-file-changes-path {
- flex: 1;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
.note-container {
background-color: $gray-light;
border-top: 1px solid $white-normal;
@@ -1007,27 +809,6 @@ table.code {
}
}
-// Notes tweaks for the Changes tab ONLY
-.diff-tr {
- .timeline-discussion-body {
- clear: left;
-
- .note-body {
- margin-top: 0 !important;
- }
- }
-
- .timeline-entry img.avatar {
- margin-top: -2px;
- margin-right: $gl-padding-8;
- }
-
- // tiny adjustment to vertical align with the note header text
- .discussion-collapsible .timeline-icon {
- padding-top: 2px;
- }
-}
-
.files:not([data-can-create-note]) .frame {
cursor: auto;
}
@@ -1097,6 +878,7 @@ table.code {
.discussion-notes {
min-height: 35px;
+ background-color: transparent;
&:first-child {
// First child does not have the jagged borders
@@ -1121,6 +903,17 @@ table.code {
display: none;
}
}
+
+ ul.notes {
+ li.toggle-replies-widget,
+ .discussion-reply-holder {
+ margin-left: 2.5rem;
+
+ .reply-author-avatar {
+ height: 1.5rem;
+ }
+ }
+ }
}
.discussion-body .image .frame {
@@ -1183,9 +976,15 @@ table.code {
bottom: 100vh;
}
-.diff-line-expand-button {
- &:hover,
- &:focus {
- @include gl-bg-gray-200;
+.diff-grid-row.expansion.match {
+ border-top: 1px solid var(--diff-expansion-background-color);
+ border-bottom: 1px solid var(--diff-expansion-background-color);
+
+ &:first-child {
+ border-top: 0;
+ }
+
+ &:last-child {
+ border-bottom: 0;
}
}
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index d91524d99e6..d561a7d9450 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -469,6 +469,7 @@
.sidebar-participant {
.merge-icon {
top: calc(50% + 5px);
+ left: 3rem;
}
}
}
diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss
index b51daf0e4dc..b63365e8159 100644
--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -46,12 +46,14 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
.flash-notice,
.flash-success,
.flash-warning {
- padding: $gl-padding $gl-padding-32 $gl-padding ($gl-padding + $gl-padding-4);
- margin-top: 10px;
-
- .container-fluid,
- .container-fluid.container-limited {
- background: transparent;
+ &:not(.gl-alert) {
+ padding: $gl-padding $gl-padding-32 $gl-padding ($gl-padding + $gl-padding-4);
+ margin-top: 10px;
+
+ .container-fluid,
+ .container-fluid.container-limited {
+ background: transparent;
+ }
}
}
@@ -79,6 +81,19 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
.gl-alert {
@include gl-my-4;
}
+
+ &.flash-container-no-margin {
+ .gl-alert {
+ @include gl-my-0;
+ }
+
+ .flash-alert,
+ .flash-notice,
+ .flash-success,
+ .flash-warning {
+ @include gl-mt-0;
+ }
+ }
}
@include media-breakpoint-down(sm) {
diff --git a/app/assets/stylesheets/framework/flex_grid.scss b/app/assets/stylesheets/framework/flex_grid.scss
deleted file mode 100644
index 10537fd5549..00000000000
--- a/app/assets/stylesheets/framework/flex_grid.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-.flex-grid {
- .grid-row {
- border-bottom: 1px solid $border-color;
- padding: 0;
-
- &:last-child {
- border-bottom: 0;
- }
-
- @include media-breakpoint-down(md) {
- border-bottom: 0;
- border-right: 1px solid $border-color;
-
- &:last-child {
- border-right: 0;
- }
- }
-
- @include media-breakpoint-down(xs) {
- border-right: 0;
- border-bottom: 1px solid $border-color;
-
- &:last-child {
- border-bottom: 0;
- }
- }
- }
-
- .grid-cell {
- padding: 10px $gl-padding;
- border-right: 1px solid $border-color;
-
- &:last-child {
- border-right: 0;
- }
-
- @include media-breakpoint-up(md) {
- flex: 1;
- }
-
- @include media-breakpoint-down(md) {
- border-right: 0;
- flex: none;
- }
- }
-}
-
-.card {
- .card-body.flex-grid {
- padding: 0;
- }
-}
diff --git a/app/assets/stylesheets/framework/gfm.scss b/app/assets/stylesheets/framework/gfm.scss
index 40e11b50eba..66d163f608a 100644
--- a/app/assets/stylesheets/framework/gfm.scss
+++ b/app/assets/stylesheets/framework/gfm.scss
@@ -8,13 +8,15 @@
font-size: 95%;
}
-.gfm-project_member {
+.gfm-project_member,
+.md a.gfm-project_member {
padding: 0 2px;
background-color: $blue-100;
border-radius: $border-radius-default;
+ color: $blue-700;
&.current-user {
- background-color: $orange-50;
+ background-color: $orange-100;
}
}
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index d2bb1e3d555..e9a507ebb6b 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -109,12 +109,6 @@ ul.content-list {
color: $gl-text-color;
word-break: break-word;
- &.no-description {
- .title {
- line-height: $list-text-height;
- }
- }
-
.title {
font-weight: $gl-font-weight-bold;
}
@@ -221,6 +215,7 @@ ul.content-list {
}
}
+ul.content-list.content-list-items-padding > li,
ul.content-list.issuable-list > li,
ul.content-list.todos-list > li,
.card > .content-list > li {
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index b623f18c4ae..c40cadafb9c 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -44,12 +44,6 @@
}
}
-.div-dropzone-alert {
- margin-top: 5px;
- margin-bottom: 0;
- transition: opacity 200ms ease-in-out;
-}
-
.md-header {
.nav-links {
a {
@@ -155,8 +149,16 @@
.md-suggestion-diff {
display: table !important;
border: 1px solid $border-color !important;
- width: 100% !important;
- font-family: $monospace-font !important;
+
+ td {
+ border: 0 !important;
+ }
+
+ tr.old {
+ td {
+ border-radius: 0 !important;
+ }
+ }
}
.suggestions.md > .markdown-code-block {
@@ -164,23 +166,12 @@
}
.md-suggestion-header {
- height: $suggestion-header-height;
display: flex;
align-items: center;
justify-content: space-between;
background-color: $gray-light;
border: 1px solid $border-color;
- padding: $gl-padding;
border-radius: $border-radius-default $border-radius-default 0 0;
-
- svg {
- vertical-align: middle;
- margin-bottom: 3px;
- }
-
- .dropdown-chevron {
- margin-bottom: 0;
- }
}
@include media-breakpoint-down(xs) {
diff --git a/app/assets/stylesheets/framework/memory_graph.scss b/app/assets/stylesheets/framework/memory_graph.scss
deleted file mode 100644
index 510969e149a..00000000000
--- a/app/assets/stylesheets/framework/memory_graph.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.memory-graph-container {
- background: $white;
- border: 1px solid $gray-100;
-}
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index f39d53c5b1c..8b2a494527b 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -4,22 +4,6 @@
}
table {
- /*
- * TODO
- * This is a temporary workaround until we fix the neutral
- * color palette in https://gitlab.com/gitlab-org/gitlab/-/issues/213570
- *
- * The overwrites here affected the following areas:
- * - The subscription seats table. When removing this code, the .seats-table
- * <th> and margin overrides should be removed there.
- *
- * Remove this code as soon as this happens
- *
- */
- &.gl-table {
- @include gl-text-gray-500;
- }
-
&.table {
.thead-white {
th {
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 43effbdd7d7..32e9bba8712 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -28,15 +28,9 @@
.timeline-entry {
color: $gl-text-color;
- // [dark-theme]: only give background color to actual notes
- // in the timeline, the note form textarea has a background
- // of it's own
- &:not(.note-form) {
- background-color: $white;
- }
-
- &:not(.note-form).internal-note {
- background-color: $orange-50;
+ &:not(.note-form).internal-note .timeline-content,
+ &:not(.note-form).draft-note .timeline-content {
+ background-color: $orange-50 !important;
}
.timeline-entry-inner {
@@ -45,23 +39,15 @@
&:target,
&.target {
- background: $line-target-blue;
+ .timeline-content {
+ background: $line-target-blue !important;
+ }
&.system-note .note-body .note-text.system-note-commit-list::after {
background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%);
}
}
- img.avatar {
- margin-right: $gl-padding-12;
-
- @include media-breakpoint-down(sm) {
- width: $gl-spacing-scale-6;
- height: $gl-spacing-scale-6;
- margin-right: $gl-padding-8;
- }
- }
-
.controls {
padding-top: 10px;
float: right;
diff --git a/app/assets/stylesheets/framework/toggle.scss b/app/assets/stylesheets/framework/toggle.scss
deleted file mode 100644
index fd888fdec65..00000000000
--- a/app/assets/stylesheets/framework/toggle.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
-* Toggle button
-*
-* @usage
-* ### Active and Inactive text should be provided as data attributes:
-* <button type="button" class="project-feature-toggle" data-enabled-text="Enabled" data-disabled-text="Disabled">
-* <span class="gl-spinner loading-icon hidden" aria-label="Loading"></span>
-* </button>
-
-* ### Checked should have `is-checked` class
-* <button type="button" class="project-feature-toggle is-checked" data-enabled-text="Enabled" data-disabled-text="Disabled">
-* <span class="gl-spinner loading-icon hidden" aria-label="Loading"></span>
-* </button>
-
-* ### Disabled should have `is-disabled` class
-* <button type="button" class="project-feature-toggle is-disabled" data-enabled-text="Enabled" data-disabled-text="Disabled" disabled="true">
-* <span class="gl-spinner loading-icon hidden" aria-label="Loading"></span>
-* </button>
-
-* ### Loading should have `is-loading` and an icon with `loading-icon` class
-* <button type="button" class="project-feature-toggle is-loading" data-enabled-text="Enabled" data-disabled-text="Disabled">
-* <span class="gl-spinner loading-icon" aria-label="Loading"></span>
-* </button>
-*/
-.project-feature-toggle {
- position: relative;
- border: 0;
- outline: 0;
- display: block;
- width: 50px;
- height: 24px;
- cursor: pointer;
- user-select: none;
- background: $gray-400;
- border-radius: 12px;
- padding: 3px;
- transition: all 0.4s ease;
-
- &::selection,
- &::before::selection,
- &::after::selection {
- background: none;
- }
-
- &:focus {
- outline: none;
- }
-
- .toggle-icon {
- position: relative;
- display: block;
- left: 0;
- border-radius: 9px;
- background: $white;
- transition: all 0.2s ease;
- width: $default-icon-size;
- height: $default-icon-size;
- }
-
- .loading-icon {
- display: none;
- font-size: 12px;
- color: $white;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
-
- &.is-loading {
- .loading-icon {
- display: block;
-
- &::before {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
- }
- }
-
- &.is-checked {
- background: $blue-400;
-
- .toggle-icon {
- left: calc(100% - 18px);
- }
- }
-
- &.is-checked .toggle-icon .toggle-status-checked,
- .toggle-icon .toggle-status-unchecked {
- display: inline;
- }
-
- &.is-checked .toggle-icon .toggle-status-unchecked,
- &.is-loading .toggle-icon,
- .toggle-icon .toggle-status-checked {
- display: none;
- }
-
- &.is-disabled {
- opacity: 0.4;
- cursor: not-allowed;
- }
-
- @include media-breakpoint-down(xs) {
- width: 50px;
-
- &::before,
- &.is-checked::before {
- display: none;
- }
- }
-
- @keyframes animate-enabled {
- 0%,
-
- 35% { opacity: 0; }
-
- 100% { opacity: 1; }
- }
-
- @keyframes animate-disabled {
- 0%,
-
- 35% { opacity: 0; }
-
- 100% { opacity: 1; }
- }
-}
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index e79fb843967..2c2d8a2b592 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -33,14 +33,6 @@
}
}
- a {
- color: $blue-600;
-
- > code {
- color: $blue-600;
- }
- }
-
.media-container {
display: inline-flex;
flex-direction: column;
@@ -717,10 +709,6 @@ textarea.js-gfm-input {
font-size: $gl-font-size-monospace;
}
-.strikethrough {
- text-decoration: line-through;
-}
-
h1,
h2,
h3,
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index bd32a817d5d..9cfc5a0201e 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -382,6 +382,8 @@ $gl-text-color-quaternary: #d6d6d6;
$gl-text-color-inverted: $white;
$gl-text-color-secondary-inverted: rgba($white, 0.85);
$gl-text-color-disabled: $gray-400;
+$link-color: $blue-500 !default;
+$link-hover-color: $blue-500 !default;
$gl-grayish-blue: #7f8fa4;
$gl-header-color: #4c4e54;
$gl-font-size-12: 12px;
@@ -440,7 +442,6 @@ $browser-scrollbar-size: 10px;
$header-height: var(--header-height, 48px);
$header-zindex: 1000;
$zindex-dropdown-menu: 300;
-$suggestion-header-height: 46px;
$ide-statusbar-height: 25px;
$fixed-layout-width: 1280px;
$limited-layout-width: 990px;
@@ -650,14 +651,6 @@ $calendar-border-color: rgba(#000, 0.1);
$calendar-user-contrib-text: #959494;
/*
- * Value Stream Analytics
- */
-$cycle-analytics-box-padding: 30px;
-$cycle-analytics-box-text-color: #8c8c8c;
-$cycle-analytics-big-font: 19px;
-$cycle-analytics-dismiss-icon-color: #b2b2b2;
-
-/*
* CI
*/
$ci-skipped-color: #888;
@@ -717,11 +710,11 @@ $job-arrow-margin: 55px;
*/
// See https://gitlab.com/gitlab-org/gitlab/-/issues/332150 to align with Pajamas Design System
$calendar-activity-colors: (
- #ededed,
- #acd5f2,
- #7fa8c9,
- #527ba0,
- #254e77,
+ #f5f5f5,
+ #d4dcfa,
+ #748eff,
+ #3547de,
+ #11118a,
) !default;
/*
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index cfd215b81b8..cb9c623c8fc 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -70,15 +70,6 @@
}
}
-.light-well {
- background-color: $gray-light;
- padding: 15px;
-}
-
-.dark-well {
- background-color: $gray-normal;
-}
-
.card.card-body-centered {
h1 {
font-weight: $gl-font-weight-normal;