Skip to content

Commit c1b86d9

Browse files
committed
Merged in [9525] from lars@netapp.com:
Make the menu bar search field appear on slightly smaller screen widths. - Legacy-Id: 9540 Note: SVN reference [9525] has been migrated to Git commit 6514776
2 parents 6deac8e + 6514776 commit c1b86d9

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

bootstrap/dist/css/bootstrap.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.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
//##
453453

454454
//=== Shared nav styles
455-
@nav-link-padding: 10px 15px;
455+
@nav-link-padding: 10px 11px;
456456
@nav-link-hover-bg: @gray-lighter;
457457

458458
@nav-disabled-link-color: @gray-light;

ietf/templates/base.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
</head>
3939

4040
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
41+
{% with server_mode="production" %}
4142
<nav class="navbar {% if server_mode and server_mode == "production" %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
4243
<div class="container-fluid">
4344
<div class="navbar-header">
@@ -50,13 +51,11 @@
5051
<a class="navbar-brand" href="/">
5152
<img alt="IETF Logo" src="/images/ietflogo-small-transparent.png">
5253
{% if not user.is_authenticated %}
53-
<div style="display: inline; vertical-align: top; padding-left: 1em;">
5454
{% if server_mode and server_mode == "production" %}
5555
Datatracker
5656
{% else %}
5757
<b><i>Development mode</i></b>
5858
{% endif %}
59-
</div>
6059
{% endif %}
6160
</a>
6261
</div>
@@ -70,17 +69,17 @@
7069
{% include "base/menu.html" with flavor="top" %}
7170
</ul>
7271

73-
<form class="navbar-form navbar-right hidden-sm hidden-xs" action="/doc/search/" role="search">
72+
<form class="navbar-form navbar-right hidden-xs" action="/doc/search/" role="search">
7473
<div class="form-group">
75-
<input class="form-control" type="text" name="name" placeholder="Document search">
74+
<input class="form-control input-sm" type="text" name="name" placeholder="Document search">
7675
<input type="hidden" name="activedrafts" value="on">
7776
<input type="hidden" name="rfcs" value="on">
7877
</div>
7978
</form>
8079
</div>
8180
</div>
8281
</nav>
83-
82+
{% endwith %}
8483
<div class="container-fluid">
8584
{% if messages %}
8685
<div class="row">

static/css/ietf.css

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ body { padding-top: 70px; }
8484

8585
.navbar-brand > img {
8686
display: inline;
87-
margin-top: -7px;
87+
padding-right: 1em;
88+
margin-top: -5px;
89+
}
90+
91+
.navbar-brand {
92+
margin-top: -2px;
8893
}
8994

9095
/* Hack to make anchor-targets take up a bit more space vertically
@@ -98,10 +103,6 @@ body { padding-top: 70px; }
98103
margin-top: -65px;
99104
}
100105

101-
/* Style navbar buttons */
102-
/* .navbar-btn { color:#777; } */
103-
/* .navbar-btn:hover { color: #333; } */
104-
105106
/* Make the panel title font normally large */
106107
.panel-title { font-size: 14px }
107108

@@ -353,9 +354,9 @@ footer {
353354
}
354355

355356
/* This applies to the top navbar submenu popouts*/
356-
/*
357+
/*
357358
.nav.navbar-nav .dropdown-submenu ul {
358-
359+
359360
}
360361
*/
361362
/* This applies to the side menubar submenu popouts */

0 commit comments

Comments
 (0)