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:
authorjgarc <jgarcia@gitlab.com>2021-09-09 03:01:56 +0300
committerjgarc <jgarcia@gitlab.com>2021-09-09 04:16:28 +0300
commit1fd3dc5397773aa1828c7c3650f2441125a28088 (patch)
tree44a5cb5f675c9a91076686b76546f4dac33a84ac
parent79735a7b3fd383d78f0e1f3ff268b7bd5b205809 (diff)
MVC1 Build Alert box on docs.gitlab.comjg-alert-box-mvc1
-rw-r--r--content/assets/stylesheets/stylesheet.scss8
-rw-r--r--content/cookies/index.md3
-rw-r--r--lib/filters/admonition.rb6
3 files changed, 14 insertions, 3 deletions
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index 9e46d81b..383c5bf1 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -1,5 +1,5 @@
---
-version: 119
+version: 120
---
@import 'variables';
@@ -257,6 +257,12 @@ ol {
}
}
+.alert-tanuki{
+ background-color: $help-indigo-50;
+ border-color: rgba($help-indigo-50, 0.3);
+ border-radius: 5px;
+}
+
// Main header CSS
.navbar {
min-height: $header-height;
diff --git a/content/cookies/index.md b/content/cookies/index.md
index 099cc68a..daf3c17c 100644
--- a/content/cookies/index.md
+++ b/content/cookies/index.md
@@ -44,6 +44,9 @@ Service providers may participate in self-regulatory programs that provide ways
On mobile devices, advertising IDs provided by the platform may be collected and used similar to cookie IDs. You may use the controls on iOS and Android operating systems that allow you to limit tracking and/or reset the advertising IDs.
+TANUKI:
+Upgrade to [Ultimate](https://about.gitlab.com/some-revelant-url-path) to use this feature.
+
## How do I control email web beacons?
Most email clients have settings which allow you to prevent the automatic downloading of images, which will disable web beacons in the email messages you read.
diff --git a/lib/filters/admonition.rb b/lib/filters/admonition.rb
index 17cfc9a7..5fc81ac1 100644
--- a/lib/filters/admonition.rb
+++ b/lib/filters/admonition.rb
@@ -6,10 +6,12 @@ class AdmonitionFilter < Nanoc::Filter
'note' => 'note',
'warning' => 'warning',
'flag' => 'flag',
- 'info' => 'info'
+ 'info' => 'info',
+ 'tanuki' => 'tanuki'
}.freeze
GITLAB_SVGS_MAPPING = {
+ 'tanuki' => 'tanuki',
'note' => 'information-o',
'warning' => 'warning',
'flag' => 'flag',
@@ -22,7 +24,7 @@ class AdmonitionFilter < Nanoc::Filter
doc = Nokogiri::HTML.fragment(content.dup)
doc.css('p').each do |para|
content = para.inner_html
- match = content.match(/\A(?<type>NOTE|WARNING|FLAG|INFO):\s?(?<content>.*)\Z/m)
+ match = content.match(/\A(?<type>NOTE|WARNING|FLAG|INFO|TANUKI):\s?(?<content>.*)\Z/m)
next unless match
new_content = generate(match[:type].downcase, match[:content])