Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion content/about/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ On December 9, <b>2007</b> GRASS started to use SVN and Trac bug tracker hosted
</ul>
</div>
<div class="col-lg-4 col-sm-12">
<center><img src="/images/logos/30-years-grass-gis-logo-black-300px.png" width="83%" /></center>
<center><img src="/images/logos/historical_logos/30-years-grass-gis-logo-black-300px.png" width="83%" /></center>
</div>
</div>
</div>
Expand Down
File renamed without changes
17 changes: 0 additions & 17 deletions static/images/logos/grass-blue.svg

This file was deleted.

Binary file removed static/images/logos/gs-green-medium.png
Binary file not shown.
Binary file removed static/images/logos/gs-green-small.png
Binary file not shown.
Binary file removed static/images/logos/gs-horizontal-blue.png
Binary file not shown.
Binary file removed static/images/logos/gs-horizontal-white-2.12.25.png
Binary file not shown.
Binary file removed static/images/logos/gs-white-medium.png
Binary file not shown.
Binary file removed static/images/logos/gs-white-small.png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions themes/grass/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
--gs-grey-dark-color--lightest: rgba(78, 77, 76, 0.071);

/* Images */
--gs-grass-background-image: url("/images/logos/banner.jpg");
--gs-grass-background-image: url("/images/banners/banner.jpg");
}

body {
Expand Down Expand Up @@ -1594,7 +1594,7 @@ code {

.grassthm-sq{
border:1px solid #dee2e6;
/* background:url(/images/logos/banner.jpg); */
/* background:url(/images/banners/banner.jpg); */
background-color: var(--gs-primary-color);
background-size:cover;
height:199px;
Expand Down
4 changes: 2 additions & 2 deletions themes/grass/layouts/404.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ partial "head.html" . }}

<header class="hero-section overlay-blue bg-cover banner" data-background="{{.Site.BaseURL}}/images/logos/banner.jpg">
<header class="hero-section overlay-blue bg-cover banner" data-background="{{.Site.BaseURL}}/images/banners/banner.jpg">
<div class="fixed-top">
{{ partial "banner.html" . }}
<div class="bg-primary">
Expand All @@ -14,7 +14,7 @@
<div class="row">
<div class="col-lg-9 col-md-12 text-center mx-auto yard-sign">
<div class="grass-green text-bold">
<img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-blue.svg">
<img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg">
<h3>Sorry, nothing growing here.</h3>
<p class="text-bold">The page you are looking for is not available.<br>Please check the URL or go back to the</p>
<a class="btn btn-primary" href="{{.Site.BaseURL}}">home page</a>
Expand Down
4 changes: 2 additions & 2 deletions themes/grass/layouts/download/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h2 class="section-title">Download your free and open source copy</h2>
<div class="section bg-white mb-4">
<div class="row nm">
<div class="col-4 text-center">
<object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="grasslogo"></object>
<object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="grasslogo"></object>
</div>
<div class="col-8">
<h3 class="mt-20">GRASS source code</h3>
Expand Down Expand Up @@ -55,7 +55,7 @@ <h3 class="mt-2 mb-2">GRASS for {{ .Title }}</h3>
{{ end }}
<div class="section bg-white mb-4">
<div class="row nm">
<div class="col-4 text-center"><object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="grasslogo"></object></div>
<div class="col-4 text-center"><object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="grasslogo"></object></div>
<div class="col-8">
<h3 class="mt-2 mb-2">GRASS Addons</h3>
<p>Download user contributed GRASS extensions</p>
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="container">
<div class="row">
<div class="col-lg-8 text-center mx-auto">
<h1 class="mb-0"><img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-white.svg" width="26%"></h1>{{ with .Site.Params.banner.description }}
<h1 class="mb-0"><img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" width="26%"></h1>{{ with .Site.Params.banner.description }}
<p class="text-bold mb-4">{{ . }}</p>{{ end }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/brand.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a class="px-4 py-5 bg-gray text-center shadow d-block fdiv" href="{{.Site.BaseURL}}/about/brand">
<img alt="GRASS logo" src="{{.Site.BaseURL}}/images/logos/grass-green.svg" width="39%">
<img alt="GRASS logo" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" width="39%">
</a>
36 changes: 1 addition & 35 deletions themes/grass/layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- Logo -->
<div class="col-md-2 text-center text-md-left mb-4 mb-md-0">
<img src="{{.Site.BaseURL}}/images/logos/gs-white-small.png" alt="GRASS GIS logo" style="max-width: 100px;">
<img src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" alt="GRASS logo" style="max-width: 100px;">
</div>

<!-- Quick Links -->
Expand Down Expand Up @@ -86,40 +86,6 @@ <h6 class="text-uppercase text-light">Contribute</h6>
</div>
</footer>

<!--
<footer class="section bg-gray pb-0">
<div class="container">
<div class="row">
<div class="col-md-4 text-md-left text-center">
{{ with .Site.Params.copyright }} <p><small>&copy; {{ replace . "{year}" now.Year }} (<a href="/about/license/">license</a>&nbsp;|&nbsp;<a href="/about/privacy">privacy</a>)</small></p> {{ end }}
</div>
<div class="col-md-4 text-md-left text-center">
{{if .IsHome}}
<p><small><a href="about/mirrors">Mirror sites</a>
<a href="https://fosstodon.org/@grassgis" rel="me"></a> <!-- needed for verification
</small></p>
{{end}}

{{if not .IsHome}}
<p><small><a href="https://github.com/OSGeo/grass-website/tree/master/content/{{ .Section }}/{{ with .File }}{{ .BaseFileName }}{{ end }}.md" class="fab fa-github"> <span class="edt">Edit this page on GitHub</span></a></small></p>
{{end}}
</div>
<div class="col-md-4 text-md-right text-center">
<ul class="list-inline mb-3 d-flex justify-content-center justify-content-md-end align-items-center">
{{ range .Site.Params.socialIcon }}
<li class="list-inline-item d-flex align-items-center">
<a class="color-secondary d-inline-block p-2" aria-label="{{ .label }}" href="{{ .link }}">
<i class="{{ .icon }}"></i>
</a>
</li>
{{ end }}
</ul>
</div>
</div>

</div>
</footer>
-->
<script src="{{ .Site.BaseURL }}plugins/popper/popper.min.js"></script>
<script src="{{ .Site.BaseURL }}plugins/bootstrap/bootstrap.min.js"></script>
<script src="{{ .Site.BaseURL }}plugins/highlight/highlight.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/logo.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<img src="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="img-responsive" alt="GRASS">
<img src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="img-responsive" alt="GRASS">
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/navigation.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-lg navbar-light">
<a class="navbar-brand" href="{{.Site.BaseURL}}">
<img class="grass-icon" alt="GRASS Logo" src="{{.Site.BaseURL}}images/logos/grass-white-no-text.svg">
<img class="grass-icon" alt="GRASS Logo" src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-white-no-text.svg">
<span class="grass text-white">{{.Site.Params.logo}}</span>
</a>
<button
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/partials/zenodo-card.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a href="https://doi.org/10.5281/zenodo.5176030" target="_blank" class="px-4 py-5 bg-gray text-center shadow d-block fdiv">
<img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-green.svg" width="34%"><br>
<img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" width="34%"><br>
<img src="https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg" alt="DOI">
</a>
36 changes: 18 additions & 18 deletions themes/grass/layouts/shortcodes/brandLogo.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,64 @@ <h4>{{ $colorName }}</h4>
</div>
<div class="col-lg-3 col-sm-12 mb-3">
{{- if eq $colorName "White" -}}
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" download>
<img class="grass-green-bg" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" download>
<img class="grass-green-bg" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
</a>
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg" download>
<img class="grass-green-bg p-2" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg" alt="logo-{{ $colorName | lower }}">
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg" download>
<img class="grass-green-bg p-2" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg" alt="logo-{{ $colorName | lower }}">
</a>
{{- else}}
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" download>
<img class="bg-base-white" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" download>
<img class="bg-base-white" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo//grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
</a>

{{- end}}

</div>
<div class="col-lg-3 col-sm-12">
{{- if eq $colorName "White" -}}
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg"
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg"
download>
<img class="grass-bg-image" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg"
<img class="grass-bg-image" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg"
alt="logo-{{ $colorName | lower }}">
</a>
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
download>
<img class="grass-bg-image p-2" width="100%"
src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
alt="logo-{{ $colorName | lower }}">
</a>
{{- else}}
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
download>
<img class="bg-base-white p-2" width="100%"
src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
alt="logo-{{ $colorName | lower }}">
</a>
{{- end}}
</div>

<div class="col-lg-6 col-sm-12">
{{- if eq $colorName "White" -}}
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg" download>
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg" download>
<img class="grass-green-bg p-2" width="100%"
src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
alt="logo-{{ $colorName | lower }}">
</a>
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg" download>
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg" download>
<img class="grass-bg-image p-2" width="100%"
src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
alt="logo-{{ $colorName | lower }}">
</a>
{{- end}}
</div>

{{- if ne $colorName "White" -}}
<div class="col-lg-6 col-sm-12">
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
<a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
download>
<img class="bg-base-white p-2" width="100%"
src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
alt="logo-{{ $colorName | lower }}">
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/grass/layouts/shortcodes/brandWebBanner.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row mt-30 mb-2">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="text-center grass-green-bg mx-auto">
<h1 class="mb-0"><img class="mb-0" alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-white.svg" width="40%">
<h1 class="mb-0"><img class="mb-0" alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" width="40%">
{{ with .Site.Params.banner.description }}
<p class="text-bold mb-4 pb-4 white-color">{{ . }}</p>
{{ end }}
Expand Down