Merge in changes from Russ (/personal/housley/facelift-r8510) tweaking the development mode appearance, with some minor modifications

- Legacy-Id: 8695
This commit is contained in:
Ole Laursen 2014-11-17 22:01:50 +00:00
commit 0f81e1c027
6 changed files with 61 additions and 14 deletions

View file

@ -1,15 +1,16 @@
{% extends "ietf.html" %}
{% block title %}IETF Datatracker{% endblock %}
{% block title %}IETF Datatracker{% if server_mode != "production" %} -- Development Mode{% endif %}{% endblock %}
{% block content %}
<div class="row">
<div class="text-center">
<img class="ietflogo" src="/facelift/images/ietflogo{% ifnotequal server_mode "production" %}-dev{% endifnotequal %}.png" alt="IETF">
<h1>Datatracker</h1>
{% ifnotequal server_mode "production" %}
<p>Development Mode<p>
{% endifnotequal %}
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF">
{% if server_mode == "production" %}
<h1>IETF Datatracker</h1>
{% else %}
<h1 style="color:#ff0000">IETF Datatracker -- Development Mode</h1>
{% endif %}
</div>
</div>

View file

@ -7,7 +7,7 @@
<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" %} &part;{% endif %}</title>
<title>{% block title %}No title{% endblock %}{% if server_mode and server_mode != "production" %} &beta;{% endif %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/facelift/css/bootstrap.min.css">
@ -20,8 +20,8 @@
{% block pagehead %}{% endblock %}
<link rel="shortcut icon" href="/facelift/images/ietficon{% if server_mode != "production" %}-dev{% endif %}.ico">
<link rel="apple-touch-icon-precomposed" href="/facelift/images/ietficon{% if server_mode != "production" %}-dev{% endif %}.png">
<link rel="shortcut icon" href="/facelift/images/ietficon.ico">
<link rel="apple-touch-icon-precomposed" href="/facelift/images/ietficon.png">
</head>
{% filter amp|smartypants %}
@ -50,7 +50,7 @@
</div>
</div>
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<nav class="navbar {% if server_mode and server_mode != "production" %}navbar-dev{% else %}navbar-default{% 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">
@ -60,10 +60,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
IETF Datatracker
{% if server_mode %}
{% if server_mode != "production" %}&part;{% endif %}
{% endif %}
IETF Datatracker{% if server_mode and server_mode != "production" %} &beta;{% endif %}
</a>
</div>

View file

@ -157,3 +157,52 @@ pre { line-height: 1.214; }
visibility: hidden !important;
}
.in-nojs { display: block !important; }
/* Development Mode tool bar */
.navbar-dev {
background-color: #FF0000;
border-color: #CC0000;
}
.navbar-dev .navbar-brand {
color: #ecf0f1;
}
.navbar-dev .navbar-brand:hover, .navbar-default .navbar-brand:focus {
color: #ecdbff;
}
.navbar-dev .navbar-text {
color: #ecf0f1;
}
.navbar-dev .navbar-nav > li > a {
color: #ecf0f1;
}
.navbar-dev .navbar-nav > li > a:hover, .navbar-dev .navbar-nav > li > a:focus {
color: #ecdbff;
}
.navbar-dev .navbar-nav > .active > a, .navbar-dev .navbar-nav > .active > a:hover, .navbar-dev .navbar-nav > .active > a:focus {
color: #ecdbff;
background-color: #CC0000;
}
.navbar-dev .navbar-nav > .open > a, .navbar-dev .navbar-nav > .open > a:hover, .navbar-dev .navbar-nav > .open > a:focus {
color: #ecdbff;
background-color: #CC0000;
}
.navbar-dev .navbar-toggle {
border-color: #CC0000;
}
.navbar-dev .navbar-toggle:hover, .navbar-dev .navbar-toggle:focus {
background-color: #CC0000;
}
.navbar-dev .navbar-toggle .icon-bar {
background-color: #ecf0f1;
}
.navbar-dev .navbar-collapse,
.navbar-dev .navbar-form {
border-color: #ecf0f1;
}
.navbar-dev .navbar-link {
color: #ecf0f1;
}
.navbar-dev .navbar-link:hover {
color: #ecdbff;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB