Skip to content

Commit

Permalink
Home page company and user design changes
Browse files Browse the repository at this point in the history
Check on Custom JS file.

1) Internal CSS has been moved to the already existing file Style.css
2) Testimonial has been changed to a single class.
3) Inline/excessive css has been removed.
4) Created and RTL css variant

Update custom.js

File formatting fix

Removed unused code.
Removed Inline Styling.

Text formatting

Formatting
Apply suggestions from code review

Co-authored-by: Allan Nordhøy <[email protected]>
Co-authored-by: Michal Čihař <[email protected]>
  • Loading branch information
3 people committed Jun 24, 2021
1 parent 311623f commit ec6a8f5
Show file tree
Hide file tree
Showing 29 changed files with 332 additions and 3 deletions.
3 changes: 3 additions & 0 deletions scripts/yarn-update
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ yarn upgrade-interactive

# Clipboard
cp node_modules/clipboard/dist/clipboard.min.js ../../weblate_web/static/vendor/clipboard.js
cp node_modules/simpleslider-js/dist/simpleSlider.min.js ../../weblate_web/static/vendor/simpleSlider.min.js
cp node_modules/simpleslider-js/dist/simpleSlider.min.css ../../weblate_web/static/vendor/simpleSlider.min.css


# Source Sans/Code Pro fonts
mkdir -p ../../weblate_web/static/font-source
Expand Down
1 change: 1 addition & 0 deletions scripts/yarn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"license": "GPL-3.0+",
"dependencies": {
"clipboard": "^2.0.8",
"simpleslider-js": "^1.9.0",
"source-code-pro": "2.38.0",
"source-sans-pro": "3.6.0"
}
Expand Down
5 changes: 5 additions & 0 deletions scripts/yarn/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ select@^1.1.2:
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=

simpleslider-js@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/simpleslider-js/-/simpleslider-js-1.9.0.tgz#f850e1d493968ccd1c9d91c15b1b53bbb32049a3"
integrity sha512-p2nzUx0/sAJldSDezLah0sAm8orHM+E6BsA/mTaCIPV0UrZj6ZIxKhwj5KF+4iu98gB0SqWBPhZE4hs4drDZrA==

[email protected]:
version "2.38.0"
resolved "https://registry.yarnpkg.com/source-code-pro/-/source-code-pro-2.38.0.tgz#85c57689f7386bb9d0515fb00ba4845bfb7b485b"
Expand Down
9 changes: 9 additions & 0 deletions weblate_web/static/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,12 @@ ready(() => {

new ClipboardJS("[data-clipboard-text]");
});

if (typeof SimpleSlider === "function") {
new SimpleSlider(".page-slider", {
slidesPerView: {
850: 2,
1165: 3,
},
});
}
Binary file added weblate_web/static/img/Dyson-logo.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 weblate_web/static/img/Logo-Turris.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 weblate_web/static/img/LogoFreedomBox.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 weblate_web/static/img/LogoOpenSuse.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 weblate_web/static/img/LogoPhpMyAdmin.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 weblate_web/static/img/LogoSonicPi.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 weblate_web/static/img/Quotes.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 weblate_web/static/img/Siemens-logo.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 weblate_web/static/img/YouGov-logo.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 weblate_web/static/img/chevron.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 weblate_web/static/img/chevron1.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 weblate_web/static/img/donald.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 weblate_web/static/img/dyson-group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions weblate_web/static/img/next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions weblate_web/static/img/prev.svg
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 weblate_web/static/img/siemens-group.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 weblate_web/static/img/siemens-log.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
100 changes: 100 additions & 0 deletions weblate_web/static/style-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -4702,3 +4702,103 @@ a.invoice-link img {
.payment-updated {
display: flow-root;
}

/*Testimonial and Slider CSS*/

.testimonial {
width: 365px;
border-radius: 30px;
background-color: #ffffff;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1);
margin-left: 10px;
}

.icon-review {
text-align: right;
}
.icon-review img {
margin-right: 50px;
}
.icon-review p {
margin-right: 35px;
margin-top: -25px;
width: 70%;
font-size: 15px;
line-height: 18px;
letter-spacing: 0.5px;
color: #2a3744;
}

.circle-user {
width: 40px;
height: 40px;
border-radius: 50%;
position: relative;
right: 32px;
margin-top: 20px;
}
.circle-user img {
margin: 0px;
border-radius: 50%;
}

.icon-user {
display: flex;
text-align: right;
padding-bottom: 25px;
}
.content-user {
margin-top: 20px;
margin-right: 45px;
}
.content-user a {
color: #1fa385;
line-height: 23px;
text-decoration: underline;
}
.content-logo {
margin: 0px !important;
}

.slider-slide {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
-webkit-justify-content: center;
justify-content: center;
}

.simple-slider {
height: 400px;
}

.simple-slider .slider-btn.slider-btn-prev {
left: 11px !important;
background-position: left !important;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1) !important;
background: white !important;
border-radius: 50% !important;
width: 50px !important;
height: 50px !important;
}

.simple-slider .slider-btn.slider-btn-next {
right: 4px !important;
background-position: right !important;
border-radius: 50% !important;
width: 50px !important;
height: 50px !important;
background: white !important;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1) !important;
}

.simple-slider .slider-btn.slider-btn-next img {
padding: 18px;
margin: 0px;
}

.simple-slider .slider-btn.slider-btn-prev img {
padding: 18px;
margin: 0px;
}
102 changes: 101 additions & 1 deletion weblate_web/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4158,7 +4158,7 @@ input.fullwidth {
}
}

/* About Us Weblate Team CSS */
/* About Us Weblate Team */

.content-p {
width: 69%;
Expand Down Expand Up @@ -4693,3 +4693,103 @@ a.invoice-link img {
.payment-updated {
display: flow-root;
}

/*Testimonial and Slider CSS*/

.testimonial {
width: 365px;
border-radius: 30px;
background-color: #ffffff;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1);
margin-left: 10px;
}

.icon-review {
text-align: left;
}
.icon-review img {
margin-left: 50px;
}
.icon-review p {
margin-left: 35px;
margin-top: -25px;
width: 70%;
font-size: 15px;
line-height: 18px;
letter-spacing: 0.5px;
color: #2a3744;
}

.circle-user {
width: 40px;
height: 40px;
border-radius: 50%;
position: relative;
left: 32px;
margin-top: 20px;
}
.circle-user img {
margin: 0px;
border-radius: 50%;
}

.icon-user {
display: flex;
text-align: left;
padding-bottom: 25px;
}
.content-user {
margin-top: 20px;
margin-left: 45px;
}
.content-user a {
color: #1fa385;
line-height: 23px;
text-decoration: underline;
}
.content-logo {
margin: 0px !important;
}

.slider-slide {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
-webkit-justify-content: center;
justify-content: center;
}

.simple-slider {
height: 400px;
}

.simple-slider .slider-btn.slider-btn-prev {
left: 11px !important;
background-position: left !important;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1) !important;
background: white !important;
border-radius: 50% !important;
width: 50px !important;
height: 50px !important;
}

.simple-slider .slider-btn.slider-btn-next {
right: 4px !important;
background-position: right !important;
border-radius: 50% !important;
width: 50px !important;
height: 50px !important;
background: white !important;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1) !important;
}

.simple-slider .slider-btn.slider-btn-next img {
padding: 18px;
margin: 0px;
}

.simple-slider .slider-btn.slider-btn-prev img {
padding: 18px;
margin: 0px;
}
10 changes: 10 additions & 0 deletions weblate_web/static/vendor/simpleSlider.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions weblate_web/static/vendor/simpleSlider.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions weblate_web/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<link rel="stylesheet" href="{% if LANGUAGE_BIDI %}{% static "style-rtl.css" %}{% else %}{% static "style.css" %}{% endif %}" />
{% endcompress %}

{% if request.resolver_match.url_name == 'home' %}
<link rel="stylesheet" href="{% static 'vendor/simpleSlider.min.css' %}" />
{% endif %}


<link rel="stylesheet" href="https://s.weblate.org/cdn/font-source/source-sans-pro.css">
<link rel="stylesheet" href="https://s.weblate.org/cdn/font-source/source-code-pro.css">

Expand Down Expand Up @@ -125,6 +130,10 @@
{% include "snippets/languages.html" %}
</section>

{% if request.resolver_match.url_name == 'home' %}
<script src="{% static 'vendor/simpleSlider.min.js' %}" /></script>
{% endif %}

{% compress js %}
<script src="{% static "vendor/clipboard.js" %}"></script>
<script src="{% static "custom.js" %}"></script>
Expand Down
7 changes: 6 additions & 1 deletion weblate_web/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ <h2 class="section-title hp-style">{% trans "Robust feature set" %}</h2>
<a class="button inline border rev" href="{% url 'features' %}">{% trans "Explore all features" %}</a>
</div>
<div class="wrap supporters">
<h2 class="section-title hp-style">{% trans "Users and Supporters" %}</h2>
<h2 class="section-title hp-style">{% trans "Companies using Weblate" %}</h2>
{% include "snippets/reviews.html" %}
</div>

<div class="wrap supporters">
<h2 class="section-title hp-style">{% trans "Supporters & open source projects" %}</h2>
{% include "snippets/users.html" %}
</div>
</div>
Expand Down
Loading

0 comments on commit ec6a8f5

Please sign in to comment.