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

Jump to bottom

chore(): remove use of google fonts and move icons to be served locally #700

Merged
merged 3 commits into from
Mar 31, 2020
Merged

chore(): remove use of google fonts and move icons to be served locally #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31d226a
chore(): update dev from master (#694)
jgw96 Mar 24, 2020
de9baa0
Fix fonts (#695)
jgw96 Mar 24, 2020
1b7c442
style(): header should be bold
jgw96 Mar 26, 2020
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
3 changes: 1 addition & 2 deletions assets/scss/base/_globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import 'variables';

@import url('https://fluentweb-nightly-static.netlify.com/fluentweb/fluentweb.css');
/* stylelint-disable */

html,
Expand Down Expand Up @@ -68,7 +67,7 @@ h4 {

h1 {
margin-bottom: 30px;
font-family: 'Poppins', sans-serif;
font-family: sans-serif;
font-size: 24px;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/vendor/_normalize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ a:visited {
}

h1 {
font-family: 'Poppins', sans-serif;
font-family: sans-serif;
font-size: 24px;
}
4 changes: 2 additions & 2 deletions components/CodeViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export default class extends Vue {
z-index: 9999;

h3 {
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 16px;
Expand Down Expand Up @@ -363,7 +363,7 @@ export default class extends Vue {
}

#topViewerId {
height: 440px;
height: 300px;
width: 100%;
overflow-x: auto;
overflow-y: hidden;
Expand Down
6 changes: 3 additions & 3 deletions components/HubHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ header {

a {
padding-bottom: 6px;
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 14px;
Expand Down Expand Up @@ -420,7 +420,7 @@ header {
flex-direction: column;
padding-right: 32px;

font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 800;
font-size: 32px;
Expand Down Expand Up @@ -454,7 +454,7 @@ header {
justify-content: center;
padding-left: 20px;
padding-right: 20px;
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 14px;
Expand Down
2 changes: 1 addition & 1 deletion components/InstallButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class extends Vue {
color: white;
border-radius: 16px;
border: none;
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 14px;
Expand Down
6 changes: 3 additions & 3 deletions components/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export default class extends Vue {
padding-top: 1em;
margin-bottom: 30px;

font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 25px;
Expand Down Expand Up @@ -224,7 +224,7 @@ export default class extends Vue {
height: 40px;
padding-left: 20px;
padding-right: 20px;
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
display: flex;
Expand All @@ -243,7 +243,7 @@ export default class extends Vue {
height: 40px;
padding-left: 20px;
padding-right: 20px;
font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion components/ScoreCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ export default class extends Vue {
h3 {
color: #707070;

font-family: Poppins;
font-family: sans-serif;
font-style: normal;
font-weight: 600;
font-size: 12px;
Expand Down
19 changes: 3 additions & 16 deletions nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ module.exports = {
},
{
rel: "stylesheet",
href: "https://fonts.googleapis.com/css?family=Poppins:600,700&display=swap"
},
{
rel: "stylesheet",
href: "https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap"
href: "/css/all.css"
},
{
rel: "stylesheet",
Expand Down Expand Up @@ -113,16 +109,12 @@ module.exports = {
}
],
script: [{
src: '/pwabuilder-sw-register.js'
src: '/pwabuilder-sw-register.js',
type: 'module'
},
{
src: "https://az725175.vo.msecnd.net/scripts/jsll-4.js"
},
{
src: "https://use.fontawesome.com/releases/v5.0.10/js/all.js",
async: true,
defer: true
},
{
src: '/awa-register.js'
},
Expand All @@ -137,11 +129,6 @@ module.exports = {
src: '/platformPop.js',
type: 'module'
},
{
src: "https://fluentweb-nightly-static.netlify.com/fluentweb/fluentweb.js",
async: true,
defer: true
},
{
src: 'https://unpkg.com/@ionic/core@latest/dist/ionic.js'
},
Expand Down
93 changes: 50 additions & 43 deletions 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.

Loading