summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorHoracio Sanson <horacio@allm.net>2016-11-29 13:18:13 +0900
committerHoracio Sanson <horacio@allm.net>2016-12-08 08:46:22 +0900
commitf4f9af06c9e6f468d9f696dbb5438dd8825fe773 (patch)
treedea1558a22749caddc714dc1b84829dd64d157b4 /app/assets
parente7b045eadaf315dc2ae4fc079af5d1199d3e5d25 (diff)
downloadgitlab-ce-f4f9af06c9e6f468d9f696dbb5438dd8825fe773.tar.gz
Enable display of admonition icons in Asciidoc.
When rendering Asciidoc documents this merge request enables the diplay of admonition blocks using font icons. This improves the looks of Asciidoc redered files. This uses the font-awesome fonts already present in Gitlab so no large dependencies are required for this to work.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework.scss1
-rw-r--r--app/assets/stylesheets/framework/asciidoctor.scss27
2 files changed, 28 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 4d4835568ed..c82a9a2b9e3 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -6,6 +6,7 @@
@import "framework/animations.scss";
@import "framework/avatar.scss";
+@import "framework/asciidoctor.scss";
@import "framework/blocks.scss";
@import "framework/buttons.scss";
@import "framework/calendar.scss";
diff --git a/app/assets/stylesheets/framework/asciidoctor.scss b/app/assets/stylesheets/framework/asciidoctor.scss
new file mode 100644
index 00000000000..62493c32833
--- /dev/null
+++ b/app/assets/stylesheets/framework/asciidoctor.scss
@@ -0,0 +1,27 @@
+.admonitionblock td.icon {
+ width: 1%;
+
+ [class^="fa icon-"] {
+ @extend .fa-2x;
+ }
+
+ .icon-note {
+ @extend .fa-thumb-tack;
+ }
+
+ .icon-tip {
+ @extend .fa-lightbulb-o;
+ }
+
+ .icon-warning {
+ @extend .fa-exclamation-triangle;
+ }
+
+ .icon-caution {
+ @extend .fa-fire;
+ }
+
+ .icon-important {
+ @extend .fa-exclamation-circle;
+ }
+}