Skip to content

GitLab

Commit 59fe1999 authored by alinadk's avatar alinadk
Browse files

почти все

parent 33a6f3ad
Expand all Hide whitespace changes
Inline Side-by-side
css/main.css
View file @ 59fe1999
......@@ -40,50 +40,54 @@ body, html {
.name__chapter {
opacity: 0;
}
/*---------------------------------------------------------------------------------------------*/
/*-------------------------------------------main--------------------------------------------------*/
.navbar-1 {
transition: all 0.5s ease-in-out;
width: 100vw;
padding-top: 5px;
padding-bottom: 5px;
background-color: #80bf44;
}
.navbar-1__li {
display: flex;
align-items: center;
float: right;
margin: 0;
}
ul, li {
display: block;
}
.navbar-1__li__a {
padding-right: 15px;
.navbar-1__li li {
text-align: center;
padding-right: 10px;
}
.navbar-1__logo {
padding-left: 20px;
color: white;
}
.regist__button {
font-size: 14px;
font-weight: bold;
text-align: center;
vertical-align: middle;
color: white;
background-color: #005cbf;
border: none;
height: 100%;
padding: 10px 20px;
border-radius: 5px;
margin-right: 15px;
}
.navbar-1__li li {
text-align: center;
margin-right: 30px;
}
.navbar-1__li__a a {
.navbar-1__li>li>a {
text-decoration: none;
font-size: 16px;
font-weight: bold;
color: white;
}
.navbar-1__li__a a:hover{
.navbar-1__li>li>a :hover{
text-decoration: none;
color: #f8eb13;
}
/*-----------------------------------------header-md--------------------------------------------*/
.navigation-2__btn {
background-color: #80bf44;
color: white;
......@@ -128,7 +132,6 @@ ul, li {
.header-2__geography span {
color: #212121;
font-size: 20px;
font-family: Roboto, serif;
font-weight: bold !important;
margin-left: 5px;
}
......@@ -148,16 +151,15 @@ p.header-2__time-1, p.header-2__time-2 {
font-weight: bold;
}
.logotip {
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
padding: 20px 0;
background-color: #80bf44;
}
.logotip__img {
.logotip img {
color: white;
}
/*-------------------------------------------------------------------------------------*/
/*----------------------------------------header-2-md---------------------------------------------*/
.forum {
padding-top: 25%;
padding-bottom: 29%;
......@@ -184,6 +186,7 @@ p.header-2__time-1, p.header-2__time-2 {
font-weight: lighter;
color: rgba(255, 255, 255, 0.9);
}
/*----------------------------------------forum-information---------------------------------------------*/
.blue-line {
height: 15px;
background-color: #005cbf;
......@@ -231,12 +234,11 @@ p.header-2__time-1, p.header-2__time-2 {
font-weight: bold;
color: black;
}
/*----------------------------------------facts---------------------------------------------*/
.facts {
height: 60vh;
margin-bottom: 5%;
margin-top: 5%;
align-items: center;
display: flex;
align-items: center;
background: -webkit-linear-gradient(top, rgba(128,191,68,0.70), rgba(0,114,188,0.90)), url("../img/facts.png") no-repeat fixed top center;
......@@ -265,6 +267,7 @@ p.header-2__time-1, p.header-2__time-2 {
color: rgba(255, 255, 255, 0.8);
font-size: 20px;
}
/*----------------------------------------data-time---------------------------------------------*/
.data-time__name {
padding-top: 40px;
padding-bottom: 20px;
......@@ -337,11 +340,11 @@ p.header-2__time-1, p.header-2__time-2 {
.data-time__c-block-name-blue {
color:#2417db;
}
.active__name {
transition-duration: 1s;
opacity: 1;
}
/*----------------------------------------sheme---------------------------------------------*/
.sheme {
background-color: white;
padding-top: 100px;
......@@ -355,6 +358,7 @@ p.header-2__time-1, p.header-2__time-2 {
cursor: zoom-in;
margin-top: 40px;
}
/*----------------------------------------experts---------------------------------------------*/
.experts {
text-align: center;
background-color: #0072bc;
......@@ -380,7 +384,7 @@ p.header-2__time-1, p.header-2__time-2 {
padding-top: 90px;
padding-bottom: 30px;
width: 20%;
margin: 10px 20px 10px 20px;
margin: 10px 20px;
}
.experts__img {
border-radius: 50%;
......@@ -409,14 +413,14 @@ p.header-2__time-1, p.header-2__time-2 {
opacity: 1 !important;
}
/*----------------------------------------results---------------------------------------------*/
.results {
padding-top: 50px;
padding-top: 90px;
padding-bottom: 20px;
line-height: 1.23;
}
.results__name {
padding-top: 40px;
padding-top: 60px;
text-align: center;
color: rgb(59, 59, 59);
font-size: 42px;
......
html/main.html
View file @ 59fe1999
This diff is collapsed.
img/logotipTPU.png
View replaced file @ 33a6f3ad View file @ 59fe1999
img/logotipTPU.png

3.2 KB | W: | H:

img/logotipTPU.png

474 Bytes | W: | H:

img/logotipTPU.png
img/logotipTPU.png
img/logotipTPU.png
img/logotipTPU.png
  • 2-up
  • Swipe
  • Onion skin
js/main.js
View file @ 59fe1999
......@@ -137,7 +137,11 @@ function showContent(clicked_id){
}
}
var header = document.getElementById('header1');
var isScrolling = false;
window.addEventListener("scroll", throttleScroll, false);
var header = document.getElementById('full-header');
var sticky = header.offsetTop;
function myFunction() {
......@@ -155,76 +159,74 @@ window.addEventListener("scroll",(event) => {
header.classList.remove("hide");
});
myFunction();
var contentHeader = document.getElementById('header-2');
var logotipLine = document.getElementById('logotip');
var minusHeader = document.getElementById('navbar-1');
var minusHeader = document.getElementById('full-navbar');
function refreshContent() {
contentHeader.style.marginTop = header.offsetHeight + 'px';
var size = window.innerHeight - logotipLine.offsetHeight - header.offsetHeight-10;
var size = window.innerHeight - header.offsetHeight;
contentHeader.style.height = size + 'px';
console.log(header.offsetHeight);
console.log(window.innerHeight);
}
refreshContent();
function throttleScroll(e) {
if (isScrolling == false) {
window.requestAnimationFrame(function() {
scrolling(e);
isScrolling = false;
});
}
isScrolling = true;
}
var isScrolling = false;
window.addEventListener("scroll", throttleScroll, false);
function throttleScroll(e) {
if (isScrolling == false) {
window.requestAnimationFrame(function() {
scrolling(e);
isScrolling = false;
});
}
isScrolling = true;
myFunction();
refreshContent();
document.addEventListener("DOMContentLoaded", scrolling, false);
var listExperts = document.getElementsByClassName("experts__container");
var listFacts = document.getElementsByClassName("facts__text");
var listNames = document.getElementsByClassName("name__chapter");
function scrolling(e) {
for (var i = 0; i < listExperts.length; i++) {
var listExpert = listExperts[i];
if (isPartiallyVisible(listExpert)) {
listExpert.classList.add("active");
} else {
listExpert.classList.remove("active");
}
}
document.addEventListener("DOMContentLoaded", scrolling, false);
var listExperts = document.getElementsByClassName("experts__container");
var listFacts = document.getElementsByClassName("facts__text");
var listNames = document.getElementsByClassName("name__chapter");
function scrolling(e) {
for (var i = 0; i < listExperts.length; i++) {
var listExpert = listExperts[i];
if (isPartiallyVisible(listExpert)) {
listExpert.classList.add("active");
} else {
listExpert.classList.remove("active");
}
}
for (var i = 0; i < listNames.length; i++) {
var listName = listNames[i];
if (isPartiallyVisible(listName)) {
listName.classList.add("active__name");
} else {
listName.classList.remove("active__name");
}
}
for (var i = 0; i < listFacts.length; i++) {
var listFact = listFacts[i];
if (isPartiallyVisible(listFact)) {
listFact.classList.add("active");
} else {
listFact.classList.remove("active");
}
}
for (var i = 0; i < listNames.length; i++) {
var listName = listNames[i];
if (isPartiallyVisible(listName)) {
listName.classList.add("active__name");
} else {
listName.classList.remove("active__name");
}
}
function isPartiallyVisible(el) {
var elementBoundary = el.getBoundingClientRect();
var top = elementBoundary.top;
var bottom = elementBoundary.bottom;
var height = elementBoundary.height;
return ((top + height >= 0) && (height + window.innerHeight >= bottom));
for (var i = 0; i < listFacts.length; i++) {
var listFact = listFacts[i];
if (isPartiallyVisible(listFact)) {
listFact.classList.add("active");
} else {
listFact.classList.remove("active");
}
}
}
function isPartiallyVisible(el) {
var elementBoundary = el.getBoundingClientRect();
var top = elementBoundary.top;
var bottom = elementBoundary.bottom;
var height = elementBoundary.height;
return ((top + height >= 0) && (height + window.innerHeight >= bottom));
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment