infeeeee/dis-2019
1
0
Fork 0
Code Issues 6 Pull Requests Releases 19 Wiki Activity

event fontsize, default colors, big hover recalc

Browse Source
This commit is contained in:
infeeeee
2019-09-11 12:11:05 +02:00
parent 72895de2a1
commit b296bca869
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_teendők.md
View File

@@ -13,5 +13,3 @@ Betöltéskor rejteni a dolgokat méretezés előtt, vagy betöltést optimaliz
# Megjegyzések # Megjegyzések
~ Adrinak írni, hogy küldjön tökéletesen négyzet logót - szerintem nem kell, megoldottam azt az 1px problémát ~ Adrinak írni, hogy küldjön tökéletesen négyzet logót - szerintem nem kell, megoldottam azt az 1px problémát
recalc felgördülő cucc desktopon

2
css/base.css
View File

File diff suppressed because one or more lines are too long

34
js/scripts.js
View File

@@ -865,29 +865,29 @@
let cBevezeto = cBevezetoWrapper.children(".bevezeto") let cBevezeto = cBevezetoWrapper.children(".bevezeto")
// calculate default metadata height // calculate default metadata height
if (!metadataHeights.collapsedHeight) {
metadataHeights.collapsedHeight = cMetadata[0].getBoundingClientRect().height metadataHeights.collapsedHeight = cMetadata[0].getBoundingClientRect().height
}
//calculate opened metadata height //calculate opened metadata height
if (!metadataHeights.openedHeight) {
let h2H = 0
$(".home-big h2").each(function () {
if ($(this)[0].getBoundingClientRect().height > h2H) {
h2H = $(this)[0].getBoundingClientRect().height
}
})
let artH = cArticle[0].getBoundingClientRect().height let h2H = 0
metadataHeights.openedHeight = artH - bottomScrollHeight - h2H $(".home-big h2").each(function () {
if ($(this)[0].getBoundingClientRect().height > h2H) {
h2H = $(this)[0].getBoundingClientRect().height
}
})
console.log('h2h', h2H, artH) let artH = cArticle[0].getBoundingClientRect().height
metadataHeights.openedHeight = artH - bottomScrollHeight - h2H
//add height to bevezetoWrapper console.log('h2h', h2H, artH)
$('.bevezetoWrapper').css({ height: metadataHeights.openedHeight })
//add height to bevezetoWrapper
$('.bevezetoWrapper').css({ height: metadataHeights.openedHeight })
$('.alcimWrapper').css({ height: metadataHeights.openedHeight })
$('.alcimWrapper').css({ height: metadataHeights.openedHeight })
}
//add hovered class //add hovered class
cArticle.addClass("hovered") cArticle.addClass("hovered")

4
sass/_font-mixins.scss
View File

@@ -261,9 +261,13 @@
@media #{$bigdesktop} { @media #{$bigdesktop} {
font-size: 3rem; font-size: 3rem;
} }
@media #{$bigdesktop-hidpi} {
font-size: 2.8rem;
}
@media #{$verybigdesktop} { @media #{$verybigdesktop} {
font-size: 4rem; font-size: 4rem;
} }
} }
@mixin event-date { @mixin event-date {

10
sass/base.scss
View File

@@ -2051,7 +2051,7 @@ $padd: 2rem;
hr { hr {
height: 1px; height: 1px;
background-color: #ff5f5f; background-color: #00ffb8;
padding: 0; padding: 0;
margin: 0 auto; margin: 0 auto;
@@ -2108,8 +2108,8 @@ $padd: 2rem;
@include single-quote(); @include single-quote();
margin: 2rem 0; margin: 2rem 0;
display: inline-block; display: inline-block;
background: #ff5f5f; background: #00ffb8;
@include box-shadow(10px 0 #ff5f5f, -5px 0 #ff5f5f); @include box-shadow(10px 0 #00ffb8, -5px 0 #00ffb8);
} }
h4 { h4 {
@@ -2128,11 +2128,11 @@ $padd: 2rem;
@include single-quote(); @include single-quote();
margin: 3rem 0; margin: 3rem 0;
p { p {
background: #ff5f5f; background: #00ffb8;
display: inline; display: inline;
padding: 5px 0 3px; padding: 5px 0 3px;
@include box-shadow(10px 0 #ff5f5f, -5px 0 #ff5f5f); @include box-shadow(10px 0 #00ffb8, -5px 0 #00ffb8);
} }
cite { cite {
display: block; display: block;