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.

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

Add source sans pro as npm package #7131

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@
@import "~bootstrap/dist/css/bootstrap.css";
@import "~font-awesome/scss/font-awesome";

// Add Source Sans Pro Font with all options
// This font is used by AdminLTE
@import "~@fontsource/source-sans-pro/300.css";
@import "~@fontsource/source-sans-pro/300-italic.css";
@import "~@fontsource/source-sans-pro/400.css";
@import "~@fontsource/source-sans-pro/400-italic.css";
@import "~@fontsource/source-sans-pro/600.css";
@import "~@fontsource/source-sans-pro/600-italic.css";
@import "~@fontsource/source-sans-pro/700.css";

// Basic AdminLTE styles without any plugins,
// because they conflict with Select2 v4
@import "~admin-lte/dist/css/alt/AdminLTE-without-plugins.css";
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dependencies": {
"@fontsource/source-sans-pro": "^4.2",
"admin-lte": "^2.4",
"bootstrap": "^3.3",
"components-font-awesome": "^4.7",
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/app.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
56 changes: 56 additions & 0 deletions src/Resources/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,57 @@
"bundles/sonataadmin/fonts/fontawesome-webfont.ttf": "/bundles/sonataadmin/fonts/fontawesome-webfont.ttf",
"bundles/sonataadmin/images/glyphicons-halflings-regular.svg": "/bundles/sonataadmin/images/glyphicons-halflings-regular.svg",
"bundles/sonataadmin/fonts/fontawesome-webfont.woff": "/bundles/sonataadmin/fonts/fontawesome-webfont.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-400-normal.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-400-normal.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-300-normal.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-300-normal.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-600-normal.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-600-normal.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-700-normal.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-700-normal.woff",
"bundles/sonataadmin/fonts/fontawesome-webfont.woff2": "/bundles/sonataadmin/fonts/fontawesome-webfont.woff2",
"bundles/sonataadmin/fonts/glyphicons-halflings-regular.ttf": "/bundles/sonataadmin/fonts/glyphicons-halflings-regular.ttf",
"bundles/sonataadmin/fonts/source-sans-pro-all-300-italic.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-300-italic.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-400-italic.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-400-italic.woff",
"bundles/sonataadmin/fonts/source-sans-pro-all-600-italic.woff": "/bundles/sonataadmin/fonts/source-sans-pro-all-600-italic.woff",
"bundles/sonataadmin/fonts/glyphicons-halflings-regular.woff": "/bundles/sonataadmin/fonts/glyphicons-halflings-regular.woff",
"bundles/sonataadmin/fonts/glyphicons-halflings-regular.eot": "/bundles/sonataadmin/fonts/glyphicons-halflings-regular.eot",
"bundles/sonataadmin/fonts/glyphicons-halflings-regular.woff2": "/bundles/sonataadmin/fonts/glyphicons-halflings-regular.woff2",
"bundles/sonataadmin/images/default_mosaic_image.png": "/bundles/sonataadmin/images/default_mosaic_image.png",
"bundles/sonataadmin/fonts/source-sans-pro-latin-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-400-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-700-normal.woff2",
"bundles/sonataadmin/images/logo_title.png": "/bundles/sonataadmin/images/logo_title.png",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-latin-ext-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-latin-ext-400-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-400-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-400-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-600-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-600-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-300-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-300-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-700-normal.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-700-normal.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-vietnamese-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-vietnamese-400-italic.woff2",
"bundles/sonataadmin/moment-locale/ru.js": "/bundles/sonataadmin/moment-locale/ru.js",
"bundles/sonataadmin/images/blue@2x.png": "/bundles/sonataadmin/images/blue@2x.png",
"bundles/sonataadmin/moment-locale/hi.js": "/bundles/sonataadmin/moment-locale/hi.js",
Expand Down Expand Up @@ -115,7 +159,10 @@
"bundles/sonataadmin/moment-locale/et.js": "/bundles/sonataadmin/moment-locale/et.js",
"bundles/sonataadmin/moment-locale/tk.js": "/bundles/sonataadmin/moment-locale/tk.js",
"bundles/sonataadmin/moment-locale/ko.js": "/bundles/sonataadmin/moment-locale/ko.js",
"bundles/sonataadmin/fonts/source-sans-pro-greek-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-300-italic.woff2",
"bundles/sonataadmin/moment-locale/mi.js": "/bundles/sonataadmin/moment-locale/mi.js",
"bundles/sonataadmin/fonts/source-sans-pro-greek-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-400-italic.woff2",
"bundles/sonataadmin/moment-locale/uz.js": "/bundles/sonataadmin/moment-locale/uz.js",
"bundles/sonataadmin/moment-locale/eo.js": "/bundles/sonataadmin/moment-locale/eo.js",
"bundles/sonataadmin/moment-locale/ar-tn.js": "/bundles/sonataadmin/moment-locale/ar-tn.js",
Expand All @@ -139,8 +186,17 @@
"bundles/sonataadmin/moment-locale/pt.js": "/bundles/sonataadmin/moment-locale/pt.js",
"bundles/sonataadmin/moment-locale/af.js": "/bundles/sonataadmin/moment-locale/af.js",
"bundles/sonataadmin/moment-locale/se.js": "/bundles/sonataadmin/moment-locale/se.js",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-300-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-300-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-600-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-600-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-600-italic.woff2",
"bundles/sonataadmin/moment-locale/it-ch.js": "/bundles/sonataadmin/moment-locale/it-ch.js",
"bundles/sonataadmin/moment-locale/sq.js": "/bundles/sonataadmin/moment-locale/sq.js",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-400-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-cyrillic-ext-400-italic.woff2",
"bundles/sonataadmin/fonts/source-sans-pro-greek-ext-400-italic.woff2": "/bundles/sonataadmin/fonts/source-sans-pro-greek-ext-400-italic.woff2",
"bundles/sonataadmin/moment-locale/sv.js": "/bundles/sonataadmin/moment-locale/sv.js",
"bundles/sonataadmin/moment-locale/ro.js": "/bundles/sonataadmin/moment-locale/ro.js",
"bundles/sonataadmin/moment-locale/nn.js": "/bundles/sonataadmin/moment-locale/nn.js",
Expand Down
21 changes: 13 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,11 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"

"@fontsource/source-sans-pro@^4.2":
version "4.2.2"
resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-4.2.2.tgz#db231e349ed4b3594ccdd9163b2cbf3bfb94b040"
integrity sha512-ApmV5F1D32nmBspCJuijDNBV7TtazFC4L7BIilHj3e6IAW/ndQMXl1+4DUjOGVO/83tF/WXjOEMxROE0QxYDwQ==

"@nodelib/fs.scandir@2.1.4":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
Expand Down Expand Up @@ -1843,7 +1848,7 @@ browserify@>=3.46.0:
vm-browserify "^1.0.0"
xtend "^4.0.0"

browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.4:
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.5:
version "4.16.5"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
Expand Down Expand Up @@ -2291,11 +2296,11 @@ cookie@0.4.0:
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==

core-js-compat@^3.9.0, core-js-compat@^3.9.1:
version "3.11.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390"
integrity sha512-3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA==
version "3.11.1"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.1.tgz#57a91e9b02d3bb8cf37f82eceaf44a3d646fa614"
integrity sha512-aZ0e4tmlG/aOBHj92/TuOuZwp6jFvn1WNabU5VOVixzhu5t5Ao+JZkQOPlgNXu6ynwLrwJxklT4Gw1G1VGEh+g==
dependencies:
browserslist "^4.16.4"
browserslist "^4.16.5"
semver "7.0.0"

core-util-is@~1.0.0:
Expand Down Expand Up @@ -4832,9 +4837,9 @@ min-indent@^1.0.0:
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==

mini-css-extract-plugin@^1.0.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.5.0.tgz#69bee3b273d2d4ee8649a2eb409514b7df744a27"
integrity sha512-SIbuLMv6jsk1FnLIU5OUG/+VMGUprEjM1+o2trOAx8i5KOKMrhyezb1dJ4Ugsykb8Jgq8/w5NEopy6escV9G7g==
version "1.5.1"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.5.1.tgz#c0ac557c48a7de47de3df0768fe037c9cf961f69"
integrity sha512-wEpr0XooH6rw/Mlf+9KTJoMBLT3HujzdTrmohPjAzF47N4Q6yAeczQLpRD/WxvAtXvskcXbily7TAdCfi2M4Dg==
dependencies:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
Expand Down