From fc04218b2eff679efe5e79d0b6f33bc7b7728aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Sp=C3=A4th?= <julian.spaeth@wzw.tum.de>
Date: Sat, 11 Apr 2020 11:12:18 +0200
Subject: [PATCH] Fix mac issue of the logo height
---
src/app/app.component.html | 2 +-
.../about-page/about-page.component.scss | 4 +--
.../pages/home-page/home-page.component.html | 3 ++-
.../pages/home-page/home-page.component.scss | 6 +++--
src/styles.scss | 26 ++++++++++++++-----
5 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index dd714e06..8219add6 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,7 +1,7 @@
<div class="container is-fluid">
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
- <img routerLink="/" src="assets/covex_logo.png" class="menu-icon is-hoverable navbar-item" alt="logo" width="200"/>
+ <img routerLink="/" src="assets/covex_logo.png" class="menu-icon is-hoverable navbar-item logo" alt="logo"/>
<a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
diff --git a/src/app/pages/about-page/about-page.component.scss b/src/app/pages/about-page/about-page.component.scss
index 7525aa42..7dc7ccfe 100644
--- a/src/app/pages/about-page/about-page.component.scss
+++ b/src/app/pages/about-page/about-page.component.scss
@@ -3,7 +3,7 @@ i {
}
div.scroll{
-
- height: calc(100vh - 102px);
overflow: auto;
+ height: calc(100vh - 70px);
}
+
diff --git a/src/app/pages/home-page/home-page.component.html b/src/app/pages/home-page/home-page.component.html
index 0c633520..caeb9d64 100644
--- a/src/app/pages/home-page/home-page.component.html
+++ b/src/app/pages/home-page/home-page.component.html
@@ -1,8 +1,9 @@
+<!--htmlhint inline-style-disabled:false -->
<div class="content landing scroll">
<div class="container has-text-centered">
<div class="column is-6 width100">
- <img src="assets/covex_logo.png">
+ <img src="assets/covex_logo.png" style="height: 200px; width: 600px">
<h1 class="subtitle is-2">
<i>Explore the </i> <b> virus-host interactome</b>
diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss
index e55c62e9..de8b3bdf 100644
--- a/src/app/pages/home-page/home-page.component.scss
+++ b/src/app/pages/home-page/home-page.component.scss
@@ -1,13 +1,15 @@
img {
width: 600px;
+ height: 200px;
padding: 30px;
background-color: rgba(255, 255, 255, 0.7);
border-radius: 25px;
}
-div.scroll {
- height: calc(100vh - 82.36px);
+
+div.scroll{
overflow: auto;
+ height: calc(100vh - 60px);
}
h1.subtitle.is-2 {
diff --git a/src/styles.scss b/src/styles.scss
index e539e5fc..742c05d9 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -26,12 +26,26 @@ body {
height: 100%;
}
+nav.navbar {
+ height: 60px;
+}
+
+img.menu-icon.is-hoverable.navbar-item.logo {
+ height: 45px;
+ width: 125px;
+ padding-top: 5px;
+ padding-bottom: 10px;
+ padding-left: 0px;
+ padding-right: 0px;
+}
+
.landing {
background-color: $primary;
background-image: url("assets/virus_background.jpg");
background-size: cover;
background-repeat: no-repeat;
- height: calc(100vh - 82.36px);
+ height: calc(100vh - 60px);
+ width: 100vw;
}
div.navbar-menu {
@@ -112,11 +126,11 @@ div.covex.network {
div.card.network {
width: 100%;
- height: calc(100vh - 85px);
+ height: calc(100vh - 75px);
}
div.network {
- height: calc(100vh - 210px);
+ height: calc(100vh - 200px);
}
div.parent {
@@ -141,9 +155,9 @@ div.center {
div.covex.explorer {
- height: calc(100vh - 90px);
- margin-left: 20px;
- margin-right: 20px;
+ height: calc(100vh - 70px);
+ margin-left: 10px;
+ margin-right: 10px;
}
.analysis-view {
--
GitLab