fix merge conflicts with About page

This commit is contained in:
imohkay 2021-10-22 19:41:52 +05:30
commit 323a86a5e9
14 changed files with 326 additions and 266 deletions

View file

@ -1,5 +1,3 @@
.films {
margin: var(--spacing-2);
box-sizing: border-box;
@ -33,24 +31,25 @@
}
}
main > .film {
max-width: var(--container-width);
margin: auto;
.info {
margin: var(--spacing) var(--spacing-2);
margin-bottom: 32px;
text-overflow: ellipsis;
overflow: hidden;
text-align: center;
h1 {
font-size: 24px;
margin: 24px 0;
font-size: 20px;
margin: 0 0 24px 0;
}
h2 {
font-size: 18px;
margin: 24px 0;
}
.details {
font-size: 18px;
margin-top: var(--spacing-2);
}
.bio {
@ -60,14 +59,12 @@ main > .film {
}
}
}
video {
width: 100%;
}
.play {
text-align: center;
margin: var(--spacing);
margin-top: var(--spacing-2);
margin-bottom: var(--spacing-2);
max-width: 250px;
.texts {
padding-top: var(--spacing-2);
@ -85,3 +82,88 @@ main > .film {
}
}
}
.info-meta {
display: inline-block;
margin: 0 auto;
position: absolute;
max-width: 600px;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
animation: fade_in 1s linear 0.4s forwards;
opacity: 0;
}
.info-meta, .bio-block, .play, .summary-block {
background: rgba(0, 0, 0, 0.55);
border-radius: 2px;
box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.6);
margin-left: auto;
margin-right: auto;
padding: 20px;
font-size: 18px;
a {
color: var(--color-link);
text-decoration: none;
font-weight: 700;
}
}
.summary-block {
max-width: 1080px;
margin-top: 350px;
}
.bio-block {
max-width: 1080px;
margin-top: 30px;
margin-bottom: 30px;
}
.video-block {
height: 100vh;
padding-bottom: 50px;
padding-top: 50px;
video {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: -9999;
height: 100vh;
width: 100vw;
object-fit: fill;
//height: 100vh;
//width: auto;
margin: 0 auto;
}
}
.icon-play {
color: #fff;
border: 3px solid var(--color-link);
border-radius: 50%;
font-size: 32px;
text-decoration: none;
width: 50px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
margin: auto;
}
.film-play-block {
text-align: center;
font-size: 18px;
}
.film-play-spacer {
padding: var(--spacing);
margin-top: 4px;
font-size: 12px;
font-weight: 700;
}

View file

@ -4,6 +4,8 @@
--bg-color-3: #ffff00;
--bg-color-4: #ff3399;
--color-link: #ee0;
--spacing: 8px;
--spacing-2: calc(var(--spacing) * 2);
@ -14,14 +16,23 @@
@keyframes background_animation {
0%,100% {
background-position: 0 0;
color: #ddd;
}
50% {
background-position: 100% 0;
}
}
@keyframes text_animation {
0%,100% {
color: #ddd;
}
50% {
color: #000;
}
}
body.animated {
background: linear-gradient(to right, var(--bg-color-1), var(--bg-color-2) , var(--bg-color-3), var(--bg-color-4));
//animation: background_animation 60s ease-in-out infinite;
@ -29,6 +40,10 @@ body.animated {
color: #ddd;
}
body.animated-text {
animation: text_animation 60s ease-in-out infinite;
}
body {
color: #ddd;
font-family: "noto_sans", sans-serif;
@ -63,3 +78,14 @@ nav {
padding-left: var(--spacing-2);
padding-right: var(--spacing-2);
}
// Animations: Fade In
@keyframes fade_in {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}

View file

@ -1,6 +1,6 @@
.topnav {
background-color: #333;
background-color: #333e;
position: relative;
height: 68px;
padding: var(--spacing-2);

View file

@ -1,4 +1,9 @@
:root {
--animated-title-color-1: #6666ff;
--animated-title-color-2: #0099ff;
--animated-title-color-3: #ffff00;
--animated-title-color-4: #ff3399;
}
@keyframes animated_title_animation {
0%,100% {
background-position: 0 0;
@ -11,8 +16,7 @@
.animated-title {
.text {
//background: linear-gradient(to right, #6666ff, #0099ff , #00ff00, #ff3399, #6666ff);
background: linear-gradient(to right, var(--bg-color-1), var(--bg-color-2) , var(--bg-color-3), var(--bg-color-4));
background: linear-gradient(to right, var(--animated-title-color-1), var(--animated-title-color-2) , var(--animated-title-color-3), var(--animated-title-color-4));
-webkit-background-clip: text;
background-clip: text;
color: transparent;