diff options
| author | Justin J. Novack <jnovack@gmail.com> | 2012-10-06 22:49:06 -0400 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2012-10-24 15:00:06 +0200 |
| commit | e83f9aa55257edcc55bab996464a89b66805a346 (patch) | |
| tree | 83dc1a5f2cf190b82a837cc5cca14c670feed3da | |
| parent | 218e5ea6557b696f6775f71ed88d87fb37b099c4 (diff) | |
| download | phorkie-e83f9aa55257edcc55bab996464a89b66805a346.tar.gz phorkie-e83f9aa55257edcc55bab996464a89b66805a346.zip | |
Make header consistent with main container across 'desktop' resolutions
| -rw-r--r-- | data/templates/base.htm | 6 | ||||
| -rw-r--r-- | www/css/phorkie.css | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/data/templates/base.htm b/data/templates/base.htm index 426432e..2eb194e 100644 --- a/data/templates/base.htm +++ b/data/templates/base.htm @@ -20,11 +20,11 @@ <div class="navbar navbar-inverse"> <div class="navbar-inner"> <div class="container"> - <a class="brand" href="/"> - {{title}} - </a> <ul class="nav"> <li> + <a class="brand" href="/">{{title}}</a> + </li> + <li> <a href="/new">New paste</a> </li> <li> diff --git a/www/css/phorkie.css b/www/css/phorkie.css index 9cca2df..bc1bdc9 100644 --- a/www/css/phorkie.css +++ b/www/css/phorkie.css @@ -19,18 +19,28 @@ a.anchorlink { margin-left: 0.5em; font-size: smaller; } -.navbar .brand { +.navbar li a.brand { /*float: right;*/ + margin-left: -14px; color: #DDA; text-shadow: 0 0 30px rgba(255, 255, 255, .9); } -.navbar .brand:hover { +.navbar li a.brand:hover { color: #FFA; } -.navbar .container { - width: 940px; +@media (min-width: 980px) and (max-width: 1199px) { + .navbar .container { + width: 940px; + } } + +@media (min-width: 768px) and (max-width: 979px) { + .navbar .container { + width: 724px; + } +} + .footer { margin-top: 36px; margin-bottom: 0px; |