diff options
author | Félix Sipma <felix.sipma@no-log.org> | 2021-06-03 16:30:33 +0200 |
---|---|---|
committer | Félix Sipma <felix.sipma@no-log.org> | 2021-06-03 16:30:33 +0200 |
commit | 6278ddbb18cb83486b9d8c83270dd7e0f076c3d5 (patch) | |
tree | e9f7178b7bea4e9f753250b61318ab088c92e52d | |
parent | 0f0d39cfec517778de18bc23c11e9728bfa52dff (diff) |
move from fork-awesome to bootstrap-icons for icons
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | layouts/index.html | 2 | ||||
-rw-r--r-- | layouts/partials/address.html | 6 | ||||
-rw-r--r-- | layouts/partials/crowdfunding-form.html | 20 | ||||
-rw-r--r-- | package-lock.json | 31 | ||||
-rw-r--r-- | package.json | 3 | ||||
-rw-r--r-- | static/scss/ferme.scss | 15 |
7 files changed, 44 insertions, 35 deletions
@@ -42,7 +42,7 @@ js: npm fonts: mkdir -p $(DIST_STATIC)/fonts - cp -R node_modules/fork-awesome/fonts/* $(DIST_STATIC)/fonts/ + cp -R node_modules/bootstrap-icons/font/fonts/* $(DIST_STATIC)/fonts/ img: mkdir -p $(DIST_STATIC)/img diff --git a/layouts/index.html b/layouts/index.html index dc90dba..209861f 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -56,7 +56,7 @@ </div> <div id="ferme-top-arrow" class="ferme-top-arrow-container ferme-hidden-on-mobile"> <a href="#le-projet-en-deux-mots"> - <i class="fa fa-arrow-circle-down fa-2x ferme-top-arrow"></i> + <i class="bi-arrow-down-circle-fill ferme-top-arrow"></i> </a> </div> {{ end }} diff --git a/layouts/partials/address.html b/layouts/partials/address.html index 7821e0f..e2f4e2a 100644 --- a/layouts/partials/address.html +++ b/layouts/partials/address.html @@ -1,7 +1,7 @@ <address> <div class="ferme-columns address"> <div class="column is-one-fifth"> - <i class="fa fa-map-marker" aria-hidden="true"></i> + <i class="bi-geo-alt" aria-hidden="true"></i> </div> <div class="column is-four-fifths"> {{ range $address := .Site.Params.Address }} @@ -16,7 +16,7 @@ </div> <div class="ferme-columns phone"> <div class="column is-one-fifth"> - <i class="fa fa-phone" aria-hidden="true"></i> + <i class="bi-telephone" aria-hidden="true"></i> </div> <div class="column is-four-fifths"> <a href="tel:{{ .Site.Params.Phone }}">{{ .Site.Params.Phone }}</a> @@ -24,7 +24,7 @@ </div> <div class="ferme-columns email"> <div class="column is-one-fifth"> - <i class="fa fa-envelope" aria-hidden="true"></i> + <i class="bi-envelope" aria-hidden="true"></i> </div> <div class="column is-four-fifths"> <a href="mailto:{{ .Site.Params.Email }}">{{ .Site.Params.Email }}</a> diff --git a/layouts/partials/crowdfunding-form.html b/layouts/partials/crowdfunding-form.html index 4d080af..3d2ce30 100644 --- a/layouts/partials/crowdfunding-form.html +++ b/layouts/partials/crowdfunding-form.html @@ -20,7 +20,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" placeholder="Prénom" name="firstname" required> <span class="icon is-small is-left"> - <i class="fa fa-user"></i> + <i class="bi-person-fill"></i> </span> </div> </div> @@ -28,7 +28,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" placeholder="Nom" name="lastname" required> <span class="icon is-small is-left"> - <i class="fa fa-user-o"></i> + <i class="bi-person"></i> </span> </div> </div> @@ -45,7 +45,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="date" name="birthdate" required> <span class="icon is-small is-left"> - <i class="fa fa-birthday-cake"></i> + <i class="bi-calendar"></i> </span> </div> </div> @@ -53,7 +53,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" name="birthcity" placeholder="Paris (75)" required> <span class="icon is-small is-left"> - <i class="fa fa-birthday-cake"></i> + <i class="bi-map-fill"></i> </span> </div> </div> @@ -71,7 +71,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" placeholder="2 rue des Acacias" name="address" required> <span class="icon is-small is-left"> - <i class="fa fa-map-marker"></i> + <i class="bi-geo-alt"></i> </span> </div> </div> @@ -86,7 +86,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" placeholder="42000" name="postalcode" required> <span class="icon is-small is-left"> - <i class="fa fa-map"></i> + <i class="bi-mailbox2"></i> </span> </div> </div> @@ -101,7 +101,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" placeholder="Saint-Étienne" name="city" required> <span class="icon is-small is-left"> - <i class="fa fa-map-o"></i> + <i class="bi-map-fill"></i> </span> </div> </div> @@ -116,7 +116,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="text" value="France" name="country" required> <span class="icon is-small is-left"> - <i class="fa fa-globe"></i> + <i class="bi-globe"></i> </span> </div> </div> @@ -131,7 +131,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="email" placeholder="coucou@example.com" name="email" required> <span class="icon is-small is-left"> - <i class="fa fa-envelope"></i> + <i class="bi-envelope"></i> </span> </div> </div> @@ -146,7 +146,7 @@ <div class="control is-expanded has-icons-left"> <input class="input" type="tel" placeholder="06 06 06 06 06" name="phone" required> <span class="icon is-small is-left"> - <i class="fa fa-phone"></i> + <i class="bi-telephone"></i> </span> </div> </div> diff --git a/package-lock.json b/package-lock.json index a8b5085..f5d689c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,14 +10,13 @@ "license": "AGPL-3.0", "dependencies": { "aos": "^2.3.4", + "bootstrap-icons": "^1.5.0", "bulma": "^0.9.0", "csso-cli": "^3.0.0", - "fork-awesome": "^1.1.7", "leaflet": "^1.7.1", "sass": "^1.26.11", "uglify-js": "^3.10.4" - }, - "devDependencies": {} + } }, "node_modules/ansi-regex": { "version": "2.1.1", @@ -65,6 +64,14 @@ "node": ">=8" } }, + "node_modules/bootstrap-icons": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", + "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==", + "engines": { + "node": ">=10" + } + }, "node_modules/braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -192,14 +199,6 @@ "node": ">=8" } }, - "node_modules/fork-awesome": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/fork-awesome/-/fork-awesome-1.1.7.tgz", - "integrity": "sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g==", - "engines": { - "node": ">=0.10.3" - } - }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -422,6 +421,11 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, + "bootstrap-icons": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", + "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==" + }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -516,11 +520,6 @@ "to-regex-range": "^5.0.1" } }, - "fork-awesome": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/fork-awesome/-/fork-awesome-1.1.7.tgz", - "integrity": "sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g==" - }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", diff --git a/package.json b/package.json index b415d55..12f4cf0 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,13 @@ "main": "index.js", "dependencies": { "aos": "^2.3.4", + "bootstrap-icons": "^1.5.0", "bulma": "^0.9.0", "csso-cli": "^3.0.0", - "fork-awesome": "^1.1.7", "leaflet": "^1.7.1", "sass": "^1.26.11", "uglify-js": "^3.10.4" }, - "devDependencies": {}, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/static/scss/ferme.scss b/static/scss/ferme.scss index d5d9fe9..63eef62 100644 --- a/static/scss/ferme.scss +++ b/static/scss/ferme.scss @@ -1,5 +1,15 @@ -$fa-font-path: "../fonts"; -@import "../../node_modules/fork-awesome/scss/fork-awesome.scss"; +// sass syntax: import 'file' (without extension for .css) +@import '../../node_modules/bootstrap-icons/font/bootstrap-icons'; + +// override fonts location https://github.com/twbs/icons/issues/563 +$twbs-font-path: "../fonts" !default; + +@font-face { + font-family: "bootstrap-icons"; + src: + url("#{$twbs-font-path}/bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d") format("woff2"), + url("#{$twbs-font-path}/bootstrap-icons.woff?856008caa5eb66df68595e734e59580d") format("woff"); +} // local variables $ferme-logo-height-mobile: 150px; @@ -379,6 +389,7 @@ h1 { .ferme-top-arrow { color: white; + font-size: 2rem; } .ferme-hidden-on-mobile { |