diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html index 8555cb76..118e83df 100644 --- a/qgis-app/plugins/templates/plugins/plugin_list.html +++ b/qgis-app/plugins/templates/plugins/plugin_list.html @@ -84,7 +84,7 @@

{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}

id="pmain{{object.pk}}" onclick="window.location.href='{% url "plugin_detail" object.package_name %}';" > - + {% if object.icon and object.icon.file and object.icon|is_image_valid %} {% with image_extension=object.icon.name|file_extension %} {% if image_extension == 'svg' %} diff --git a/qgis-app/static/images/large-logo.svg b/qgis-app/static/images/large-logo.svg index d40d4b05..1f2a91e4 100644 --- a/qgis-app/static/images/large-logo.svg +++ b/qgis-app/static/images/large-logo.svg @@ -1,24 +1,100 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/qgis-app/static/style/scss/_variables.scss b/qgis-app/static/style/scss/_variables.scss index 7be4909b..72ae7e35 100644 --- a/qgis-app/static/style/scss/_variables.scss +++ b/qgis-app/static/style/scss/_variables.scss @@ -49,3 +49,4 @@ $menuFontClass: is-size-6; // Radius for boxes $corner-radius: 0px; +$navbar-divider-height: 1px; \ No newline at end of file diff --git a/qgis-app/static/style/scss/bulma/components/navbar.sass b/qgis-app/static/style/scss/bulma/components/navbar.sass index f19f0ce6..f21ba45d 100644 --- a/qgis-app/static/style/scss/bulma/components/navbar.sass +++ b/qgis-app/static/style/scss/bulma/components/navbar.sass @@ -239,9 +239,9 @@ a.navbar-item, .navbar-divider background-color: $navbar-divider-background-color border: none - display: none + // display: none height: $navbar-divider-height - margin: 0.5rem 0 + margin: 0.5rem 1rem +until($navbar-breakpoint) .navbar > .container diff --git a/qgis-app/static/style/scss/bulma/layout/hero.sass b/qgis-app/static/style/scss/bulma/layout/hero.sass index 2067fe3c..2adcb183 100644 --- a/qgis-app/static/style/scss/bulma/layout/hero.sass +++ b/qgis-app/static/style/scss/bulma/layout/hero.sass @@ -15,8 +15,8 @@ $hero-colors: $colors !default display: flex flex-direction: column justify-content: space-between - padding-top: 100px - margin-top: -100px + padding-top: 40px + margin-top: -40px .navbar background: none .tabs @@ -172,8 +172,8 @@ $hero-colors: $colors !default padding: $hero-body-padding +mobile height: 100vh - // min-height: 840px - // display: flex + min-height: 840px + display: flex .container margin: auto diff --git a/qgis-app/static/style/scss/style.scss b/qgis-app/static/style/scss/style.scss index 01af1625..57b7ab53 100644 --- a/qgis-app/static/style/scss/style.scss +++ b/qgis-app/static/style/scss/style.scss @@ -66,14 +66,15 @@ p { } -@media screen and (max-width: 768px) { - .hero-body { - height: unset; - } -} +// @media screen and (max-width: 768px) { +// .hero-body { +// height: unset; +// } +// } .navbar { background-color: unset; + min-height: 3em; } .navbar-brand, .navbar-tabs { min-height:unset; @@ -164,15 +165,54 @@ p { .navbar-burger { color: $primary1-invert; + margin-left: unset; + width: 3em; + height: 3em ; } @media screen and (max-width: 1023px) { .navbar-menu { - background-color: #1D2027; + background-color: #002033; } - .navbar-menu.is-active { + .navbar-menu { + &.is-active { display: block; position: fixed; + height: 100dvh; + overflow: auto; + left: 0; + animation: slideInFromLeft 0.3s ease-out forwards; + } + &:not(.is-active) { + animation: slideOutToLeft 0.3s ease-out forwards; + } + } + @keyframes slideInFromLeft { + from { + transform: translateX(-100%); + opacity: 0; + } + to { + transform: translateX(0); + opacity: 1; + } + } + + @keyframes slideOutToLeft { + from { + transform: translateX(0); + opacity: 1; + } + to { + transform: translateX(-100%); + opacity: 0; + } + } + .context-container .navbar-start a.navbar-item.is-active:hover, + .context-container .navbar-start .navbar-link.is-active:hover, + .context-container .navbar-start .navbar-item:hover { + background-color: unset !important; + color: white !important; } } diff --git a/qgis-app/templates/base.html b/qgis-app/templates/base.html index 5dbad7ac..072236b0 100644 --- a/qgis-app/templates/base.html +++ b/qgis-app/templates/base.html @@ -2,20 +2,16 @@ {% load plugin_utils %} {% load matomo_tags %} {% load render_bundle from webpack_loader %} - {% render_bundle 'main' %} +{% render_bundle 'main' %} + - + {% block title %}QGIS {% block extratitle %}Plugins{% endblock %}{% endblock %} - - {% comment %} {% endcomment %} - - - {% comment %} {% endcomment %} @@ -40,75 +36,86 @@ {% block extrajs %}{% endblock %} - + + + + {% include 'layouts/header.html' %} -
-
- - {% include 'layouts/header.html' %} -
-
+
+
+
+
+
+
Free and Open Source
+

+ {{title}} +

+

QGIS plugins add additional functionality to the QGIS application.

+
+
+ + Explore + + +
-
-
-

- {{title}} -

-
- +
+
-
-
-
-
-
- {% block leftbar %} - {% block menu %} {% endblock %} - {% endblock %} +
+
+
+
+
+
+ {% block leftbar %} + {% block menu %} {% endblock %} + {% endblock %} +
+
+
+ +
+ {% if messages %} +
+ + {% for message in messages %} + {{ message|safe }}

+ {% endfor %}
-
-
- -
- {% if messages %} -
- - {% for message in messages %} - {{ message|safe }}

- {% endfor %} -
- {% endif %} -
- {% block content %} - {% endblock %} -
- + {% endif %} +
+ {% block content %} + {% endblock %}
+
-
-
-
- {% block rightbar %} +
+
+
+
+ {% block rightbar %} - {% endblock %} -
-
- - {% get_sustaining_members_section as sustaining_members_section %} - {{ sustaining_members_section|safe }} - {% include 'layouts/footer.html' %} -
+ {% endblock %} + + + + {% get_sustaining_members_section as sustaining_members_section %} + {{ sustaining_members_section|safe }} + {% include 'layouts/footer.html' %} {% include "plugins/plugin_tags_modal.html" %}