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

BUGFIX: Column spacing and missing bold font #461

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

BUGFIX: Column spacing and missing bold font #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16513ba
FEATURE: small layout improvements
Oct 21, 2022
3d6bdd5
TASK: add missing italic font, adjust mobile design
Oct 22, 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
1 change: 1 addition & 0 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Atoms/_Heading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
margin-bottom: $half-spacing+px;
font-size: $base-font-size*1.3px;
line-height: $base-line-height*1px;
font-weight: $regular;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary. We need to adjust the base mixin h() to use $regular. Additionally you can remove the font-weight overrides in the mixins h5 and h6 as they would break the current website styling.

You can check the impact of this change e.g. on the schedule page of the NEOSCON.


@include mq('medium') {
font-size: $base-font-size*1.5px;
Expand Down
1 change: 1 addition & 0 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_ImageTeaser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
//
:last-child {
margin-bottom: 0;
margin-right: .3rem;
}

&:after {
Expand Down
4 changes: 2 additions & 2 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_Navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

> li {
&:first-child {
font-weight: $bold;
font-weight: $regular;
}

&:after {
Expand Down Expand Up @@ -135,7 +135,7 @@

> li {
&.current {
font-weight: $bold;
font-weight: $regular;
}

&:after {
Expand Down
2 changes: 1 addition & 1 deletion DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Organisms/_SiteHeader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}
}
.siteHeader__nav {
font-weight: $bold;
font-weight: $regular;
font-size: .95em;
line-height: $basic-spacing+px;

Expand Down
23 changes: 21 additions & 2 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Utilities/_Neos.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,31 @@
}
.neos-alignment-left {
float: left;
margin-right: .9rem;
}
.neos-alignment-center {
text-align: center;
}
.neos-alignment-right {
float: right;
float: left;
margin-right: .9rem;

@media screen and (max-width: 649px) {
.neos-alignment-right {
float: right;
margin-right: 0;
}
}

figcaption {
margin-left: 0;

@media screen and (max-width: 649px) {
figcaption {
margin-left: .9rem;
}
}
}
crydotsnake marked this conversation as resolved.
Show resolved Hide resolved
}
.neos-nodetypes-image {
margin-bottom: rs($basic-spacing, $unit: rem);
Expand Down Expand Up @@ -39,4 +58,4 @@
.ml {
display: block !important;
}
}
}
27 changes: 27 additions & 0 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Framework/_Fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,30 @@ $font-path: "../Assets" !default;
font-style: normal;
font-weight: 400;
}
crydotsnake marked this conversation as resolved.
Show resolved Hide resolved
@font-face {
font-family: 'Work Sans';
font-display: swap;
src:
local("Work Sans"),
url('#{$font-path}/WorkSans-SemiBold.woff2') format('woff2');
font-style: normal;
font-weight: 600;
}
@font-face {
font-family: 'Work Sans';
font-display: swap;
src:
local("Work Sans"),
url('#{$font-path}/WorkSans-SemiBoldItalic.woff2') format('woff2');
font-style: italic;
font-weight: 600;
}
@font-face {
font-family: 'Work Sans';
font-display: swap;
src:
local("Work Sans"),
url('#{$font-path}/WorkSans-Italic.woff2') format('woff2');
font-style: italic;
font-weight: 400;
}
4 changes: 2 additions & 2 deletions DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ $serif-font-family: Georgia, "Times New Roman", Times, serif !default;
$mono-font-family: Menlo, Monaco, Consolas, "Courier New", monospace !default;

// The font-weights below are used to emphasize written words instead of numbers in your Sass.
$bold: 400 !default;
$regular: 300 !default;
$bold: 600 !default;
$regular: 400 !default;
$light: 200 !default;
$thin: 100 !default;

Expand Down
Binary file added DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBoldItalic.woff2
View file
Open in desktop
Binary file not shown.