Skip to content

Commit

Permalink
update 8.38
Browse files Browse the repository at this point in the history
  • Loading branch information
katozaaaa committed Mar 25, 2024
1 parent 7523fd9 commit aa92857
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .publish
Submodule .publish updated from 47d054 to 7a4302
12 changes: 6 additions & 6 deletions public/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -415,42 +415,42 @@
font-family: "Proxima Nova";
font-weight: 300;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Light.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Light.woff") format("woff");
src: url("assets/fonts/ProximaNova-Light.woff2") format("woff2"), url("assets/fonts/ProximaNova-Light.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 400;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Regular.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Regular.woff") format("woff");
src: url("assets/fonts/ProximaNova-Regular.woff2") format("woff2"), url("assets/fonts/ProximaNova-Regular.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 600;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Semibold.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Semibold.woff") format("woff");
src: url("assets/fonts/ProximaNova-Semibold.woff2") format("woff2"), url("assets/fonts/ProximaNova-Semibold.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 700;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Bold.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Bold.woff") format("woff");
src: url("assets/fonts/ProximaNova-Bold.woff2") format("woff2"), url("assets/fonts/ProximaNova-Bold.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 800;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Extrabld.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Extrabld.woff") format("woff");
src: url("assets/fonts/ProximaNova-Extrabld.woff2") format("woff2"), url("assets/fonts/ProximaNova-Extrabld.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 900;
font-style: normal;
src: url("http://localhost:8080/assets/fonts/ProximaNova-Black.woff2") format("woff2"), url("http://localhost:8080/assets/fonts/ProximaNova-Black.woff") format("woff");
src: url("assets/fonts/ProximaNova-Black.woff2") format("woff2"), url("assets/fonts/ProximaNova-Black.woff") format("woff");
}

.layout {
Expand Down
12 changes: 6 additions & 6 deletions src/app/scss/blocks/layout/layout.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@use '../../modules/variables';
@use '../../modules/mixins' as *;

@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Light', 300, normal, woff2 woff);
@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Regular', 400, normal, woff2 woff);
@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Semibold', 600, normal, woff2 woff);
@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Bold', 700, normal, woff2 woff);
@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Extrabld', 800, normal, woff2 woff);
@include font-face('Proxima Nova', 'http://localhost:8080/assets/fonts/ProximaNova-Black', 900, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Light', 300, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Regular', 400, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Semibold', 600, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Bold', 700, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Extrabld', 800, normal, woff2 woff);
@include font-face('Proxima Nova', 'assets/fonts/ProximaNova-Black', 900, normal, woff2 woff);

.layout {
color: variables.$color-text--primary;
Expand Down

0 comments on commit aa92857

Please sign in to comment.