Skip to content

Commit 70b4ecf

Browse files
levkowetzlevkowetz
committed
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
1 parent 3f33c70 commit 70b4ecf

4 files changed

Lines changed: 114 additions & 8 deletions

File tree

‎ietf/templates/ietf.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<!doctype html> {% load ietf_filters typogrify_tags %}
1+
<!DOCTYPE html> {% load ietf_filters typogrify_tags %}
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>{% block title %}No title{% endblock %}{% if server_mode and server_mode != "production" %} &beta;{% endif %}</title>
6+
<title>{% block title %}No title{% endblock %}</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88

99
<link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -16,13 +16,13 @@
1616

1717
{% block pagehead %}{% endblock %}
1818

19-
<link rel="shortcut icon" href="/images/ietficon.ico">
20-
<link rel="apple-touch-icon-precomposed" href="/images/ietficon.png">
19+
<link rel="shortcut icon" href="/images/ietf-icon-blue.png">
20+
<link rel="apple-touch-icon" href="/images/apple-touch-icon.png">
2121
</head>
2222

2323
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
2424
{% filter amp|smartypants %}
25-
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-dev{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
25+
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-dev{% else %}navbar-prod{% endif %} navbar-fixed-top" role="navigation">
2626
<div class="container-fluid">
2727
<div class="navbar-header">
2828
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
@@ -32,7 +32,7 @@
3232
<span class="icon-bar"></span>
3333
</button>
3434
<a class="navbar-brand" href="/">
35-
IETF Datatracker{% if server_mode and server_mode != "production" %} &beta;{% endif %}
35+
<img alt="IETF Logo" src="/images/ietflogo-blue-small.png"></img>
3636
</a>
3737
</div>
3838

‎static/css/ietf.css‎

Lines changed: 108 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,16 @@ label.required:after { content: "\2217"; color: #a94442; font-weight: bold; }
154154
pre { line-height: 1.214; }
155155

156156
/* Make ampersands pretty */
157+
/* This sets ampersand in a different font than the rest of the text. Fancy, but it's
158+
really better to select a pretty font in the first place. Additionally, _which_ 'pretty'
159+
ampersand you get is dependent on which fonts are available in the browser. Hacky. */
160+
/*
157161
.amp {
158162
font-family:Baskerville,"Goudy Old Style","Palatino","Book Antiqua",serif;
159163
font-size:110%;
160164
font-style:italic;
161165
}
166+
*/
162167

163168
/* Turn off link underlining for panels in the search results */
164169
.ipr a:hover { text-decoration: none }
@@ -175,11 +180,112 @@ pre { line-height: 1.214; }
175180
}
176181
.in-nojs { display: block !important; }
177182

183+
.navbar-brand > img {
184+
display: inline;
185+
vertical-align: middle;
186+
margin-top: -8px;
187+
padding-top: 0;
188+
}
189+
190+
/* Production Mode tool bar */
191+
192+
.navbar-prod {
193+
background-color: #303060;
194+
border-color: #202040;
195+
}
196+
.navbar-prod a {
197+
color: #fff;
198+
}
199+
/*
200+
.navbar-prod .nav .open>a,.navbar-prod .nav .open>a:focus,.navbar-prod .nav .open>a:hover {
201+
background-color: #404080;
202+
border-color: #101020;
203+
color: #ffffff;
204+
text-shadow: #fff;
205+
}
206+
*/
207+
208+
.navbar-prod .navbar-brand {
209+
color: #ecf0f1;
210+
}
211+
.navbar-prod .navbar-brand:hover, .navbar-default .navbar-brand:focus {
212+
color: #eeeeff;
213+
}
214+
.navbar-prod .navbar-text {
215+
color: #ecf0f1;
216+
}
217+
.navbar-prod .navbar-nav > li > a {
218+
color: #ecf0f1;
219+
}
220+
.navbar-prod .navbar-nav > li > a:hover, .navbar-prod .navbar-nav > li > a:focus {
221+
color: #eeeeff;
222+
background-color: #404080;
223+
}
224+
.navbar-prod .navbar-nav > .active > a, .navbar-prod .navbar-nav > .active > a:hover, .navbar-prod .navbar-nav > .active > a:focus {
225+
color: #eeeeff;
226+
background-color: #404080;
227+
}
228+
.navbar-prod .dropdown-menu > li > a {
229+
color: #000040;
230+
}
231+
.navbar-prod .dropdown-menu > li > a:focus, .navbar-prod .dropdown-menu > li > a:hover {
232+
color: #000040;
233+
background-color: #404080;
234+
}
235+
.navbar-prod .navbar-nav > .open > a, .navbar-prod .navbar-nav > .open > a:hover, .navbar-prod .navbar-nav > .open > a:focus {
236+
color: #eeeeff;
237+
background-color: #404080;
238+
}
239+
240+
@media (max-width: 767px) {
241+
.navbar-prod .navbar-nav > li > a:hover, .navbar-prod .navbar-nav > li > a:focus {
242+
color: #eeeeff;
243+
background-color: #404080;
244+
}
245+
.navbar-prod .navbar-nav > .active > a, .navbar-prod .navbar-nav > .active > a:hover, .navbar-prod .navbar-nav > .active > a:focus {
246+
color: #eeeeff;
247+
background-color: #404080;
248+
}
249+
.navbar-prod .dropdown-menu > li > a {
250+
color: #eeeeff;
251+
}
252+
.navbar-prod .dropdown-menu > li > a:focus, .navbar-prod .dropdown-menu > li > a:hover {
253+
color: #eeeeff;
254+
background-color: #404080;
255+
}
256+
.navbar-prod .navbar-nav > .open > a, .navbar-prod .navbar-nav > .open > a:hover, .navbar-prod .navbar-nav > .open > a:focus {
257+
color: #eeeeff;
258+
background-color: #404080;
259+
}
260+
}
261+
262+
.navbar-prod .navbar-toggle {
263+
border-color: #404080;
264+
}
265+
.navbar-prod .navbar-toggle:hover, .navbar-prod .navbar-toggle:focus {
266+
background-color: #404080;
267+
}
268+
.navbar-prod .navbar-toggle .icon-bar {
269+
background-color: #ecf0f1;
270+
}
271+
.navbar-prod .navbar-collapse,
272+
.navbar-prod .navbar-form {
273+
border-color: #ecf0f1;
274+
}
275+
.navbar-prod .navbar-link {
276+
color: #ecf0f1;
277+
}
278+
.navbar-prod .navbar-link:hover {
279+
color: #eeeeff;
280+
}
281+
282+
283+
178284
/* Development Mode tool bar */
179285

180286
.navbar-dev {
181-
background-color: #FF0000;
182-
border-color: #CC0000;
287+
background-color: #ff0000;
288+
border-color: #cc0000;
183289
}
184290
.navbar-dev .navbar-brand {
185291
color: #ecf0f1;

‎static/images/apple-touch-icon.png‎

5.95 KB
Loading

‎static/images/ietf-icon-blue.png‎

363 Bytes
Loading

0 commit comments

Comments
 (0)