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

AR-860: Add quries for 4k. Fix font size select. Template fixes #83

Merged
merged 2 commits into from
Sep 8, 2022
Merged

AR-860: Add quries for 4k. Fix font size select. Template fixes #83

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
f6da38a
AR-860: Add quries for 4k. Fix font size select. Template fixes
yepzdk Aug 31, 2022
6862907
AR-860: remove comment
yepzdk Aug 31, 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
2 changes: 1 addition & 1 deletion build/book-review.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions build/calendar-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,27 @@
{
"key": "fontsize1",
"title": "xs",
"value": "xs"
"value": "font-size-xs"
},
{
"key": "fontsize2",
"title": "s",
"value": "s"
"value": "font-size-s"
},
{
"key": "fontsize3",
"title": "m",
"value": "m"
"value": "font-size-m"
},
{
"key": "fontsize4",
"title": "l",
"value": "l"
"value": "font-size-l"
},
{
"key": "fontsize5",
"title": "xl",
"value": "xl"
"value": "font-size-xl"
}
],
"name": "fontSize"
Expand Down
2 changes: 1 addition & 1 deletion build/calendar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/contacts.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/iframe.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions build/image-text-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,27 @@
{
"key": "fontsize1",
"title": "xs",
"value": "xs"
"value": "font-size-xs"
},
{
"key": "fontsize2",
"title": "s",
"value": "s"
"value": "font-size-s"
},
{
"key": "fontsize3",
"title": "m",
"value": "m"
"value": "font-size-m"
},
{
"key": "fontsize4",
"title": "l",
"value": "l"
"value": "font-size-l"
},
{
"key": "fontsize5",
"title": "xl",
"value": "xl"
"value": "font-size-xl"
}
],
"name": "fontSize"
Expand Down Expand Up @@ -155,4 +155,4 @@
"name": "shadow",
"formGroupClasses": "col-md-6"
}
]
]
2 changes: 1 addition & 1 deletion build/image-text.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/instagram-feed.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/poster.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/rss.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/slideshow.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions build/table-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,27 @@
{
"key": "fontsize1",
"title": "xs",
"value": "xs"
"value": "font-size-xs"
},
{
"key": "fontsize2",
"title": "s",
"value": "s"
"value": "font-size-s"
},
{
"key": "fontsize3",
"title": "m",
"value": "m"
"value": "font-size-m"
},
{
"key": "fontsize4",
"title": "l",
"value": "l"
"value": "font-size-l"
},
{
"key": "fontsize5",
"title": "xl",
"value": "xl"
"value": "font-size-xl"
}
],
"name": "fontSize"
Expand Down
2 changes: 1 addition & 1 deletion build/table.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/travel.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/video.js
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/book-review/book-review.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
--bg-color: var(--bg-white, hsl(0deg, 0%, 100%));
--bg-color-light: var(--bg-light, hsl(0deg, 0%, 90%));
--bg-color-dark: var(--bg-dark, hsl(0deg, 5%, 20%));
--title-font-size: var(--h1-font-size, 4rem);
--blur: var(--image-blur, 10px);

font-family: var(--font);
Expand All @@ -19,20 +18,20 @@
grid-template-areas: "a c" "b c";
grid-gap: 0;
overflow: hidden;
font-size: var(--font-size-base);

.text-area {
background: var(--bg-color);
grid-area: a;
padding: 8% 10% 0 10%;
word-wrap: break-word;
font-size: 2em;

dfn {
font-style: italic;
}

h1 {
font-size: var(--title-font-size);
font-size: calc(var(--h1-font-size));
margin: 0 0 2% 0;
text-align: left;
}
Expand All @@ -54,11 +53,12 @@
grid-area: b;

.author-image {
--image-size: calc(var(--font-size-base) * 7);
position: absolute;
top: -5em;
left: calc(50% - 5em);
width: 10em;
height: 10em;
top: calc(var(--image-size) * -0.5);
left: calc(50% - calc(var(--image-size) * 0.5));
width: var(--image-size);
height: var(--image-size);
border-radius: 50%;
overflow: hidden;
background-size: cover;
Expand All @@ -70,7 +70,7 @@
padding: 5% 1% 1% 1%;
text-align: center;
color: var(--text-color);
font-size: 1.5em;
font-size: calc(var(--font-size-base) * 0.75);
margin-top: 2em;
margin-bottom: 1em;
}
Expand Down
10 changes: 5 additions & 5 deletions src/calendar/calendar-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,27 @@
{
"key": "fontsize1",
"title": "xs",
"value": "xs"
"value": "font-size-xs"
},
{
"key": "fontsize2",
"title": "s",
"value": "s"
"value": "font-size-s"
},
{
"key": "fontsize3",
"title": "m",
"value": "m"
"value": "font-size-m"
},
{
"key": "fontsize4",
"title": "l",
"value": "l"
"value": "font-size-l"
},
{
"key": "fontsize5",
"title": "xl",
"value": "xl"
"value": "font-size-xl"
}
],
"name": "fontSize"
Expand Down
31 changes: 1 addition & 30 deletions src/calendar/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function Calendar({ slide, content, run, slideDone, executionId }) {
const { layout = "multiple", duration = 15000, fontSize } = content;
const { feedData = [] } = slide;

const classes = ["template-calendar"];
const classes = ["template-calendar", fontSize];
const rootStyle = {};

const imageUrl = getFirstMediaUrlFromField(slide.mediaData, content.image);
Expand All @@ -37,35 +37,6 @@ function Calendar({ slide, content, run, slideDone, executionId }) {
rootStyle["--bg-image"] = `url("${imageUrl}")`;
}

Copy link
Contributor

Choose a reason for hiding this comment

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

🥇

if (fontSize) {
let selectedFontSize = 1;

switch (fontSize) {
case "xs":
selectedFontSize = 0.5;
break;
case "s":
selectedFontSize = 0.75;
break;
case "m":
selectedFontSize = 1;
break;
case "l":
selectedFontSize = 1.25;
break;
case "xl":
selectedFontSize = 1.5;
break;
default:
}

rootStyle["--font-size-base"] = `${selectedFontSize}rem`;
rootStyle["--h1-font-size"] = "calc(var(--font-size-base) * 2.5)";
rootStyle["--h2-font-size"] = "calc(var(--font-size-base) * 2)";
rootStyle["--h3-font-size"] = "calc(var(--font-size-base) * 1.75)";
rootStyle["--padding-size-base"] = `${selectedFontSize}rem`;
}

/** Setup slide run function. */
const slideExecution = new BaseSlideExecution(slide, slideDone);
useEffect(() => {
Expand Down
1 change: 1 addition & 0 deletions src/contacts/contacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ function Contacts({ slide, content, run, slideDone, executionId }) {
const Wrapper = styled.div`
/* Wrapper styling */
font-family: var(--font-family-base);
font-size: var(--font-size-base);
height: 100%;
background-repeat: no-repeat;
background-size: cover;
Expand Down
84 changes: 75 additions & 9 deletions src/global-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,26 @@
* Sizes
*/
--font-size-base: 1rem; /* Assumes the browser default, typically 16px */
--font-size-xs: calc(var(--font-size-base) * 0.75);
--font-size-sm: calc(var(--font-size-base) * 0.875);
--font-size-lg: calc(var(--font-size-base) * 1.25);
--font-size-xl: calc(var(--font-size-base) * 1.5);
--h1-font-size: calc(var(--font-size-base) * 2.5);
--h2-font-size: calc(var(--font-size-base) * 2);
--h3-font-size: calc(var(--font-size-base) * 1.75);
--h4-font-size: calc(var(--font-size-base) * 1.5);
--h5-font-size: calc(var(--font-size-base) * 1.25);

--font-size-multiplier-050: 0.5;
--font-size-multiplier-075: 0.75;
--font-size-multiplier-090: 0.9;
--font-size-multiplier-125: 1.25;
--font-size-multiplier-150: 1.5;
--font-size-multiplier-175: 1.75;
--font-size-multiplier-200: 2;
--font-size-multiplier-250: 2.5;

--font-size-xs: calc(var(--font-size-base) * var(--font-size-multiplier-050));
--font-size-sm: calc(var(--font-size-base) * var(--font-size-multiplier-075));
--font-size-m: calc(var(--font-size-base) * 1);
--font-size-lg: calc(var(--font-size-base) * var(--font-size-multiplier-125));
--font-size-xl: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
--h6-font-size: calc(var(--font-size-base));

/*
Expand Down Expand Up @@ -176,3 +187,58 @@ body {
--color-grey-800: hsl(0deg 0% 75%);
--color-grey-900: hsl(0deg 0% 90%);
}

/* Target landscape 4K */
@media screen and (min-width: 1921px) and (orientation: landscape) {
.slide {
--font-size-base: 2rem;
}
}

/* Target portrait 4K */
@media screen and (min-width: 1081px) and (orientation: portrait) {
.slide {
--font-size-base: 2rem;
}
}

.slide .font-size-xs {
--font-size-base: var(--font-size-xs);
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
}
.slide .font-size-s {
--font-size-base: var(--font-size-sm);
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
}
.slide .font-size-m {
--font-size-base: var(--font-size-m);
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
}
.slide .font-size-lg {
--font-size-base: var(--font-size-lg);
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
}
.slide .font-size-xl {
--font-size-base: var(--font-size-xl);
--h1-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-250));
--h2-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-200));
--h3-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-175));
--h4-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-150));
--h5-font-size: calc(var(--font-size-base) * var(--font-size-multiplier-125));
}
12 changes: 6 additions & 6 deletions src/image-text/image-text-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,27 @@
{
"key": "fontsize1",
"title": "xs",
"value": "xs"
"value": "font-size-xs"
},
{
"key": "fontsize2",
"title": "s",
"value": "s"
"value": "font-size-s"
},
{
"key": "fontsize3",
"title": "m",
"value": "m"
"value": "font-size-m"
},
{
"key": "fontsize4",
"title": "l",
"value": "l"
"value": "font-size-l"
},
{
"key": "fontsize5",
"title": "xl",
"value": "xl"
"value": "font-size-xl"
}
],
"name": "fontSize"
Expand Down Expand Up @@ -155,4 +155,4 @@
"name": "shadow",
"formGroupClasses": "col-md-6"
}
]
]
4 changes: 2 additions & 2 deletions src/image-text/image-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ function ImageText({ slide, content, run, slideDone, executionId }) {
fontSize,
shadow,
} = content || {};
let boxClasses = fontSize ? `box ${fontSize}` : "box";
const rootClasses = ["template-image-text"];
let boxClasses = "box";
const rootClasses = ["template-image-text", fontSize];

// Styling objects
const rootStyle = {};
Expand Down
Loading