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

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuzanne Selhorn <sselhorn@gitlab.com>2021-11-09 19:19:47 +0300
committerSuzanne Selhorn <sselhorn@gitlab.com>2021-11-09 19:19:47 +0300
commit5b7c18b7e0404c8a0a56c438046d7d7f6c165604 (patch)
tree531abb475a9d7e48a66bc9555ae364f3bbc8d09f
parent8969d2afb028f661947d16fb184ca4a9453b7fd9 (diff)
Changed pink code style to black
-rw-r--r--content/assets/stylesheets/_base.scss9
-rw-r--r--content/assets/stylesheets/_sidebar.scss4
-rw-r--r--content/assets/stylesheets/_typography.scss8
-rw-r--r--content/assets/stylesheets/_variables.scss20
-rw-r--r--content/assets/stylesheets/help.scss4
-rw-r--r--content/assets/stylesheets/instantsearch.scss4
-rw-r--r--content/assets/stylesheets/stylesheet.scss4
7 files changed, 22 insertions, 31 deletions
diff --git a/content/assets/stylesheets/_base.scss b/content/assets/stylesheets/_base.scss
index 74daac05..59103b4c 100644
--- a/content/assets/stylesheets/_base.scss
+++ b/content/assets/stylesheets/_base.scss
@@ -1,5 +1,5 @@
---
-version: 1
+version: 2
---
@import 'variables';
@@ -21,11 +21,16 @@ body {
display: flex;
flex-flow: column;
font-size: 1rem;
- font-family: $font-sans-serif;
+ font-family: $gl-regular-font;
line-height: 1.5;
min-height: 100%;
position: relative;
-webkit-font-smoothing: antialiased;
+
+ code {
+ font-size: 0.875rem;
+ font-family: $gl-monospace-font;
+ }
}
// Fluid images by default
diff --git a/content/assets/stylesheets/_sidebar.scss b/content/assets/stylesheets/_sidebar.scss
index 595c8c9b..47e44821 100644
--- a/content/assets/stylesheets/_sidebar.scss
+++ b/content/assets/stylesheets/_sidebar.scss
@@ -1,5 +1,5 @@
---
-version: 2
+version: 3
---
@import 'variables';
@@ -185,7 +185,7 @@ version: 2
}
.last-updated {
- color: $color-light-gray;
+ color: $gray-500;
font-size: 13px;
padding-bottom: 10px;
text-align: right;
diff --git a/content/assets/stylesheets/_typography.scss b/content/assets/stylesheets/_typography.scss
index a4219ee1..b2379526 100644
--- a/content/assets/stylesheets/_typography.scss
+++ b/content/assets/stylesheets/_typography.scss
@@ -1,5 +1,5 @@
---
-version: 11
+version: 12
---
@import 'variables';
@@ -107,7 +107,7 @@ version: 11
border-radius: 4px;
line-height: 1;
overflow-wrap: break-word;
- padding: 2px 4px;
+ padding: 2px;
transition: background-color 0.15s linear;
}
@@ -201,6 +201,10 @@ version: 11
.gl-h6 {
@include gl-font-weight-bold;
@include gl-mb-3;
+
+ code {
+ font-size: inherit;
+ }
}
h2,
diff --git a/content/assets/stylesheets/_variables.scss b/content/assets/stylesheets/_variables.scss
index b7a78462..0601d14e 100644
--- a/content/assets/stylesheets/_variables.scss
+++ b/content/assets/stylesheets/_variables.scss
@@ -3,7 +3,6 @@ version: 1
---
// Fonts
-$sans-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Noto Sans', Ubuntu, Cantarell, 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
$body-font-size: 16px;
// Heights
@@ -36,7 +35,6 @@ $gds-gray-800: #4f4f4f;
$gds-gray-900: #2e2e2e;
$gds-gray-950: #1f1f1f;
$gds-black: #000;
-$gds-gray-1000: #666;
// Blue palette
$gds-blue-600: #1b69b6;
@@ -79,10 +77,8 @@ $toc-link-color: $global-nav-link-level2;
/// Elements
$h1-border-bottom: $gds-gray-700;
-$border-color: $gds-gray-200;
// Pajama alerts
-
$alert-note-bg: #fafafa;
$alert-note-txt: $gds-black;
$alert-note-border: #dbdbdb;
@@ -124,7 +120,7 @@ $gl-icon-sizes: 8 10 12 14 16 18 24 32 48 72;
$code-color: rgb(31, 31, 31);
$code-background-color: rgb(240, 240, 240);
$alert-code-background-color: rgb(242, 242, 242);
-$accessible-code-color: rgb(210, 20, 115);
+$accessible-code-color: rgb(64, 64, 64);
//copy button bg color == pre code color
$pre-code-color: transparent;
@@ -162,15 +158,8 @@ $help-gray-200: #bfbfbf;
$help-gray-900: #303030;
// Other colors
-$hr-border-color: $border-color;
$search-border: rgba(0, 0, 0, 0.25);
-// Colors
-$color-white: #fff;
-$color-gray: #777;
-$color-gray-medium: #ddd;
-$color-light-gray: rgb(117, 117, 117);
-
// Social colors
$youtube: #f00;
@@ -185,8 +174,6 @@ $bp-md: 768px !default;
$bp-lg: 992px !default;
$bp-xl: 1200px !default;
-$measure: 48rem;
-
// Colors
$green-50: #ecf4ee !default;
$green-100: #c3e6cd !default;
@@ -280,11 +267,6 @@ $badge-tier: $red-500;
$badge-self-managed: $orange-500;
$badge-saas: $orange-500;
-// Typography
-$font-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif !default;
-
-$font-size-sm: 0.875rem;
-
// Gl Markdown
// Fonts
diff --git a/content/assets/stylesheets/help.scss b/content/assets/stylesheets/help.scss
index db1fa84f..b0a200e5 100644
--- a/content/assets/stylesheets/help.scss
+++ b/content/assets/stylesheets/help.scss
@@ -1,5 +1,5 @@
---
-version: 6
+version: 7
---
@import 'variables';
@@ -108,7 +108,7 @@ version: 6
iframe {
padding-left: 1.067rem;
padding-right: 1.067rem;
- background-color: $color-white;
+ background-color: $white;
border-radius: 0.333rem;
box-shadow: 0.133rem 0.133rem 0.467rem $search-border;
margin-top: 1.667rem;
diff --git a/content/assets/stylesheets/instantsearch.scss b/content/assets/stylesheets/instantsearch.scss
index f0209bb7..f50c7f11 100644
--- a/content/assets/stylesheets/instantsearch.scss
+++ b/content/assets/stylesheets/instantsearch.scss
@@ -1,5 +1,5 @@
---
-version: 14
+version: 15
---
@import 'variables';
@@ -36,7 +36,7 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
/* stylelint-disable-next-line selector-class-pattern */
.ais-PoweredBy {
- font-family: $sans-font-family;
+ font-family: $gl-regular-font;
font-size: $body-font-size;
svg {
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index e73ab7c1..7715173a 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -1,5 +1,5 @@
---
-version: 123
+version: 124
---
@import 'variables';
@@ -40,7 +40,7 @@ body {
}
.edit-on {
text-align: center;
- border-top: 1px solid $hr-border-color;
+ border-top: 1px solid $gds-gray-200;
padding-top: 20px;
margin-top: 15px;
a {