From b4fe9a6f50b14e10d2e6108d8f663cc6d8340885 Mon Sep 17 00:00:00 2001
From: Olimpia Magliulo <olimpiam@intern-ikts-MacBook-Air.local>
Date: Tue, 14 Nov 2017 11:31:11 +0100
Subject: [PATCH] Change path and fix rtl
---
templates/base.twig | 2 +-
templates/includes/header.php | 2 +-
www/assets/css/src/default.css | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/base.twig b/templates/base.twig
index ccbba8599..a2a588767 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -13,7 +13,7 @@
{% if jquery and jquery.css %}
<link rel="stylesheet" media="screen" type="text/css" href="/{{ baseurlpath }}resources/uitheme1.8/jquery-ui.css" />
{% endif %}
- {% if isRTL %}<link rel="stylesheet" type="text/css" href="/{{ baseurlpath }}resources/default-rtl.css" />{% endif %}
+ {% if isRTL %}<link rel="stylesheet" type="text/css" href="/{{ baseurlpath }}assets/css/src/default-rtl.css" />{% endif %}
<meta name="robots" content="noindex, nofollow">
{% block preload %}{% endblock %}
</head>
diff --git a/templates/includes/header.php b/templates/includes/header.php
index c2950c543..fbbe8dc08 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -92,7 +92,7 @@ if(!empty($this->data['htmlinject']['htmlContentHead'])) {
if ($this->isLanguageRTL()) {
?>
- <link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>resources/default-rtl.css" />
+ <link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>assets/css/src/default-rtl.css" />
<?php
}
?>
diff --git a/www/assets/css/src/default.css b/www/assets/css/src/default.css
index e0c1886c3..d65643813 100644
--- a/www/assets/css/src/default.css
+++ b/www/assets/css/src/default.css
@@ -40,11 +40,11 @@ img {
}
.left {
- float: left !important;
+ float: left;
}
.right {
- float: right !important;
+ float: right;
}
.center {
--
GitLab