Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

879 missing icons #1500

Merged
merged 10 commits into from
Oct 17, 2022
Merged

879 missing icons #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1eea61
Removing duplicated Plug.Static
jfolk2015 Oct 17, 2022
f7fe978
Webpacking additional types of font files
jfolk2015 Oct 17, 2022
3850d9f
No longer specifying mime type because we serve multiple options
jfolk2015 Oct 17, 2022
2c5f08e
Removing encoding because it doesn't seem to affect our current setup
jfolk2015 Oct 17, 2022
01f4a08
Moving all Roboto fonts into Roboto folder
jfolk2015 Oct 17, 2022
3681c3f
Removing url-loader because it's not used
jfolk2015 Oct 17, 2022
8334b19
Removing unused library, putting all Roboto files in same place, remo…
jfolk2015 Oct 17, 2022
ac2710e
Merge branch '879-missing-icons' of github.com:UrbanOS-Public/smartci…
jfolk2015 Oct 17, 2022
848ae05
Not putting svgs under fonts folder
jfolk2015 Oct 17, 2022
ecd6615
Bumping patch version
jfolk2015 Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/andi/assets/css/app.scss
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
0 ...s/roboto-v30-latin-ext_latin-regular.woff → ...o/roboto-v30-latin-ext_latin-regular.woff
View file
Open in desktop
File renamed without changes.
0 .../roboto-v30-latin-ext_latin-regular.woff2 → .../roboto-v30-latin-ext_latin-regular.woff2
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions apps/andi/assets/webpack.config.js
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/andi/mix.exs
View file
Open in desktop
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