Reverted the shortcut icon. Revised the apple touch icon. Changed top menubar colour to match current look. Added top menubar logotype to match current look.

- Legacy-Id: 9371
This commit is contained in:
Henrik Levkowetz 2015-04-03 13:35:33 +00:00
parent 3f33c7033d
commit 70b4ecf7b8
4 changed files with 114 additions and 8 deletions

View file

@ -1,9 +1,9 @@
<!doctype html> {% load ietf_filters typogrify_tags %}
<!DOCTYPE html> {% load ietf_filters typogrify_tags %}
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{% block title %}No title{% endblock %}{% if server_mode and server_mode != "production" %} &beta;{% endif %}</title>
<title>{% block title %}No title{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/css/bootstrap.min.css">
@ -16,13 +16,13 @@
{% block pagehead %}{% endblock %}
<link rel="shortcut icon" href="/images/ietficon.ico">
<link rel="apple-touch-icon-precomposed" href="/images/ietficon.png">
<link rel="shortcut icon" href="/images/ietf-icon-blue.png">
<link rel="apple-touch-icon" href="/images/apple-touch-icon.png">
</head>
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
{% filter amp|smartypants %}
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-dev{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-dev{% else %}navbar-prod{% endif %} navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
IETF Datatracker{% if server_mode and server_mode != "production" %} &beta;{% endif %}
<img alt="IETF Logo" src="/images/ietflogo-blue-small.png"></img>
</a>
</div>

View file

@ -154,11 +154,16 @@ label.required:after { content: "\2217"; color: #a94442; font-weight: bold; }
pre { line-height: 1.214; }
/* Make ampersands pretty */
/* This sets ampersand in a different font than the rest of the text. Fancy, but it's
really better to select a pretty font in the first place. Additionally, _which_ 'pretty'
ampersand you get is dependent on which fonts are available in the browser. Hacky. */
/*
.amp {
font-family:Baskerville,"Goudy Old Style","Palatino","Book Antiqua",serif;
font-size:110%;
font-style:italic;
}
*/
/* Turn off link underlining for panels in the search results */
.ipr a:hover { text-decoration: none }
@ -175,11 +180,112 @@ pre { line-height: 1.214; }
}
.in-nojs { display: block !important; }
.navbar-brand > img {
display: inline;
vertical-align: middle;
margin-top: -8px;
padding-top: 0;
}
/* Production Mode tool bar */
.navbar-prod {
background-color: #303060;
border-color: #202040;
}
.navbar-prod a {
color: #fff;
}
/*
.navbar-prod .nav .open>a,.navbar-prod .nav .open>a:focus,.navbar-prod .nav .open>a:hover {
background-color: #404080;
border-color: #101020;
color: #ffffff;
text-shadow: #fff;
}
*/
.navbar-prod .navbar-brand {
color: #ecf0f1;
}
.navbar-prod .navbar-brand:hover, .navbar-default .navbar-brand:focus {
color: #eeeeff;
}
.navbar-prod .navbar-text {
color: #ecf0f1;
}
.navbar-prod .navbar-nav > li > a {
color: #ecf0f1;
}
.navbar-prod .navbar-nav > li > a:hover, .navbar-prod .navbar-nav > li > a:focus {
color: #eeeeff;
background-color: #404080;
}
.navbar-prod .navbar-nav > .active > a, .navbar-prod .navbar-nav > .active > a:hover, .navbar-prod .navbar-nav > .active > a:focus {
color: #eeeeff;
background-color: #404080;
}
.navbar-prod .dropdown-menu > li > a {
color: #000040;
}
.navbar-prod .dropdown-menu > li > a:focus, .navbar-prod .dropdown-menu > li > a:hover {
color: #000040;
background-color: #404080;
}
.navbar-prod .navbar-nav > .open > a, .navbar-prod .navbar-nav > .open > a:hover, .navbar-prod .navbar-nav > .open > a:focus {
color: #eeeeff;
background-color: #404080;
}
@media (max-width: 767px) {
.navbar-prod .navbar-nav > li > a:hover, .navbar-prod .navbar-nav > li > a:focus {
color: #eeeeff;
background-color: #404080;
}
.navbar-prod .navbar-nav > .active > a, .navbar-prod .navbar-nav > .active > a:hover, .navbar-prod .navbar-nav > .active > a:focus {
color: #eeeeff;
background-color: #404080;
}
.navbar-prod .dropdown-menu > li > a {
color: #eeeeff;
}
.navbar-prod .dropdown-menu > li > a:focus, .navbar-prod .dropdown-menu > li > a:hover {
color: #eeeeff;
background-color: #404080;
}
.navbar-prod .navbar-nav > .open > a, .navbar-prod .navbar-nav > .open > a:hover, .navbar-prod .navbar-nav > .open > a:focus {
color: #eeeeff;
background-color: #404080;
}
}
.navbar-prod .navbar-toggle {
border-color: #404080;
}
.navbar-prod .navbar-toggle:hover, .navbar-prod .navbar-toggle:focus {
background-color: #404080;
}
.navbar-prod .navbar-toggle .icon-bar {
background-color: #ecf0f1;
}
.navbar-prod .navbar-collapse,
.navbar-prod .navbar-form {
border-color: #ecf0f1;
}
.navbar-prod .navbar-link {
color: #ecf0f1;
}
.navbar-prod .navbar-link:hover {
color: #eeeeff;
}
/* Development Mode tool bar */
.navbar-dev {
background-color: #FF0000;
border-color: #CC0000;
background-color: #ff0000;
border-color: #cc0000;
}
.navbar-dev .navbar-brand {
color: #ecf0f1;

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 363 B