Skip to content

Commit

Permalink
feat(layout): adjust margin handling + daily images
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerd Müller committed Feb 14, 2021
1 parent 3390ccc commit 07fd127
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 5 deletions.
Binary file modified apps/demol/src/assets/daily.webp
Binary file not shown.
Binary file removed apps/demol/src/assets/daily_result.webp
Binary file not shown.
Binary file added apps/demol/src/assets/daily_result_DE.webp
Binary file not shown.
Binary file added apps/demol/src/assets/daily_result_EN.webp
Binary file not shown.
Binary file modified apps/demol/src/assets/fallback/daily.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/demol/src/assets/fallback/daily_result.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion libs/ui/src/lib/chapter/chapter.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,19 @@
align-items: center;
justify-content: center;
flex-flow: row wrap;
padding: 0 16px;

&--fore {
transform: translateZ(90px) scale(.7);
z-index: 1;
align-content: baseline;
padding: 0 16px;
}

&--base {
transform: translateZ(0);
z-index: 4;
background: 50% 50% / cover;
padding: 0 16px;
}

&--back {
Expand Down Expand Up @@ -96,6 +97,7 @@

.fourth {
flex: 0 25%;
padding: 5px;
}

.fifth {
Expand Down
5 changes: 3 additions & 2 deletions libs/ui/src/lib/daily/daily.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
flex-direction: column;
justify-content: center;
align-items: center;
font-size: 1.7rem;
font-size: 0.9rem;
}

img {
height: auto;
text-align: center;
width: 60%;
width: 100%;
margin: 0 auto 0;
justify-content: center;
display: flex;
Expand All @@ -50,5 +50,6 @@
@media (min-width: 600px) {
.daily .component_box {
height: 45vh;
font-size: 1.4rem;
}
}
3 changes: 2 additions & 1 deletion libs/ui/src/lib/daily/daily.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export const Daily = (props: DailyProps) => {

const showStatus = () => {
if (result) {
return <Image value='daily_result' />
const imgValue = language === 'de' ? 'daily_result_DE' : 'daily_result_EN';
return <Image value={imgValue} />
}
return (
<>
Expand Down
1 change: 1 addition & 0 deletions libs/ui/src/lib/image/image.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.chapter_picture {
max-width: 100%;
display: block;
margin: auto;
filter: saturate(.8);
opacity: .9;
transition: all 0.50s;
Expand Down
3 changes: 2 additions & 1 deletion libs/ui/src/lib/info/info.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
overflow: hidden;
background-color: rgba(0,0,0,.7);
color: var(--color-link);
font-size: 1.1rem;
font-size: 1.3rem;
width: 300px;

p {
text-shadow: none;
Expand Down
1 change: 1 addition & 0 deletions libs/ui/src/lib/text/text.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.box {
width: 80%;
margin: auto;
}

p {
Expand Down

0 comments on commit 07fd127

Please sign in to comment.