Skip to content

Commit

Permalink
Merge pull request #228 from activebridge/feature/change_cera_font
Browse files Browse the repository at this point in the history
Change the Cera font to FixelText
  • Loading branch information
katatsu12 authored May 2, 2024
2 parents 44479b1 + f2faf89 commit 09116f2
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion _includes/svgs/services/project-dev-circle.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<text x="50%" y="40%" font-size="18" fill="white" dominant-baseline="middle" text-anchor="middle">
2 weeks
<tspan font-size="22" dy="1.5em" x="50%" font-family="Cera-Bold">SPRINT</tspan>
<tspan font-size="22" dy="1.5em" x="50%" font-family="FixelText-Bold">SPRINT</tspan>
</text>
<text font-size="14" fill="black" dy="-15">
<textPath xlink:href="#sprint-planning" startOffset="60%">
Expand Down
4 changes: 2 additions & 2 deletions _sass/about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
&__container-items { margin-right: 10%; }

&__item {
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
display: flex;
align-items: center;
margin-bottom: 3vh;
Expand All @@ -155,7 +155,7 @@
p {
background: linear-gradient(135deg, $main-violet, $purple-heart);
background-clip: text;
font-family: 'Cera Regular';
font-family: 'FixelText-Regular';
font-size: 40px;
font-weight: 700;
-webkit-background-clip: text;
Expand Down
2 changes: 1 addition & 1 deletion _sass/accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
overflow: hidden;

summary {
font-family: 'Cera-Medium';
font-family: 'FixelText-Medium';
position: relative;
display: flex;
align-items: center;
Expand Down
22 changes: 11 additions & 11 deletions _sass/base.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@font-face {
font-family: 'Cera Regular';
src: url(/assets/fonts/Cera.woff2);
font-family: 'FixelText-Regular';
src: url(/assets/fonts/FixelText-Regular.woff2);
font-weight: normal;
font-display: swap;
}

@font-face {
font-family: 'Cera-Bold';
src: url(/assets/fonts/Cera-Bold.woff2);
font-family: 'FixelText-Bold';
src: url(/assets/fonts/FixelText-Bold.woff2);
font-weight: 700;
font-display: swap;
}

@font-face {
font-family: 'Cera-Medium';
src: url(/assets/fonts/Cera-Medium.woff2);
font-family: 'FixelText-Medium';
src: url(/assets/fonts/FixelText-Medium.woff2);
font-weight: 600;
font-display: swap;
}
Expand All @@ -34,7 +34,7 @@

body {
color: $black;
font-family: 'Cera Regular', serif;
font-family: 'FixelText-Regular', serif;
-webkit-tap-highlight-color: transparent;
}
p { margin: 0; }
Expand All @@ -61,7 +61,7 @@ ul, ol { margin-left: 0; }
}

.block-cera-title {
font-family: "Cera Regular", serif;
font-family: "FixelText-Regular", serif;
font-size: 30px;
letter-spacing: 0.4em;
text-align: center;
Expand All @@ -77,7 +77,7 @@ ul, ol { margin-left: 0; }
}

.block-sub-title {
font-family: "Cera Regular", serif;
font-family: "FixelText-Regular", serif;
font-size: 22px;
letter-spacing: 0.4em;
text-align: center;
Expand Down Expand Up @@ -219,11 +219,11 @@ ul, ol { margin-left: 0; }
margin-bottom: 30px;
}

.block-inria-title,.block-cera-title {
.block-inria-title,.block-fixel-title {
font-size: 18px;
line-height: 23px;
}
.block-cera-title,.block-cera-title,.message { margin-bottom: 25px; }
.block-fixel-title,.block-fixel-title,.message { margin-bottom: 25px; }

.message, .block-sub-title{
font-size: 15px;
Expand Down
18 changes: 9 additions & 9 deletions _sass/blog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
text-align: left;

li {
font-family: 'Cera Regular', serif;
font-family: 'FixelText-Regular', serif;
font-size: 18px;
font-weight: 400;
line-height: 150%;
Expand Down Expand Up @@ -100,7 +100,7 @@

&__title {
font-size: 14px;
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
}

&__info-block {
Expand All @@ -123,7 +123,7 @@

&__info-block-description {
color: $white;
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
font-size: 12px;
margin-bottom: 10px;
padding-left: 20px;
Expand All @@ -132,7 +132,7 @@
z-index: 2;

&:last-child { padding-bottom: 5px; }
span { font-family: 'Cera Regular'; }
span { font-family: 'FixelText-Regular'; }
}

&__info-block-category {
Expand Down Expand Up @@ -204,14 +204,14 @@
}

h3 {
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
font-size: 22px;
font-style: normal;
margin: 20px 0;
}

h4 {
font-family: 'Cera Regular';
font-family: 'FixelText-Regular';
font-size: 18px;
font-style: normal;
}
Expand Down Expand Up @@ -308,13 +308,13 @@

.post-description {
&__title {
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
font-style: italic;
font-size: 14px;
margin-bottom: 5px;

span {
font-family: 'Cera Regular';
font-family: 'FixelText-Regular';
font-style: normal;
}
}
Expand Down Expand Up @@ -400,7 +400,7 @@
text-transform: uppercase;

p {
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
display: inline-block;
position: relative;

Expand Down
2 changes: 1 addition & 1 deletion _sass/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
border-radius: 56px;
box-sizing: border-box;
box-shadow: $main-shadow;
font-family: 'Cera-Medium';
font-family: 'FixelText-Medium';
font-size: 16px;
letter-spacing: 0.5em;
text-align: center;
Expand Down
8 changes: 4 additions & 4 deletions _sass/contacts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
background: rgba(193, 201, 214, 0.01);
box-shadow: $light-purple-shadow;
color: $black_sea;
font-family: "Cera Regular", serif;
font-family: "FixelText-Regular", serif;
font-size: 15px;
font-style: normal;
font-weight: 400;
Expand All @@ -26,7 +26,7 @@

&--select {
width: 600px;
font-family: "Cera Regular", serif;
font-family: "FixelText-Regular", serif;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
Expand All @@ -52,7 +52,7 @@
&__form-label {
align-self: start;
color: $black_sea;
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
font-size: 15px;
font-style: normal;
line-height: 150%;
Expand Down Expand Up @@ -85,7 +85,7 @@
display: inline-block;
max-height: 30px;
margin-top: 20px;
font: italic 14px/2 'Cera Regular', serif;
font: italic 14px/2 'FixelText-Regular', serif;
text-align: center;
}

Expand Down
2 changes: 1 addition & 1 deletion _sass/expertise.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
padding: 3vh 1vw;
font-size: 1.3em;
box-shadow: inset -7px -7px 11px -6px #8f8f8f;
font-family: 'Cera-Bold', serif;
font-family: 'FixelText-Bold', serif;
&:first-child { border-radius: 1.2em 0 0 1.2em; }
&:last-child { border-radius: 0 1.2em 1.2em 0; }
}
Expand Down
2 changes: 1 addition & 1 deletion _sass/faq.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
&__summary {
color: $black_sea;
cursor: pointer;
font-family: 'Cera-Bold';
font-family: 'FixelText-Bold';
font-size: 18px;
font-style: normal;
font-weight: 700;
Expand Down
4 changes: 2 additions & 2 deletions _sass/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

&.bold {
color: $black;
font-family: 'Cera-Medium';
font-family: 'FixelText-Medium';
&:hover { color: $main-violet; }
}
}
Expand Down Expand Up @@ -172,7 +172,7 @@
&__item {
font-size: 0.75em;

&.bold { font-family: "Cera-Bold"; }
&.bold { font-family: "FixelText-Bold"; }
}
}

Expand Down
2 changes: 1 addition & 1 deletion _sass/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
background-color: $light-grey;

.animate-visibility__title {
font-family: 'Cera Regular';
font-family: 'FixelText-Regular';
text-transform: uppercase;
}
.purple-text { display: inline; }
Expand Down
6 changes: 3 additions & 3 deletions _sass/minima.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/

@font-face {
font-family: 'Cera Regular';
src: url(/assets/fonts/Cera.woff2);
font-family: 'FixelText-Regular';
src: url(/assets/fonts/FixelText-Regular.woff2);
font-weight: normal;
font-display: swap;
}
Expand All @@ -36,7 +36,7 @@ li {
}

h1, h2, h3, h4, h5, h6 {
font-family: 'Cera Regular', serif;
font-family: 'FixelText-Regular', serif;
font-weight: 400;
font-size: 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion _sass/navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ header {
letter-spacing: 0.4em;
cursor: pointer;

&.active { font-family: 'Cera-Bold'; }
&.active { font-family: 'FixelText-Bold'; }
}

&__link-contact {
Expand Down
2 changes: 1 addition & 1 deletion _sass/project_dev_services.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
&__content-output {
&-list {
color: $kviten;
font-family: 'Cera Regular', serif;
font-family: 'FixelText-Regular', serif;
}
&-title { color: $kviten; }
}
Expand Down
2 changes: 1 addition & 1 deletion _sass/reviews.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

.accordion {
summary {
font-family: 'Cera-Medium';
font-family: 'FixelText-Medium';
flex-direction: column;
font-size: 25px;

Expand Down
8 changes: 4 additions & 4 deletions _sass/utility.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
.py-4 { padding: 40px 0; }
.py-9 { padding: 90px 0; }

.cera-regular { font-family: "Cera Regular", serif; }
.cera-bold { font-family: "Cera-Bold", serif; }
.cera-medium { font-family: 'Cera-Medium'; }
.cera-regular { font-family: "FixelText-Regular", serif; }
.cera-bold { font-family: "FixelText-Bold", serif; }
.cera-medium { font-family: 'FixelText-Medium'; }
.inria-bold { font-family: "Inria Bold", serif; }
.inria-regular { font-family: "Inria Regular", serif; }
.blue { color: $sky-ua }
Expand All @@ -27,7 +27,7 @@
.info-container { background: $main-gradient !important; }
.alabaster { background-color: $alabaster; }
.white-text { color: $white !important; }
b { font-family: "Cera-Bold", serif; }
b { font-family: "FixelText-Bold", serif; }

.flex-columns-center {
display: flex;
Expand Down
Binary file removed assets/fonts/Cera-Bold.woff2
Binary file not shown.
Binary file removed assets/fonts/Cera-Medium.woff2
Binary file not shown.
Binary file removed assets/fonts/Cera.woff2
Binary file not shown.
Binary file added assets/fonts/FixelText-Bold.woff2
Binary file not shown.
Binary file added assets/fonts/FixelText-Medium.woff2
Binary file not shown.
Binary file added assets/fonts/FixelText-Regular.woff2
Binary file not shown.

0 comments on commit 09116f2

Please sign in to comment.