Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

visual improvments #186

Merged
merged 1 commit into from
Feb 28, 2024
Merged
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/funding/membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HasBanner: true
sidebar: true
HeroImage: "img/involve.jpg"
ButtonText: "Become a Sustaining Member"
ButtonLink: "/funding/membership#how-become-a-sustaining-member"
ButtonLink: "funding/membership#how-become-a-sustaining-member"
---

{{< content-start >}}
Expand Down
1 change: 1 addition & 0 deletions content/resources/roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ sidebar: true
{{< content-start >}}

# Road Map
{{< roadmap >}}

Releases and development of QGIS follow a timebased schedule (roadmap).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $steps-completed-color: $primary !default
$steps-active-color: $primary !default
$steps-horizontal-min-width: 10em !default
$steps-vertical-min-height: 4em !default
$steps-marker-size: 2 !default
$steps-marker-size: 1.5 !default
$steps-divider-size: .4em !default
$steps-gap-size: .3rem !default
$steps-hollow-border-size: .3em !default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ a

code
background-color: $code-background
color: $code
color: #000
font-size: $code-size
font-weight: $code-weight
padding: $code-padding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
display: box
line-clamp: 1
box-orient: vertical
font-size: 14px
&:hover
color: #3A9800
&:before
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,150 @@
.roadmap
.rm-past
color: gray
color: #4D6370
&:hover
color: black
.rm-future
color: gray
color: #4D6370
.rm-current
font-weight: 600
color: green
color: #3a9800
.rm-next
font-weight: 600
color: blue
color: #ee7913
tr:hover
background-color: lightgreen
color: white
background-color: #ECF1F4
.rm-past, .rm-future
color: black

div
&.roadmap
background: #f4f7f9
padding: 2rem
border-radius: 10px

.content .steps
margin-left: 0rem
.steps-content
margin-top: 0.5rem
max-width: 140px
+mobile
max-width: 100%

.tag
margin-top: 0.25rem
margin-bottom: 0.25rem
background-color: #ffffff
border: 1px solid #9fbbcb
padding-right: 0.5rem
padding-left: 0.5rem
li + li
margin-top: 0px
.heading
font-weight: 400
.level
justify-content: flex-start
margin-top: 1rem
.level-item
margin-right: 5px
+mobile
display: flex
align-items: flex-start

.steps-segment
list-style: none

.content
.steps:not(.is-hollow) .steps-segment.is-active .steps-marker:not(.is-hollow), .steps-segment:after, .steps:not(.is-hollow) .steps-marker:not(.is-hollow)
background-color: #589632
.steps:not(.is-hollow) .steps-segment.is-active ~ .steps-segment .steps-marker:not(.is-hollow), .steps-segment.is-active ~ .steps-segment:after, .steps-segment.is-active:after
background-color: #dbe5eb
.steps:not(.is-vertical) .steps-content
margin-left: 0.75rem


.help-tip
position: absolute
text-align: center
background-color: #dbe5eb
border-radius: 50%
width: 24px
height: 24px
font-size: 14px
line-height: 26px
cursor: default
margin: 3px 0px 0px 5px
+mobile
display: block
width: 100%
height: auto
position: relative
background: none

&:before
content: '?'
font-weight: 600
color: #4d6370
+mobile
display: none !important

&:hover span
display: block
transform-origin: 100% 0%
-webkit-animation: fadeIn 0.3s ease-in-out
animation: fadeIn 0.3s ease-in-out

span
display: none
text-align: left
background-color: #1E2021
padding: 16px
width: 200px
position: absolute
border-radius: 3px
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2)
left: -4px
color: #FFF
font-size: 13px
line-height: 1.4
z-index: 11111
+mobile
display: block
position: relative
width: 100%
background: none
color: #1E2021
padding: 8px 0 0 0
box-shadow: none
font-size: 14px
font-weight: 300

&:before
position: absolute
content: ''
width: 0
height: 0
border: 6px solid transparent
border-bottom-color: #1E2021
left: 10px
top: -12px
+mobile
display: none !important

&:after
width: 100%
height: 40px
content: ''
position: absolute
top: -40px
left: 0
+mobile
display: none !important









3 changes: 3 additions & 0 deletions themes/hugo-bulma-blocks-theme/assets/sass/style.sass
Original file line number Diff line number Diff line change
Expand Up @@ -464,5 +464,8 @@ th
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr))
grid-auto-rows: 320px

code
font-size: 14px



Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{ $data = .Content | transform.Unmarshal }}
{{ with $data.channel.item }}
{{ range . | first 1 }}
<a href="/{{ .link | safeURL }}" target="_blank" rel="noopener" class="external-link">
<a href="{{ .link | safeURL }}" target="_blank" rel="noopener" class="external-link">
Copy link
Contributor

Choose a reason for hiding this comment

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

The update to remove the leading slash in the href attribute may correct path resolution issues, but it introduces potential security vulnerabilities related to XSS attacks. Consider using safer methods for URL generation, such as url_for() or concatenating the URL with a literal forward slash, to mitigate these risks.

{{ .title }}
</a>
{{ end }}
Expand Down
10 changes: 6 additions & 4 deletions themes/hugo-bulma-blocks-theme/layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@
{{ $qrcreatejs := resources.Get "js/qrcreate.js" }}
{{ $fusejs := resources.Get "js/fuse.js" }}
{{ $markjs := resources.Get "js/mark.min.js" }}
{{ $cookiejs := resources.Get "js/cookie.js" }}
{{ $js := slice $animatejs $expandjs $navbarjs $qrcreatejs $fusejs $markjs $cookiejs | resources.Concat "js/all.js" | resources.Fingerprint }}
{{/* See https://www.youtube.com/watch?v=T33NN_pPeNI */}}
<script defer src="{{ $js.RelPermalink }}"></script>

{{ $js := slice $animatejs $expandjs $navbarjs $qrcreatejs $fusejs $markjs | resources.Concat "js/all.js" | resources.Fingerprint }}
{{ if (eq .Site.Params.cookiesstate true) }}
{{ $cookiejs := resources.Get "js/cookie.js" }}
{{ $js = slice $animatejs $expandjs $navbarjs $qrcreatejs $fusejs $markjs $cookiejs | resources.Concat "js/all.js" | resources.Fingerprint }}
{{ end }}
<script defer src="{{ $js.RelPermalink }}"></script>
Comment on lines +156 to +161
Copy link
Contributor

Choose a reason for hiding this comment

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

The conditional inclusion of cookie.js based on cookiesstate is a thoughtful approach to flexible cookie management. However, consider addressing potential security vulnerabilities related to XSS attacks by employing safer methods for handling template variables in JavaScript.

{{/* Search needs to be rendered as a template to ensure urls are correct */}}
{{ $searchjs := resources.Get "js/search.js" | resources.ExecuteAsTemplate "search.js" . | resources.Fingerprint }}
<script defer src="{{ $searchjs.RelPermalink }}"></script>
Expand Down
Loading
Loading