Skip to content

Commit 576e29e

Browse files
levkowetzlevkowetz
committed
Turned the dev mode navbar back to red. Added a small IETF logo with transparent background for the navbar, instead of using two with dedicated colour-background.
 - Legacy-Id: 9468
1 parent 9c5de53 commit 576e29e

10 files changed

Lines changed: 56 additions & 50 deletions

File tree

‎bootstrap/dist/css/bootstrap-theme.css‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/dist/css/bootstrap-theme.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/dist/css/bootstrap-theme.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/dist/css/bootstrap.css‎

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/dist/css/bootstrap.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/dist/css/bootstrap.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/less/variables.less‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
@gray-doc-background: #fafafa; // was #f5f5f5
1818

1919
// Brand palette
20-
// http://www.colourlovers.com/palette/3702908/Key_West_Sunset
20+
// http://www.colourlovers.com/palette/3702908/Key_West_Sunset_2
2121
//
2222
@brand-blue: #2c254a; // space blue
2323
@brand-purple: #59356b; // time purple
24-
@brand-mauve: #b05683;
24+
@brand-red: #d4584d; // tweaked from sunset 2
2525
@brand-orange: #f69f74;
2626
@brand-yellow: #f8e16d;
2727
//
2828
// Secondary colours, not part of the primary palette
2929
@brand-green: #69fc2c;
30-
@brand-red: #d4584d;
30+
3131

3232
@brand-primary: @brand-blue; // space blue
3333
@brand-success: darken(@brand-green, 20%); // green // #3abf03
@@ -394,16 +394,16 @@
394394
@navbar-collapse-max-height: 340px;
395395

396396
@navbar-default-color: #777;
397-
@navbar-default-bg: #f8f8f8;
397+
@navbar-default-bg: lighten(saturate(@brand-red, 25%), 10%);
398398
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
399399

400400
// Navbar links
401-
@navbar-default-link-color: #777;
402-
@navbar-default-link-hover-color: #333;
401+
@navbar-default-link-color: #222;
402+
@navbar-default-link-hover-color: #111;
403403
@navbar-default-link-hover-bg: transparent;
404-
@navbar-default-link-active-color: #555;
404+
@navbar-default-link-active-color: #111;
405405
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
406-
@navbar-default-link-disabled-color: #ccc;
406+
@navbar-default-link-disabled-color: #777;
407407
@navbar-default-link-disabled-bg: transparent;
408408

409409
// Navbar brand label
@@ -413,7 +413,7 @@
413413

414414
// Navbar toggle
415415
@navbar-default-toggle-hover-bg: #ddd;
416-
@navbar-default-toggle-icon-bar-bg: #888;
416+
@navbar-default-toggle-icon-bar-bg: #000;
417417
@navbar-default-toggle-border-color: #ddd;
418418

419419

‎ietf/templates/base.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
2929
<!-- Removing the amp|smartypants filter as it increases the rendering time with about 50% -->
30-
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-inverse{% else %}navbar-inverse{% endif %} navbar-fixed-top" role="navigation">
30+
<nav class="navbar {% if server_mode and server_mode == "production" %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
3131
<div class="container-fluid">
3232
<div class="navbar-header">
3333
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
@@ -37,9 +37,15 @@
3737
<span class="icon-bar"></span>
3838
</button>
3939
<a class="navbar-brand" href="/">
40-
<img alt="IETF Logo" src="/images/ietflogo-blue3-small.png"></img>
40+
<img alt="IETF Logo" src="/images/ietflogo-small-transparent.png"></img>
4141
{% if not user.is_authenticated %}
42-
<div style="display: inline; vertical-align: top; padding-left: 1em;">Datatracker</div>
42+
<div style="display: inline; vertical-align: top; padding-left: 1em;">
43+
{% if server_mode and server_mode == "production" %}
44+
Datatracker
45+
{% else %}
46+
<b><i>Development mode</i></b>
47+
{% endif %}
48+
</div>
4349
{% endif %}
4450
</a>
4551
</div>

‎static/css/ietf.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ body { padding-top: 70px; }
5858
/* See http://eichefam.net/2012/04/12/scrollable-menus-in-bootstrap/ */
5959
.dropdown-submenu:hover > .dropdown-menu {
6060
height: auto;
61-
max-height: 600px;
61+
max-height: 650px;
6262
overflow-x: hidden;
6363
overflow-y: auto;
6464
}

‎static/images/ietflogo-small-transparent.png‎

1.94 KB
Loading

0 commit comments

Comments
 (0)