diff --git a/.gitignore b/.gitignore index ee19e7a0aa..8c79714d9c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /saml/saml.key /saml/saml.crt /saml/local_metadata.xml +.idea +venv diff --git a/weblate_web/static/style-rtl.css b/weblate_web/static/style-rtl.css index 2e1ba7c897..07ac9b60af 100644 --- a/weblate_web/static/style-rtl.css +++ b/weblate_web/static/style-rtl.css @@ -1168,11 +1168,21 @@ section.bottom .box.join { background-image: url("img/box-join.jpg"); } +section.bottom .box.join a { + position: absolute; + bottom: 40px; +} + section.bottom .box.donate { background-color: #f6664c; background-image: url("img/box-donate.jpg"); } +section.bottom .box.donate a { + position: absolute; + bottom: 40px; +} + section.bottom .box .title { font-size: 40px; letter-spacing: -1px; @@ -1189,7 +1199,7 @@ section.bottom .box p { font-size: 20px; letter-spacing: 0.5px; line-height: 25px; - margin-bottom: 45px; + margin-bottom: 70px; } body.light .main-menu ul li a { @@ -2253,10 +2263,6 @@ input[type="radio"]:checked + .biglabel { line-height: 26px; } -.installations .box:nth-child(2) { - min-height: 500px; -} - .installations .box:nth-child(2n + 1) { margin-right: 0; } @@ -2276,9 +2282,9 @@ input[type="radio"]:checked + .biglabel { .installations .box ul { margin: 0 25px 20px 0; max-width: 380px; - padding: 0; list-style: none; clear: right; + padding-bottom: 32px; } .installations .box li::before, @@ -2668,6 +2674,7 @@ h2.section-title.hp-style { margin: 0 25px 35px 0; padding: 0; list-style: none; + padding-bottom: 40px; } .contribution-list .box ul li, @@ -2758,6 +2765,13 @@ h2.section-title.hp-style { .aboutus-list .box.blue { background-color: #00d2e6; border-radius: 20px 20px 20px 0; + display: inline-block !important; + min-height: unset; +} + +.aboutus-list .box.green { + display: inline-block !important; + min-height: unset; } .aboutus-list .box h2 { @@ -3075,6 +3089,7 @@ input.button.make-payment { .form-line:last-child { border-bottom: none; + border-top: 1px solid #e9eaec; } .form-line > div { @@ -4032,7 +4047,7 @@ input.fullwidth { } } -/* Your Weblate Team - About Us */ +/* About Us Weblate Team */ .content-p { width: 69%; @@ -4062,7 +4077,7 @@ input.fullwidth { .weblate-team { display: table; - width: 82%; + width: 78%; margin: 0 auto; } @@ -4100,3 +4115,84 @@ input.fullwidth { text-align: center; } } + +/* Flex property for boxes */ + +.flex { + display: flex; +} + +/* Box display flow root property */ + +.box { + display: flow-root !important; + position: relative; +} + +/* Box bottom left and right button custom position */ + +.bottom-left { + position: absolute; + bottom: 40px; +} + +.bottom-right { + position: absolute; + bottom: 40px; + left: 40px; +} + +/* Media Queries for responsiveness */ + +@media screen and (max-width: 891px) { + .flex { + display: unset; + } +} + +@media screen and (max-width: 550px) { + .bottom-right { + position: unset; + bottom: unset; + left: unset; + } + + .installations .box ul, + .mailing .box ul { + padding-bottom: unset; + } + + .bottom-left { + position: unset; + bottom: unset; + } +} + +@media screen and (max-width: 650px) { + section.bottom .box p { + margin-bottom: 100px; + } + + section.bottom .box.donate a { + bottom: 30px; + } + + section.bottom .box.join a { + bottom: 30px; + } +} + +@media screen and (max-width: 1030px) and (min-width: 892px) { + .installations .box ul, + .mailing .box ul { + padding-bottom: 50px; + } + + .bottom-left { + bottom: 60px; + } + + .bottom-right { + bottom: 12px; + } +} diff --git a/weblate_web/static/style.css b/weblate_web/static/style.css index f0667773c8..f922976cf9 100644 --- a/weblate_web/static/style.css +++ b/weblate_web/static/style.css @@ -1168,11 +1168,21 @@ section.bottom .box.join { background-image: url("img/box-join.jpg"); } +section.bottom .box.join a { + position: absolute; + bottom: 40px; +} + section.bottom .box.donate { background-color: #f6664c; background-image: url("img/box-donate.jpg"); } +section.bottom .box.donate a { + position: absolute; + bottom: 40px; +} + section.bottom .box .title { font-size: 40px; letter-spacing: -1px; @@ -1189,7 +1199,7 @@ section.bottom .box p { font-size: 20px; letter-spacing: 0.5px; line-height: 25px; - margin-bottom: 45px; + margin-bottom: 70px; } body.light .main-menu ul li a { @@ -2253,10 +2263,6 @@ input[type="radio"]:checked + .biglabel { line-height: 26px; } -.installations .box:nth-child(2) { - min-height: 500px; -} - .installations .box:nth-child(2n + 1) { margin-left: 0; } @@ -2276,9 +2282,9 @@ input[type="radio"]:checked + .biglabel { .installations .box ul { margin: 0 0 20px 25px; max-width: 380px; - padding: 0; list-style: none; clear: left; + padding-bottom: 32px; } .installations .box li::before, @@ -2668,6 +2674,7 @@ h2.section-title.hp-style { margin: 0 0 35px 25px; padding: 0; list-style: none; + padding-bottom: 40px; } .contribution-list .box ul li, @@ -2758,6 +2765,13 @@ h2.section-title.hp-style { .aboutus-list .box.blue { background-color: #00d2e6; border-radius: 20px 20px 0 20px; + display: inline-block !important; + min-height: unset; +} + +.aboutus-list .box.green { + display: inline-block !important; + min-height: unset; } .aboutus-list .box h2 { @@ -3075,6 +3089,7 @@ input.button.make-payment { .form-line:last-child { border-bottom: none; + border-top: 1px solid #e9eaec; } .form-line > div { @@ -4024,7 +4039,7 @@ input.fullwidth { } } -/*Your Weblate Team - About us */ +/* About Us Weblate Team CSS */ .content-p { width: 69%; @@ -4054,7 +4069,7 @@ input.fullwidth { .weblate-team { display: table; - width: 82%; + width: 78%; margin: 0 auto; } @@ -4092,3 +4107,84 @@ input.fullwidth { text-align: center; } } + +/* Flex property for boxes */ + +.flex { + display: flex; +} + +/* Box display flow root property */ + +.box { + display: flow-root !important; + position: relative; +} + +/* Box bottom left and right button custom position */ + +.bottom-left { + position: absolute; + bottom: 40px; +} + +.bottom-right { + position: absolute; + bottom: 40px; + right: 40px; +} + +/* Media Queries for responsiveness */ + +@media screen and (max-width: 891px) { + .flex { + display: unset; + } +} + +@media screen and (max-width: 550px) { + .bottom-right { + position: unset; + bottom: unset; + right: unset; + } + + .installations .box ul, + .mailing .box ul { + padding-bottom: unset; + } + + .bottom-left { + position: unset; + bottom: unset; + } +} + +@media screen and (max-width: 650px) { + section.bottom .box p { + margin-bottom: 100px; + } + + section.bottom .box.donate a { + bottom: 30px; + } + + section.bottom .box.join a { + bottom: 30px; + } +} + +@media screen and (max-width: 1030px) and (min-width: 892px) { + .installations .box ul, + .mailing .box ul { + padding-bottom: 50px; + } + + .bottom-left { + bottom: 60px; + } + + .bottom-right { + bottom: 12px; + } +} diff --git a/weblate_web/templates/about.html b/weblate_web/templates/about.html index 4f0b15cdcb..af3197650b 100644 --- a/weblate_web/templates/about.html +++ b/weblate_web/templates/about.html @@ -14,7 +14,7 @@

{% block title %}{% trans "The Weblate Way" %}{%
-
+
{% trans "February 2012" %}—Michal Čihař

{% trans "Looking for a Pootle alternative" %}

@@ -38,7 +38,7 @@

{% trans "Why Weblate?" %} ◦ {% trans "Consistency checks" %}

-
+
{% trans "Today" %}—Michal Čihař

{% trans "Weblate grows and the future is open to new opportunities." %}

diff --git a/weblate_web/templates/contribute.html b/weblate_web/templates/contribute.html index ac4d233659..c5e3d1e8e8 100644 --- a/weblate_web/templates/contribute.html +++ b/weblate_web/templates/contribute.html @@ -20,6 +20,7 @@

{% block title %}{% trans "Contribute to Weblate

+

{% trans "Found a bug in Weblate?" %}

    @@ -28,7 +29,7 @@

    {% trans "Found a bug in Weblate?" %}

  • {% blocktrans with url='https://github.com/WeblateOrg/weblate/issues/new?template=bug_report.md' %}If you're unable to find an open issue addressing the problem, open a new one.{% endblocktrans %}
  • {% trans "Follow instructions in the issue template, and provide as much relevant info as possible." %}
- {% trans "GitHub issues" %} + {% trans "GitHub issues" %}

{% trans "Have a patch that fixes a bug?" %}

@@ -36,15 +37,17 @@

{% trans "Have a patch that fixes a bug?" %}

  • {% blocktrans with url='https://github.com/WeblateOrg/weblate/compare' %}Open a new GitHub pull request with the patch.{% endblocktrans %}
  • {% blocktrans %}Ensure the pull request description clearly describes the problem and solution. Include the relevant issue number if applicable.{% endblocktrans %}
  • - {% trans "Open a pull request" %} + {% trans "Open a pull request" %}
    +
    +

    {% trans "Missing a feature or want to change something?" %}

    • {% blocktrans with url="https://github.com/WeblateOrg/weblate/issues/new?template=feature_request.md" %}Suggest your change in the GitHub issues.{% endblocktrans %}
    • {% trans "Follow instructions in the issue template, and provide as much relevant info as possible." %}
    - {% trans "GitHub issues" %} + {% trans "GitHub issues" %}

    {% trans "Source code related questions?" %}

    @@ -52,26 +55,31 @@

    {% trans "Source code related questions?" %}

  • {% blocktrans with url='https://docs.weblate.org/en/latest/contributing/index.html' %}Please consult the contributor documentation to find the most common topics.{% endblocktrans %}
  • {% blocktrans with url='https://lists.cihar.com/hyperkitty/list/weblate@lists.cihar.com/' %}Ask any question about the source code on the Weblate mailing list.{% endblocktrans %}
  • - {% trans "Browse documentation" %} + {% trans "Browse documentation" %}
    +
    +

    {% trans "Want to help out with Documentation?" %}

    • {% blocktrans with url='https://docs.weblate.org/' %}The documentation is part of the main source code repository and you can easily follow the links to edit each page directly from the documentation.{% endblocktrans %}
    • {% blocktrans %}Once you have a patch ready, please follow patch submission instructions.{% endblocktrans %}
    - {% trans "Browse documentation" %} + {% trans "Browse documentation" %}

    {% trans "Financial support is always put to good use." %}

    {% trans "Please open the donation page for options on how to donate." %}

    - {% trans "Donate now" %} + {% trans "Donate now" %}
    +
    +

    {% blocktrans %}Are you a translator? Help translate Weblate itself.{% endblocktrans %}

    {% blocktrans %}You can translate Weblate and many other projects at hosted.weblate.org.{% endblocktrans %}

    - {% trans "Start translating" %} + {% trans "Start translating" %}
    +
    diff --git a/weblate_web/templates/snippets/bottom.html b/weblate_web/templates/snippets/bottom.html index c3dab3a379..b767d37321 100644 --- a/weblate_web/templates/snippets/bottom.html +++ b/weblate_web/templates/snippets/bottom.html @@ -1,7 +1,9 @@ {% load i18n %}
    +
    {% include "snippets/box-join.html" %} {% include "snippets/box-donate.html" %} +
    diff --git a/weblate_web/templates/support.html b/weblate_web/templates/support.html index e26de64e3e..97fb32bf82 100644 --- a/weblate_web/templates/support.html +++ b/weblate_web/templates/support.html @@ -48,6 +48,7 @@

    {% trans "Get help" %}

    {% trans "Prepaid support for gratis service and self-hosted installations" %}

    +

    {% trans "Basic self-hosted support" %}

    @@ -55,8 +56,8 @@

    {% trans "Basic self-hosted support" %}

  • {% trans "Issues in your environment fixed immediately." %}
  • {% trans "Priority e-mail support." %}
  • - {{ 500 | price_format }}{% trans "annually" %} - {% trans "Buy now" %} + {{ 500 | price_format }}{% trans "annually" %} + {% trans "Buy now" %}
    @@ -67,9 +68,11 @@

    {% trans "Extended self-hosted support" %}

  • {% trans "Priority e-mail support." %}
  • {% trans "Only available with the installation package" %}
  • - {{ 750 | price_format }}{% trans "annually" %} - {% trans "Buy now" %} + {{ 750 | price_format }}{% trans "annually" %} + {% trans "Buy now" %}
    +
    +

    {% trans "Premium self-hosted support" %}

    @@ -79,8 +82,8 @@

    {% trans "Premium self-hosted support" %}

  • {% trans "Private consultations." %}
  • {% trans "Next business day support response guaranteed." %}
  • - {{ 1200 | price_format }}{% trans "annually" %} - {% trans "Buy now" %} + {{ 1200 | price_format }}{% trans "annually" %} + {% trans "Buy now" %}
    @@ -91,9 +94,11 @@

    {% trans "Installation on your Linux server" %}

  • {% trans "Requires root access or close cooperation of your admins" %}
  • {% trans "Setup customization" %}
  • - {{ 300 | price_format }}{% trans "installation" %} - {% trans "Buy now" %} + {{ 300 | price_format }}{% trans "installation" %} + {% trans "Buy now" %}
    +
    +

    {% trans "Backup service" %}

    @@ -104,8 +109,8 @@

    {% trans "Backup service" %}

  • {% trans "Stores up to 100 GB of backups" %}
  • {% trans "Read more in the documentation." %}
  • - {{ 250 | price_format }}{% trans "annually" %} - {% trans "Buy now" %} + {{ 250 | price_format }}{% trans "annually" %} + {% trans "Buy now" %}
    @@ -115,9 +120,10 @@

    {% trans "Consulting services and/or custom development" %}

  • {% trans "Integration of Weblate into your workflow" %}
  • {% trans "Suggestions on the internationalization and localization" %}
  • - {{ 70 | price_format }}{% trans "hourly" %} - {% trans "Contact us" %} + {{ 70 | price_format }}{% trans "hourly" %} + {% trans "Contact us" %}
    +
    {% trans "Ask for help" %}

    {% trans "Payment" %}