Skip to content

Commit

Permalink
Merge pull request #7 from PENQEinc/fix/header
Browse files Browse the repository at this point in the history
Fix/header
  • Loading branch information
gstein314 authored Nov 14, 2023
2 parents bade3bb + c66902b commit aa6cc70
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
13 changes: 7 additions & 6 deletions static/sass/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ h5 {
}

.navbar {
background-color: #147786;
padding-top: 15px;
background-color: var(--color-primary);
}
.navbar .container a {
text-decoration: none;
}
.navbar .container a .imgtitle {
width: 120px;
width: 220px;
display: block;
}
.navbar .container a .imgscroll {
Expand Down Expand Up @@ -87,7 +88,7 @@ h5 {
color: #7c7c7c;
}
.navbar.scroll {
background-color: #147786;
background-color: var(--color-primary);
top: 24px;
}
.navbar.scroll .collapse ul li .btn-TOS {
Expand Down Expand Up @@ -160,7 +161,7 @@ h5 {
margin-right: -250px;
padding-left: 250px;
padding-right: 250px;
background: #13295a;
background: var(--color-primary);
}
#kv-wrap header.jumbotron-disease {
border-radius: 0;
Expand Down Expand Up @@ -579,7 +580,7 @@ a:visited, a:hover, a:active {
margin-right: -250px;
padding-left: 250px;
padding-right: 250px;
background: #13295a;
background: var(--color-primary);
}
.about-page .about-title h3 {
color: #fff;
Expand Down Expand Up @@ -763,7 +764,7 @@ a:visited, a:hover, a:active {
}
.link-wrapper .data-link {
display: inline-flex;
background-color: #147786;
background-color: var(--color-primary);
border-radius: 3px;
text-align: left;
padding: 5px;
Expand Down
13 changes: 7 additions & 6 deletions static/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ h5 {
}

.navbar {
background-color: #147786;
padding-top: 15px;
background-color: var(--color-primary);

.container {
a {
text-decoration: none;

.imgtitle {
width: 120px;
width: 220px;
display: block;
}

Expand Down Expand Up @@ -97,7 +98,7 @@ h5 {
}

&.scroll {
background-color: #147786;
background-color: var(--color-primary);
top: 24px;

.collapse ul li {
Expand Down Expand Up @@ -181,7 +182,7 @@ h5 {
margin-right: -250px;
padding-left: 250px;
padding-right: 250px;
background: #13295a;
background: var(--color-primary);
}

&.jumbotron-disease {
Expand Down Expand Up @@ -690,7 +691,7 @@ a {
margin-right: -250px;
padding-left: 250px;
padding-right: 250px;
background: #13295a;
background: var(--color-primary);

h3 {
color: #fff;
Expand Down Expand Up @@ -911,7 +912,7 @@ a {

.data-link {
display: inline-flex;
background-color: #147786;
background-color: var(--color-primary);
border-radius: 3px;
text-align: left;
padding: 5px;
Expand Down
2 changes: 1 addition & 1 deletion templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<header class="masthead jumbotron">
<div class="container">
<div class="intro-text">
<h1 class="display-4"><img class="imgtitle" src="/static/img/NanbyoData_color_w.svg"></h1>
<h1 class="display-4"></h1>
<p>ex)</p>
<div class="keyword"><a href="/disease/NANDO:2200053">ユーイング肉腫</a></div>
<div class="keyword"><a href="/disease/NANDO:1200473">非典型溶血性尿毒症症候群</a></div>
Expand Down

0 comments on commit aa6cc70

Please sign in to comment.