Merge branch '29-page-header' into 'dev'

Resolve "Адаптивный заголовок на странице"

Closes #29

See merge request romanov73/ng-tracker!28
This commit is contained in:
Anton Romanov 2019-03-06 12:25:34 +00:00
commit febdb0b027

View File

@ -62,7 +62,7 @@ section {
} }
section h2.section-heading { section h2.section-heading {
font-size: 3.5vw; font-size: 2.5vw;
margin-top: 0; margin-top: 0;
margin-bottom: 15px; margin-bottom: 15px;
} }
@ -200,20 +200,24 @@ img::-moz-selection {
border: none; border: none;
background-color: transparent; background-color: transparent;
} }
#mainNav .navbar-brand { #mainNav .navbar-brand {
font-size: 1.75em; font-size: 1.75em;
-webkit-transition: all 0.3s; -webkit-transition: all 0.3s;
-moz-transition: all 0.3s; -moz-transition: all 0.3s;
transition: all 0.3s; transition: all 0.3s;
} }
#mainNav .navbar-nav .nav-item .nav-link { #mainNav .navbar-nav .nav-item .nav-link {
padding: 1.1em 1em !important; padding: 1.1em 1em !important;
} }
#mainNav.navbar-shrink { #mainNav.navbar-shrink {
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
background-color: #212529; background-color: #212529;
} }
#mainNav.navbar-shrink .navbar-brand { #mainNav.navbar-shrink .navbar-brand {
font-size: 1.25em; font-size: 1.25em;
padding: 12px 0; padding: 12px 0;
@ -259,6 +263,7 @@ header.masthead .intro-text .intro-heading {
padding-top: 300px; padding-top: 300px;
padding-bottom: 200px; padding-bottom: 200px;
} }
header.masthead .intro-text .intro-lead-in { header.masthead .intro-text .intro-lead-in {
font-size: 40px; font-size: 40px;
font-style: italic; font-style: italic;
@ -266,6 +271,7 @@ header.masthead .intro-text .intro-heading {
margin-bottom: 25px; margin-bottom: 25px;
font-family: 'Droid Serif', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Droid Serif', 'Helvetica Neue', Helvetica, Arial, sans-serif;
} }
header.masthead .intro-text .intro-heading { header.masthead .intro-text .intro-heading {
font-size: 75px; font-size: 75px;
font-weight: 700; font-weight: 700;
@ -556,27 +562,32 @@ header.masthead .intro-text .intro-heading {
.timeline:before { .timeline:before {
left: 50%; left: 50%;
} }
.timeline > li { .timeline > li {
min-height: 100px; min-height: 100px;
margin-bottom: 100px; margin-bottom: 100px;
} }
.timeline > li .timeline-panel { .timeline > li .timeline-panel {
float: left; float: left;
width: 41%; width: 41%;
padding: 0 20px 20px 30px; padding: 0 20px 20px 30px;
text-align: right; text-align: right;
} }
.timeline > li .timeline-image { .timeline > li .timeline-image {
left: 50%; left: 50%;
width: 100px; width: 100px;
height: 100px; height: 100px;
margin-left: -50px; margin-left: -50px;
} }
.timeline > li .timeline-image h4 { .timeline > li .timeline-image h4 {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
margin-top: 16px; margin-top: 16px;
} }
.timeline > li.timeline-inverted > .timeline-panel { .timeline > li.timeline-inverted > .timeline-panel {
float: right; float: right;
padding: 0 30px 20px 20px; padding: 0 30px 20px 20px;
@ -588,19 +599,23 @@ header.masthead .intro-text .intro-heading {
.timeline > li { .timeline > li {
min-height: 150px; min-height: 150px;
} }
.timeline > li .timeline-panel { .timeline > li .timeline-panel {
padding: 0 20px 20px; padding: 0 20px 20px;
} }
.timeline > li .timeline-image { .timeline > li .timeline-image {
width: 150px; width: 150px;
height: 150px; height: 150px;
margin-left: -75px; margin-left: -75px;
} }
.timeline > li .timeline-image h4 { .timeline > li .timeline-image h4 {
font-size: 18px; font-size: 18px;
line-height: 26px; line-height: 26px;
margin-top: 30px; margin-top: 30px;
} }
.timeline > li.timeline-inverted > .timeline-panel { .timeline > li.timeline-inverted > .timeline-panel {
padding: 0 20px 20px; padding: 0 20px 20px;
} }
@ -610,17 +625,21 @@ header.masthead .intro-text .intro-heading {
.timeline > li { .timeline > li {
min-height: 170px; min-height: 170px;
} }
.timeline > li .timeline-panel { .timeline > li .timeline-panel {
padding: 0 20px 20px 100px; padding: 0 20px 20px 100px;
} }
.timeline > li .timeline-image { .timeline > li .timeline-image {
width: 170px; width: 170px;
height: 170px; height: 170px;
margin-left: -85px; margin-left: -85px;
} }
.timeline > li .timeline-image h4 { .timeline > li .timeline-image h4 {
margin-top: 40px; margin-top: 40px;
} }
.timeline > li.timeline-inverted > .timeline-panel { .timeline > li.timeline-inverted > .timeline-panel {
padding: 0 100px 20px 20px; padding: 0 100px 20px 20px;
} }
@ -762,6 +781,7 @@ ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons l
width: 100%; width: 100%;
margin: 5px; margin: 5px;
} }
/* --------------------------------------------------- /* ---------------------------------------------------
FEEDBACK STYLE FEEDBACK STYLE
----------------------------------------------------- */ ----------------------------------------------------- */
@ -779,6 +799,22 @@ ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons l
/* --------------------------------------------------- /* ---------------------------------------------------
MEDIAQUERIES MEDIAQUERIES
----------------------------------------------------- */ ----------------------------------------------------- */
@media (min-width: 768px) {
section h2.section-heading {
font-size: 3.5vw;
margin-top: 0;
margin-bottom: 15px;
}
}
@media (min-width: 1500px) {
section h2.section-heading {
font-size: 1.5vw;
margin-top: 0;
margin-bottom: 15px;
}
}
@media (min-width: 768px) { @media (min-width: 768px) {
.feedback-panel { .feedback-panel {
position: fixed; position: fixed;