From 92930649ddc3a39f0569a463fa1600016388aee6 Mon Sep 17 00:00:00 2001 From: Vojta Svoboda Date: Tue, 23 Sep 2014 18:42:43 +0200 Subject: [PATCH 1/2] Fixed main navigation --- public/stylesheets/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 8a10346..b2f9c62 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -115,6 +115,7 @@ a:hover { #inner-wrapper { margin-right: 35px; padding-top: 1em; + padding-left: 335px; width: 629px; float: left; } @@ -135,7 +136,8 @@ a:hover { #stripe { background-color: #afb59b; background-image: url('../images/bg5.jpg'); - height: 100%; + position: fixed; + height: auto; padding-top: 26px; float: left; margin: 0px 35px; From 50a82be605444faaa31f20427c1a88fa14c8837d Mon Sep 17 00:00:00 2001 From: Vojta Svoboda Date: Tue, 23 Sep 2014 20:04:36 +0200 Subject: [PATCH 2/2] Fixed main navigation only for browser with height greater then 580px --- public/stylesheets/style.css | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index b2f9c62..151a396 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -115,7 +115,6 @@ a:hover { #inner-wrapper { margin-right: 35px; padding-top: 1em; - padding-left: 335px; width: 629px; float: left; } @@ -124,7 +123,11 @@ a:hover { .clearfix { clear: both; } - +@media (min-height: 580px) { + #inner-wrapper { + padding-left: 335px; + } +} /* ######### NAVIGATION ########## */ @@ -150,24 +153,31 @@ a:hover { } #stripe ul { - padding: 26px; - text-align: left; + padding: 26px; + text-align: left; } #stripe a { - color: #2a1807; + color: #2a1807; display: block; font-weight: normal; font-family: Rosarivo, Arial, Sans-serif; padding: .42em; border-bottom: 1px dashed #e0d5c7; } + #stripe a:hover { background: rgba(255,255,255, .25); border-radius: 2px; - color: #e95d3d; + color: #e95d3d; } +@media (min-height: 580px) { + #stripe { + position: fixed; + height: auto; + } +} /* ########### MAIN CONTENT ############## */