Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions apps/airQuality/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/cb-metar/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/ceil-vis/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/ceil-vis15/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/ensemble/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/landuse/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/precipAccum/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/precipGauge/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/precipitation1hr/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/ptype/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/radar/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/scorecard/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/surface/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/surfrad/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
12 changes: 12 additions & 0 deletions apps/upperair/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,19 @@ body {
background-color: #000066;
}

.mats-logo-size {
width: 110px;
}

.metexpress-logo-size {
width: 160px;
}

.noaa-logo-size {
width: 170px;
}

.dtc-logo-size {
width: 60px;
}

Expand Down
Binary file added home/static/img/dtc_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added home/static/img/mats_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added home/static/img/metexpress_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added home/static/img/noaa_gsl_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 30 additions & 7 deletions home/templates/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,24 @@
aria-label="MATS navigation bar"
>
<div class="container-fluid">
<a class="navbar-brand" href="#">
<div class="row">
<div class="col-3">
<a class="navbar-brand w-100 h-100 m-0" href="#">
<div class="row align-items-center">
<div class="col-lg-3 col-6 text-lg-start text-end">
{{ if .Config.IsMETexpress }}
<img
class="text-center h-100"
src="img/noaa-logo-rgb-2022.svg"
alt="NOAA Logo"
style="height: 80px;"
src="img/metexpress_transparent.png"
alt="METexpress Logo"
/>
{{ else }}
<img
style="height: 80px;"
src="img/mats_transparent.png"
alt="MATS Logo"
Comment on lines 75 to 84
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to use bootstrap's styling classes to specify the image size? The original logo was utilizing class=text-center h-100 to get proper image sizing.

I was trying to avoid having to specify inline CSS style directly on elements in the home app and just use Bootstrap utilities instead. Inline CSS is considered a bit of an antipattern - it's then hard to update styles globally. I was also a bit worried that if we specify CSS style= directly on elements, that we'll end up fighting bootstrap, or that we'll lose bootstrap's responsiveness.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise, the home app does have an external stylesheet we could use - IIRC, then we'd just add another custom class.

https://github.com/NOAA-GSL/MATS/blob/main/home/static/css/home.css

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree about using bootstrap where we can! However the bootstrap h and w controls are pretty limited. For example, h-100 will give you 100% of the image's height, which for our four images are too large. I didn't see that the home app had a style sheet, I will gladly mode it there!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good! And agreed about bootstrap's size controls being limited. It seems like it's 25%, 50%, 75%, and 100% of the parent's height, which may or may not be appropriate. If we did want that whole parent <div> to be 80px high, we could set the style on that element.

/>
{{ end }}
</div>
<div class="col-9">
<div class="col-lg-6 col-0 d-none d-lg-block text-center">
{{ if .Config.IsMETexpress }}
<span class="fs-6">National Weather Service</span>
{{ else }}
Expand All @@ -94,6 +102,21 @@
{{ else }}
{{ end }}
</div>
<div class="col-lg-3 col-6 text-lg-end text-start">
{{ if .Config.IsMETexpress }}
<img
style="height: 80px;"
src="img/dtc_transparent.png"
alt="DTC Logo"
/>
{{ else }}
<img
style="height: 80px;"
src="img/noaa_gsl_transparent.png"
alt="NOAA Logo"
/>
{{ end }}
</div>
</div>
</a>
</div>
Expand Down
Loading