Albirew/nyaa-pantsu
Archivé
1
0
Bifurcation 0

Merge pull request #668 from MMP0/patch-26

Fix navbar bugs
Cette révision appartient à :
akuma06 2017-05-21 14:29:30 +02:00 révisé par GitHub
révision 42e5ecaa24
4 fichiers modifiés avec 21 ajouts et 28 suppressions

Voir le fichier

@ -49,9 +49,7 @@
}
#mainmenu {
position: fixed;
width: 100%;
z-index: 4;
border: 0px solid white;
}
@ -269,14 +267,6 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
display: none;
}
#mainmenu .navbar-form select.form-control {
width: 12rem;
}
#mainmenu .navbar-form select.form-control#max {
width: 6rem;
}
.special-img {
position: relative;
top: -7px;
@ -579,6 +569,17 @@ select#bottom_language_selector {
margin-left: 0;
}
}
@media (min-width: 768px) {
#mainmenu .navbar-form select.form-control {
width: 12rem;
}
#mainmenu .navbar-form select.form-control#max {
width: 6rem;
}
}
@media (max-width: 995px) {
@ -626,10 +627,3 @@ select#bottom_language_selector {
display: block !important;
}
}
@media (max-width: 1500px) {
#mascot {
display: none;
}
}

Voir le fichier

@ -15,9 +15,7 @@
</ul>
{{ else }}
<a href="#" class="dropdown-toggle profile-image" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="hidden-md hidden-sm">{{ call $.T "member" }}</span>
<span class="glyphicon glyphicon-user visible-md-inline"></span>
<span class="caret"></span>
<span class="glyphicon glyphicon-user hidden-md hidden-lg"></span> {{ call $.T "member" }} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> {{ call $.T "sign_in"}}</a></li>

Voir le fichier

@ -11,7 +11,7 @@ Your browser does not support the audio element.
Your browser does not support the audio element.
</audio>
<span id="mascot"></span>
<span id="mascot" class="visible-lg"></span>
<div class="blockBody">
<nav>

Voir le fichier

@ -35,7 +35,7 @@
{{block "night_theme_init" .}}{{end}}
</head>
<body>
<nav class="navbar navbar-default" id="mainmenu">
<nav class="navbar navbar-default navbar-fixed-top" id="mainmenu">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
@ -49,13 +49,13 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{{.URL.Parse "/upload"}}"><div class="hidden-md hidden-sm">{{call $.T "upload"}}</div><span class="glyphicon glyphicon-cloud-upload visible-md"></span></a></li>
<li><a href="{{.URL.Parse "/faq"}}"><div class="hidden-md hidden-sm">{{call $.T "faq"}}</div><span class="glyphicon glyphicon-question-sign visible-md"></span></a></li>
<li><a href="{{ genRouteWithQuery "feed" .URL }}"><div class="hidden-md hidden-sm">RSS</div><span class="glyphicon glyphicon-flash visible-md"></span></a></li>
<li><a href="{{.URL.Parse "/upload"}}"><span class="glyphicon glyphicon-cloud-upload hidden-md hidden-lg"></span> {{call $.T "upload"}}</a></li>
<li><a href="{{.URL.Parse "/faq"}}"><span class="glyphicon glyphicon-question-sign hidden-md hidden-lg"></span> {{call $.T "faq"}}</a></li>
<li><a href="{{ genRouteWithQuery "feed" .URL }}"><span class="glyphicon glyphicon-flash hidden-md hidden-lg"></span> RSS</a></li>
{{ if Sukebei }}
<li><a href="https://nyaa.pantsu.cat"><div class="hidden-md hidden-sm">{{call $.T "fun"}}</div><span class="glyphicon glyphicon-eye-open visible-md"></span></a></li>
<li><a href="https://nyaa.pantsu.cat"><span class="glyphicon glyphicon-eye-open hidden-md hidden-lg"></span> {{call $.T "fun"}}</a></li>
{{ else }}
<li><a href="https://sukebei.pantsu.cat"><div class="hidden-md hidden-sm">{{call $.T "fap"}}</div><span class="glyphicon glyphicon-eye-close visible-md"></span></a></li>
<li><a href="https://sukebei.pantsu.cat"><span class="glyphicon glyphicon-eye-close hidden-md hidden-lg"></span> {{call $.T "fap"}}</a></li>
{{ end }}
</ul>
{{block "badge_user" .}}{{end}}
@ -67,7 +67,8 @@
{{block "search_button" .}}{{end}}
</div>
</form>
<!-- bottom padding -->
<div style="padding-top: 2rem"></div>
</div>
</div>
</nav>