artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 13:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from hongwei1/master

Browse Source 
feature/Move the Logo to the top white space, keep it the same as API_Explore
This commit is contained in:
Simon Redfern 2021-10-27 12:51:09 +02:00 committed by GitHub
commit fd302d1aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apimanager/base/static/css/base.css
View File

@ -38,6 +38,7 @@ footer a:hover, .footer a:focus {
.navbar-default {
top: 89px;
background-color: #53c4ef;
border: none;
}
@ -69,6 +70,7 @@ footer a:hover, .footer a:focus {
.navbar-btn {
margin-left: 15px;
margin-top: -6px;
}
/*.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:active {*/
@ -120,7 +122,7 @@ footer a:hover, .footer a:focus {
.messages {
margin-top: 30px;
margin-top: 90px;
}
@ -164,9 +166,6 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
.authentication-method {
display: none;
}
#navbar-login-username{
color: #FFFFFF;
}
.navbar-default .navbar-nav > li > a:hover {
color: #fff;
@ -178,4 +177,35 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
}
.dropdown-menu{
padding: 0;
}
#header{
position: fixed;
top: 0px;
background: #FFFFFF;
width: inherit;
}
#body-container{
margin-top: 89px;
}
#logo-left{
height: 50px;
margin-top: 30px;
margin-bottom: 30px;
}
#left-logo img{
height:40px;
}
.navbar-btn .btn-default {
font-size: 16px;
text-align: center;
line-height: 24px;
border-radius: 0;
border: 0;
padding: 9px 20px 11px;
border: 1px solid #333333;
}

25
apimanager/base/templates/base.html
View File

@ -17,6 +17,21 @@
{% block extracss %}{% endblock extracss %}
</head>
<body>
<div class="container">
<div id="header" >
<div id="logo-left" class="logo-box">
<a href="{% url 'home' %}" aria-label="Home Page" id="left-logo"><img src="{{ logo_url }}" alt="brand"></a>
<ul class="nav navbar-nav navbar-right">
<li>
{% if user.is_authenticated %}
<p class="navbar-btn"><span id="navbar-login-username">{{API_USERNAME}}</span>&nbsp;&nbsp;<a
href="/logout" class="btn btn-default">Logout </a></p>
{% endif %}
</li>
</ul>
</div>
</div>
</div>
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
@ -26,7 +41,6 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'home' %}"><img src="{{ logo_url }}" alt="brand" /></a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
@ -88,13 +102,6 @@
</li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
{% if user.is_authenticated %}
<p class="navbar-btn"><span id ="navbar-login-username">{{ API_USERNAME }}</span>&nbsp&nbsp</nr><a href="{% url 'oauth-logout' %}" class="btn btn-default">Logout </a></p>
{% endif %}
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
@ -110,7 +117,7 @@
</div>
{% endif %}
<div class="container">
<div class="container" id="body-container">
{% block content %}{% endblock content %}
</div>