From 3fcf3927353be6ef4ee9f2149eeebd9cd588bbf2 Mon Sep 17 00:00:00 2001
From: jkazmierczak <jkazmierczak@man.poznan.pl>
Date: Mon, 19 Aug 2024 15:44:45 +0200
Subject: [PATCH] fixed navbar
---
src/app/shared/navbar/navbar.component.css | 10 +++++++++-
src/app/shared/navbar/navbar.component.html | 2 +-
src/app/welcome/welcome.component.css | 6 ++++++
src/app/welcome/welcome.component.html | 8 ++++----
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/app/shared/navbar/navbar.component.css b/src/app/shared/navbar/navbar.component.css
index c94c59db..f074f95e 100644
--- a/src/app/shared/navbar/navbar.component.css
+++ b/src/app/shared/navbar/navbar.component.css
@@ -26,6 +26,11 @@
.lang-circle-icon{
height: 26px;
}
+.navbar-left{
+ padding-top: 6px;
+ display: flex;
+ align-items: center;
+}
.navbar-right{
display:flex;
align-items: center;
@@ -43,6 +48,7 @@
}
.navbar-left,.navbar-right {
float: none !important;
+ display:block;
}
.navbar-toggle {
display: block;
@@ -198,15 +204,17 @@
}
.navbar-default .navbar-nav>li>a{
color: #6D788E;
+ padding:10px;
}
.navbar-default .navbar-nav>.active>a{
border-radius: 5px;
color: #142548;
- /*font-weight: bold;*/
+ padding:10px;
background-color: #D1D1D1;
}
.navbar-default .navbar-nav>.open>a{
border-radius: 5px;
color: #142548;
+ padding:10px;
background-color: #D1D1D1;
}
diff --git a/src/app/shared/navbar/navbar.component.html b/src/app/shared/navbar/navbar.component.html
index d17d0f80..b75127c4 100644
--- a/src/app/shared/navbar/navbar.component.html
+++ b/src/app/shared/navbar/navbar.component.html
@@ -1,7 +1,7 @@
<nav class="navbar navbar-default" id="navbar" role="navigation" style="margin:0">
<div class="container-fluid">
<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">
<span class="sr-only">Toggle Navigation</span>
<em class="fas fa-bars"></em>
diff --git a/src/app/welcome/welcome.component.css b/src/app/welcome/welcome.component.css
index 76984195..ec3a5b4f 100644
--- a/src/app/welcome/welcome.component.css
+++ b/src/app/welcome/welcome.component.css
@@ -75,3 +75,9 @@ html, body {
stroke-dashoffset: 0;
}
}
+.panel-group{
+ margin: 0;
+}
+.panel+.panel{
+ margin: 0;
+}
diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
index 597075d4..d718b56d 100644
--- a/src/app/welcome/welcome.component.html
+++ b/src/app/welcome/welcome.component.html
@@ -48,7 +48,7 @@
<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"
[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-body" id="login-out" style="overflow-y: auto;">
<nmaas-login></nmaas-login>
@@ -59,7 +59,7 @@
<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"
[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-body" id="login-out" style="overflow-y: auto;">
<nmaas-registration></nmaas-registration>
@@ -149,7 +149,7 @@
<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"
[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-body" id="login-out" style="overflow-y: auto;">
<nmaas-login></nmaas-login>
@@ -160,7 +160,7 @@
<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"
[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-body" id="login-out" style="overflow-y: auto;">
<nmaas-registration></nmaas-registration>
--
GitLab