diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-26 16:52:36 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-26 16:52:36 +0300 |
| commit | 49cd07adfc6ace67614e6bd21601318429e0f96f (patch) | |
| tree | 0406bba5bbaeaf829180f414ef732f5670fca2cc | |
| parent | 25207c4faf04b4ccc7437918f6ad922e0bcf7f7b (diff) | |
| parent | f17cac28736e634ca85844d62a0222bc3dfa1e6d (diff) | |
Merge branch 'downgrade-fontawesome' into 'master'
Use FontAwesome 4 instead of 5
See merge request gitlab-com/gitlab-docs!226
| -rw-r--r-- | layouts/head.html | 6 | ||||
| -rw-r--r-- | layouts/header.html | 2 | ||||
| -rw-r--r-- | lib/filters/admonition.rb | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/layouts/head.html b/layouts/head.html index fb0792ac..95eb697a 100644 --- a/layouts/head.html +++ b/layouts/head.html @@ -12,11 +12,9 @@ <link rel="stylesheet" href="<%= @items['/assets/stylesheets/docsearch.min.*'].path %>"> <link rel="stylesheet" href="<%= @items['/assets/stylesheets/toc.*'].path %>"> <link rel="stylesheet" href="<%= @items['/assets/stylesheets/comments.*'].path %>"> -<!-- new fontawesome - via CDN --> -<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous"> -<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous"> +<!-- new fontawesome version 4 - via CDN --> +<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <!-- end of fontawesome --> - <script async src="<%= @items['/assets/javascripts/classlist-polyfill.*'].path %>"></script> <script async src="<%= @items['/assets/javascripts/docs.*'].path %>"></script> <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,400italic' rel='stylesheet' type='text/css'> diff --git a/layouts/header.html b/layouts/header.html index ae2341f9..b54acf3c 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -5,7 +5,7 @@ </a> <div class="nav-container"> <a class="nav-toggle" id="docs-nav-toggle"> - <i class="fas fa-bars"></i> + <i class="fa fa-bars" aria-hidden="true"></i> </a> <ul class="nav"> <li class="search"><input type="text" class="docsearch" placeholder="Search"></li> diff --git a/lib/filters/admonition.rb b/lib/filters/admonition.rb index 3a631061..141b93d7 100644 --- a/lib/filters/admonition.rb +++ b/lib/filters/admonition.rb @@ -14,7 +14,7 @@ class AdmonitionFilter < Nanoc::Filter FONT_AWESOME_MAPPING = { 'note' => 'info-circle', - 'tip' => 'pencil-alt', + 'tip' => 'pencil', 'caution' => 'exclamation-triangle', 'danger' => 'bolt', } |