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:
authorAchilleas Pipinellis <axil@gitlab.com>2021-08-26 09:39:31 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2021-08-26 09:39:31 +0300
commit8aa54ddf5b2eb819b604aaf223d376f7cc64e135 (patch)
tree639132bde34da51d85efa3e1cee8cc2f5bcd407a
parentc2c62c2a813c412d8d2dd8bf00bae140c789cd53 (diff)
parent7b76aae1da58d30e01b61d487b134121efbf74f0 (diff)
Merge branch 'selhorn-fix-notes' into 'main'
Updated style for notes See merge request gitlab-org/gitlab-docs!2080
-rw-r--r--content/assets/stylesheets/_variables.scss4
-rw-r--r--content/assets/stylesheets/stylesheet.scss10
-rw-r--r--lib/filters/admonition.rb2
3 files changed, 10 insertions, 6 deletions
diff --git a/content/assets/stylesheets/_variables.scss b/content/assets/stylesheets/_variables.scss
index 661a85a8..e364c80c 100644
--- a/content/assets/stylesheets/_variables.scss
+++ b/content/assets/stylesheets/_variables.scss
@@ -81,6 +81,10 @@ $border-color: $gds-gray-200;
// Pajama alerts
+$alert-note-bg: #fafafa;
+$alert-note-txt: $gds-black;
+$alert-note-border: #dbdbdb;
+
$alert-info-bg: #f1f1ff;
$alert-info-txt: $gds-black;
$alert-info-border: #dbdbf8;
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index 934973be..75398ddf 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -1,5 +1,5 @@
---
-version: 117
+version: 118
---
@import 'variables';
@@ -185,10 +185,10 @@ ol {
// Pajamas alerts
// https://gitlab-org.gitlab.io/gitlab-design/hosted/design-gitlab-specs/alerts-spec-previews/
-.alert-info {
- background-color: $alert-info-bg;
- color: $alert-info-txt;
- border: solid 1px $alert-info-border;
+.alert-note {
+ background-color: $alert-note-bg;
+ color: $alert-note-txt;
+ border: solid 1px $alert-note-border;
border-radius: 5px;
}
diff --git a/lib/filters/admonition.rb b/lib/filters/admonition.rb
index b55620b9..17cfc9a7 100644
--- a/lib/filters/admonition.rb
+++ b/lib/filters/admonition.rb
@@ -3,7 +3,7 @@ class AdmonitionFilter < Nanoc::Filter
identifier :admonition
BOOTSTRAP_MAPPING = {
- 'note' => 'info',
+ 'note' => 'note',
'warning' => 'warning',
'flag' => 'flag',
'info' => 'info'