Skip to content
Snippets Groups Projects
Commit 3fcf3927 authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

fixed navbar

parent 92b3210b
No related branches found
No related tags found
1 merge request!23Resolve "Re-work login and registration views based on new landing page design"
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
.lang-circle-icon{ .lang-circle-icon{
height: 26px; height: 26px;
} }
.navbar-left{
padding-top: 6px;
display: flex;
align-items: center;
}
.navbar-right{ .navbar-right{
display:flex; display:flex;
align-items: center; align-items: center;
...@@ -43,6 +48,7 @@ ...@@ -43,6 +48,7 @@
} }
.navbar-left,.navbar-right { .navbar-left,.navbar-right {
float: none !important; float: none !important;
display:block;
} }
.navbar-toggle { .navbar-toggle {
display: block; display: block;
...@@ -198,15 +204,17 @@ ...@@ -198,15 +204,17 @@
} }
.navbar-default .navbar-nav>li>a{ .navbar-default .navbar-nav>li>a{
color: #6D788E; color: #6D788E;
padding:10px;
} }
.navbar-default .navbar-nav>.active>a{ .navbar-default .navbar-nav>.active>a{
border-radius: 5px; border-radius: 5px;
color: #142548; color: #142548;
/*font-weight: bold;*/ padding:10px;
background-color: #D1D1D1; background-color: #D1D1D1;
} }
.navbar-default .navbar-nav>.open>a{ .navbar-default .navbar-nav>.open>a{
border-radius: 5px; border-radius: 5px;
color: #142548; color: #142548;
padding:10px;
background-color: #D1D1D1; background-color: #D1D1D1;
} }
<nav class="navbar navbar-default" id="navbar" role="navigation" style="margin:0"> <nav class="navbar navbar-default" id="navbar" role="navigation" style="margin:0">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a routerLink="/"><img alt="Geant" src="assets/images/logo-small.png" style="margin: 5px; height:35px"></a> <a routerLink="/"><img alt="Geant" src="assets/images/logo-small.png" style="margin: 8px; padding:4px; height:35px"></a>
<button class="navbar-toggle" data-target="#navbarCollapse" data-toggle="collapse" type="button"> <button class="navbar-toggle" data-target="#navbarCollapse" data-toggle="collapse" type="button">
<span class="sr-only">Toggle Navigation</span> <span class="sr-only">Toggle Navigation</span>
<em class="fas fa-bars"></em> <em class="fas fa-bars"></em>
......
...@@ -75,3 +75,9 @@ html, body { ...@@ -75,3 +75,9 @@ html, body {
stroke-dashoffset: 0; stroke-dashoffset: 0;
} }
} }
.panel-group{
margin: 0;
}
.panel+.panel{
margin: 0;
}
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="panel panel-default" style="border:none"> <div class="panel panel-default" style="border:none">
<div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse" <div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'" [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;"> style="z-index: 800; position: fixed; right: 1px; max-height: 50vh; font-size: 14px;">
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-body" id="login-out" style="overflow-y: auto;"> <div class="panel-body" id="login-out" style="overflow-y: auto;">
<nmaas-login></nmaas-login> <nmaas-login></nmaas-login>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="panel panel-default" style="border:none" > <div class="panel panel-default" style="border:none" >
<div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse" <div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'" [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;"> style="z-index: 800; position: fixed; right: 1px; max-height: 50vh; font-size: 14px;">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body" id="login-out" style="overflow-y: auto;"> <div class="panel-body" id="login-out" style="overflow-y: auto;">
<nmaas-registration></nmaas-registration> <nmaas-registration></nmaas-registration>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<div class="panel panel-default" style="border:none"> <div class="panel panel-default" style="border:none">
<div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse" <div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'" [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;"> style="z-index: 800; position: fixed; right: 1px; max-height: 50vh; font-size: 14px;">
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-body" id="login-out" style="overflow-y: auto;"> <div class="panel-body" id="login-out" style="overflow-y: auto;">
<nmaas-login></nmaas-login> <nmaas-login></nmaas-login>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<div class="panel panel-default" style="border:none" > <div class="panel panel-default" style="border:none" >
<div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse" <div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'" [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;"> style="z-index: 800; position: fixed; right: 1px; max-height: 50vh; font-size: 14px;">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body" id="login-out" style="overflow-y: auto;"> <div class="panel-body" id="login-out" style="overflow-y: auto;">
<nmaas-registration></nmaas-registration> <nmaas-registration></nmaas-registration>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment