Merge remote-tracking branch 'refs/remotes/BlissRoms/master'
# Conflicts:
# css/style.css
diff --git a/css/style.css b/css/style.css
index 927cd00..a0af41f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -83,7 +83,7 @@
.container>.navbar-collapse,
.container>.navbar-header {
margin:auto;
- }
+}
.container-fluid .text-muted {
margin: 20px 0; }
@@ -139,28 +139,36 @@
.navbar.solid .navbar-nav > li > a:focus {
background-color: transparent;
color: rgba(255,255,255,0.8); }
+.navbar-toggle {margin-right:0;}
.navbar-default .navbar-toggle {
border-color: #ffffff; }
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
background-color: #07374a;
- }
+ }
.navbar-default .navbar-toggle .icon-bar {
color: #ffffff;
background-color: #ffffff; }
+.navbar-default .navbar-collapse.collapse.in ul, .navbar-collapse {
+ background-color: #07374a;
+}
+.navbar-collapse.collapse.collapsing {
+ background-color: #07374a;
+}
+.navbar-default .navbar-toggle .icon-bar {
+ color: #ffffff;
+ background-color: #ffffff; }
.navbar-default .navbar-collapse.collapse.in ul {
background-color: #07374a;
- }
+}
.navbar-collapse.collapse.collapsing {
background-color: #07374a;
+}
- }
-
- .navbar-collapse.collapse.show {
+.navbar-collapse.collapse.show {
background-color: #07374a;
-webkit-transition: background-color .2s ease 0s;
transition: background-color .2s ease 0s;
- }
-
+}
/* Solid class attached on scroll past first section */
.navbar.solid {
@@ -181,7 +189,7 @@
.cover {
padding: 10% 0 10% 0; }
.cover.top {
- padding: 5% 0 10% 0;
+ padding: 10vh 0 15vh 0;
height: 100vh;
display: -webkit-box;
display: -ms-flexbox;
@@ -192,6 +200,11 @@
.headline {
padding-top: 6.25em; }
+ body > div.container-fluid > div.row.cover.top > div > .row > .headline > img {
+ max-width: 100%;
+ width: auto;
+ margin: 0 auto;
+ display: block; }
@media screen and (min-width: 768px) {
.headline {
padding-top: 3.75em; } }
@@ -364,3 +377,56 @@
max-height: 150px;
margin:0 auto;
}
+
+@media (max-height: 880px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 15vh}
+}
+@media (max-height: 800px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 10vh}
+ .cover.top {padding: 7.5vh 0 12.5vh 0;}
+}
+@media (max-height: 750px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 8vh}
+}
+@media (max-height: 720px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 5vh}
+ .cover.top {padding: 5vh 0 10vh 0;}
+}
+@media (max-height: 650px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 5vh}
+ .cover.top {padding: 2.5vh 0 5vh 0;}
+ body > div.container-fluid > div.row.cover.top > div > .row > .headline > img {max-height: 42vh;}
+}
+@media (max-height: 550px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 5vh}
+ .cover.top {padding: 1.5vh 0 3vh 0;}
+ .headline {padding-top:3vh;}
+ body > div.container-fluid > div.row.cover.top > div > .row > .headline > img {max-height: 32vh;}
+}
+@media (max-height: 480px) {
+ #scrollIcon, #scrollTopIcon {margin-top: 0}
+ .cover.top {padding: 0vh 0 3vh 0;}
+ .headline {padding-top:1.5vh;}
+ body > div.container-fluid > div.row.cover.top > div > .row > .headline > img {max-height: 32vh;}
+}
+@media (max-width: 768px) {
+ .container-fluid {padding:30px 0 !important;}
+ .h1, .h2, .h3, h1, h2, h3 {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ }
+ .lead, .about, .about-info, .about-tools, .about-last {font-size: 16px}
+ .about-info {padding: 0% 6% 0% 6%;}
+ .row.cover.top .lead {
+ max-width: 350px;
+ margin-left:auto;
+ margin-right: auto
+ }
+ .h4, h4 {font-size: 20px}
+ #portfolio h2 {padding-bottom: 0}
+ .portfolio-projects--btn {margin-top:1.25em;}
+ #scrollIcon, #scrollTopIcon {font-size: 1em}
+}
+@media (max-width: 360px) {
+ .h1, h1 {font-size: 32px;}
+}
\ No newline at end of file