From: Reda Lazri Date: Mon, 17 Nov 2014 17:14:53 +0000 (+0100) Subject: Fix the navbar once and for all X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=32d56408dd6f17eaa16d7c3b3fb6c25d5dca48e0;p=fsf-giving-guide.git Fix the navbar once and for all --- diff --git a/givingguide.html b/givingguide.html index 6c257a5..00382ba 100755 --- a/givingguide.html +++ b/givingguide.html @@ -18,23 +18,26 @@

- -

- - -

+ +

+ + + + + +

+ +

- -

@@ -57,7 +60,7 @@ Integer luctus neque non magna aliquam congue. Nullam gravida lectus urna, ut vulputate elit lobortis non.

- +

diff --git a/stylesheet.css b/stylesheet.css index 7968f86..839ce1e 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -36,7 +36,6 @@ html { width: 100%; } - /* Type something: */ a { color: #1F8A70; border-bottom: 1px solid #dbd145; text-decoration: none; } @@ -73,7 +72,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b /* Navbar */ -.navbar { +.header_wrapper { background-color: #2CAF8F; height: 500px; } @@ -82,24 +81,35 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b border-bottom: 0; } +.navbar_wrapper { + max-width: 1300px; + min-width: 1000px; + margin: auto; + text-align: center; +} + .logo_wrapper { padding: 1.3em; - float: left + float: left; } .join_wrapper { padding: 1.2em; float: right; + display: inline-block; } .logo, .join { - width: 210px; + max-width: 200px; + min-width: 200px; } -.nav_wrapper { - padding: 1em 5em 1em 9em; +.navbar { + width: 537px; + padding: 1em; height: 2.55556em; - float: left; + display: inline-block; +/* float: left; */ } .navbar li { @@ -157,8 +167,14 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b color: #bababa; } +.intro { + margin: auto; + max-width: 1300px; +} + .intro_wrapper { width: 40%; + max-width: 600px; float: right; color: white !important; padding-top: 2em; @@ -171,6 +187,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .intro_img img{ width: 40%; + max-width: 700px; float: left; padding: 2em; padding-left: 6em;