Skip to content

Commit

Permalink
879 missing icons (#1500)
Browse files Browse the repository at this point in the history
* Removing duplicated Plug.Static

* Webpacking additional types of font files

* No longer specifying mime type because we serve multiple options

* Removing encoding because it doesn't seem to affect our current setup

* Moving all Roboto fonts into Roboto folder

* Removing url-loader because it's not used

* Removing unused library, putting all Roboto files in same place, removing unnecessary webpack values

* Not putting svgs under fonts folder

* Bumping patch version
  • Loading branch information
jfolk2015 authored Oct 17, 2022
1 parent 73db82e commit 666a5b9
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 99 deletions.
6 changes: 3 additions & 3 deletions apps/andi/assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
src: url('../static/fonts/Roboto/Roboto-Regular.ttf') format('truetype'),
url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'),
/* IE6-IE8 */
url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'),
url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'),
/* Super Modern Browsers */
url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff') format('woff'),
url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff') format('woff'),
/* Modern Browsers */
url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.ttf') format('truetype'),
/* Safari, Android, iOS */
Expand Down Expand Up @@ -155,4 +155,4 @@ body {
@import "./upload_data_dictionary.scss";
@import "./url_form.scss";
@import "./user.scss";
@import "./users.scss";
@import "./users.scss";
81 changes: 0 additions & 81 deletions apps/andi/assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apps/andi/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"sass-loader": "^12.6.0",
"serialize-javascript": ">=3.1.0",
"terser-webpack-plugin": "^5.3.1",
"url-loader": "^4.1.1",
"webpack": "^5.0.0",
"webpack-cli": "^4.0.0",
"yargs-parser": ">=18.1.2"
Expand Down
6 changes: 2 additions & 4 deletions apps/andi/assets/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,13 @@ module.exports = (env, options) => ({
]
},
{
test: /\.(woff|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
test: /\.(woff)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/,
use: [
{
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: '../fonts/',
mimetype: 'font/woff2',
encoding: false
outputPath: '../fonts/'
}
}
]
Expand Down
9 changes: 0 additions & 9 deletions apps/andi/endpoint.ex

This file was deleted.

2 changes: 1 addition & 1 deletion apps/andi/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Andi.MixProject do
def project do
[
app: :andi,
version: "2.4.3",
version: "2.4.4",
build_path: "../../_build",
config_path: "../../config/config.exs",
deps_path: "../../deps",
Expand Down

0 comments on commit 666a5b9

Please sign in to comment.