From: Jeremy Thomas Date: Sat, 9 Sep 2017 16:32:12 +0000 (+0200) Subject: Fix #395, Fix #735, Fix #930 X-Git-Tag: 0.5.2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec282634e2234d24b104b3b8267a635bb50fbea;p=thirdparty%2Fbulma.git Fix #395, Fix #735, Fix #930 --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 084963a79..e60676495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ ### Issues closed +* #930 Remove `vertical-align: top` for icons +* #735 Font awesome custom `font-size` +* #395 Font awesome stacked icons * #1152 Level-items not centered horizontally on mobile * #1147 Add `text-size-adjust: 100%` to `html` * #1106 `pagination` docs diff --git a/docs/.gitignore b/docs/.gitignore index 3cae42c56..8c30c1ee2 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -12,6 +12,6 @@ npm-debug.log # Folders .sass-cache /bulma -/fontawesome +/icons /styles/node_modules _site diff --git a/docs/_config.yml b/docs/_config.yml index 9c895bb2c..5836a294f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,6 +10,7 @@ markdown: kramdown permalink: pretty url: http://bulma.io fontawesome: https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css +mdi: https://cdn.materialdesignicons.com/1.7.22/css/materialdesignicons.min.css exclude: ['fontawesome', 'node_modules', 'templates', '.babelrc', 'bulma-docs.sass', 'docker-compose.yml', 'package.json', 'yarn.lock'] # Variables diff --git a/docs/_includes/head.html b/docs/_includes/head.html index e4bc3b894..95dbf14f9 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -7,6 +7,9 @@ {% if page.fulltitle %}{{ page.fulltitle }}{% else %}{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}{% endif %} + {% if page.mdi %} + + {% endif %} diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html index 9acfcb1e5..020a1807b 100644 --- a/docs/_includes/navbar.html +++ b/docs/_includes/navbar.html @@ -6,13 +6,13 @@ - + - + @@ -154,12 +154,12 @@