From 00f2fbcfd2191380fdd0f7cff01b01c8059e528b Mon Sep 17 00:00:00 2001
From: Marco Nassabain <marco.nassabain@hotmail.com>
Date: Wed, 17 Mar 2021 00:33:29 +0100
Subject: =?UTF-8?q?=F0=9F=9A=91=20Fix=20HTML=20tags=20error=20+=20indentat?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
---
 css/app.css                |  11 +++-
 templates/part.content.php | 122 +++++++++++++++++++++++----------------------
 2 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/css/app.css b/css/app.css
index 54cc67d39..36be56e12 100644
--- a/css/app.css
+++ b/css/app.css
@@ -68,10 +68,15 @@
   position: absolute;
   background-color: #f1f1f1;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-  z-index: 1;
+  z-index: 999;
   min-width: 20em;
 }
 
+#app-content .compact .dropdown-content {
+  margin-left: -20em;
+}
+
+
 .dropdown-content a {
   color: black;
   padding: 2px 12px 2px 44px;
@@ -88,6 +93,10 @@
     background-color: #3e8e41;
 }
 
+.compact-dropdown{
+    z-index: 1;
+}
+
 /* Override hidden before angular is loaded */
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
     display: none !important;
diff --git a/templates/part.content.php b/templates/part.content.php
index 72121f5d6..9e32c8589 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -25,8 +25,9 @@
             news-on-active="Content.setItemActive(item.id)"
             ng-class="{read: !item.unread, open: item.show, active: Content.isItemActive(item.id)}"
             data-id="{{ ::item.id }}">
-
-            <div class="utils" ng-click="Content.toggleItem(item)">
+            <div class="utils"
+                 ng-click="Content.toggleItem(item)"
+                 ng-class="{'compact-dropdown': Content.showDropdown[item.id]}">
                 <ul>
                     <li class="util-spacer"></li>
                     <li class="util only-in-compact">
@@ -90,74 +91,75 @@
                     </li>
 
                     <!-- DROPDOWN SHARE -->
-                    <li ng-controller="ShareController as Share"
+                    <li
                         class="util dropdown"
                         news-stop-propagation>
                         <button class="icon-share share dropbtn"
                             title="<?php p($l->t('Share')) ?>"
                             ng-click="Content.openDropdown(item.id)">
                         </button>
-                        <ng-container click-outside="Content.hide()">
-                            <div
-                                ng-if="Content.showDropdown[item.id]"
-                                style="margin-top: 2.8em;"
-                                class="dropdown-content">
-                                <!-- Share with users -->
-                                <p class="label-group"><?php p($l->t('Share with users')) ?></p>
-                                <form ng-submit=""
-                                    name="contactForm"
-                                    autocomplete="off">
-                                    <fieldset class="contact-input">
-                                        <input
-                                            ng-model="nameQuery"
-                                            ng-model-options="{debounce: 400}"
-                                            ng-change="Share.searchUsers(nameQuery)"
-                                            type="text"
-                                            placeholder="<?php p($l->t('Username')) ?>"
-                                            title="<?php p($l->t('Username')) ?>"
-                                            name="contactName"
-                                            required
-                                            style="width: 200px">
-                                            <div ng-if="App.loading.isLoading('user')"
-                                                ng-class="{'icon-loading-small': App.loading.isLoading('user') }">
-                                            </div>
-                                    </fieldset>
-                                </form>
+                    </li>
+                    <ng-container click-outside="Content.hide()">
+                        <div
+                            ng-controller="ShareController as Share"
+                            ng-if="Content.showDropdown[item.id]"
+                            style="margin-top: 2.8em;"
+                            class="dropdown-content">
+                            <!-- Share with users -->
+                            <p class="label-group"><?php p($l->t('Share with users')) ?></p>
+                            <form ng-submit=""
+                                name="contactForm"
+                                autocomplete="off">
+                                <fieldset class="contact-input">
+                                    <input
+                                        ng-model="nameQuery"
+                                        ng-model-options="{debounce: 400}"
+                                        ng-change="Share.searchUsers(nameQuery)"
+                                        type="text"
+                                        placeholder="<?php p($l->t('Username')) ?>"
+                                        title="<?php p($l->t('Username')) ?>"
+                                        name="contactName"
+                                        required
+                                        style="width: 200px">
+                                        <div ng-if="App.loading.isLoading('user')"
+                                            ng-class="{'icon-loading-small': App.loading.isLoading('user') }">
+                                        </div>
+                                </fieldset>
+                            </form>
 
-                                <div style="margin-left: 2em; font-size: 0.85em;"
-                                    ng-if="!(Share.userList.length > 0) && nameQuery && !App.loading.isLoading('user')">
-                                    <?php p($l->t('No users found')) ?>
-                                </div>
-                                <a
-                                    ng-repeat="user in Share.userList"
-                                    class="icon-category-installed pr-3"
-                                    ng-click="Share.shareItem(item.id, user.value.shareWith)">
-                                    {{ user.label }}
-                                    <span class="right" style="margin-top: 0.9em; margin-right: 1em"
-                                        ng-class="{'icon-loading-small': Share.isLoading(user.value.shareWith), 'icon-checkmark': Share.isStatus(item.id, user.value.shareWith, true), 'icon-close': Share.isStatus(item.id, user.value.shareWith, false)}">
-                                    </span>
-                                </a>
+                            <div style="margin-left: 2em; font-size: 0.85em;"
+                                ng-if="!(Share.userList.length > 0) && nameQuery && !App.loading.isLoading('user')">
+                                <?php p($l->t('No users found')) ?>
+                            </div>
+                            <a
+                                ng-repeat="user in Share.userList"
+                                class="icon-category-installed pr-3"
+                                ng-click="Share.shareItem(item.id, user.value.shareWith)">
+                                {{ user.label }}
+                                <span class="right" style="margin-top: 0.9em; margin-right: 1em"
+                                    ng-class="{'icon-loading-small': Share.isLoading(user.value.shareWith), 'icon-checkmark': Share.isStatus(item.id, user.value.shareWith, true), 'icon-close': Share.isStatus(item.id, user.value.shareWith, false)}">
+                                </span>
+                            </a>
 
-                                <p class="label-group"> <?php p($l->t('Share on social media')) ?> </p>
-                                <div class="row">
-                                    <div ng-if="Share.isSocialAppEnabled('facebook')" class="col-4">
-                                        <a target="_blank"
-                                            class="icon-dropdown icon-facebook pr-5"
-                                            ng-href="{{ Share.getFacebookUrl(item.url) }}"></a>
-                                    </div>
-                                    <div ng-if="Share.isSocialAppEnabled('twitter')" class="col-4">
-                                        <a target="_blank"
-                                            class="icon-dropdown icon-twitter pr-5"
-                                            ng-href="{{ Share.getTwitterUrl(item.url) }}"></a>
-                                    </div>
-                                    <div ng-if="Share.isSocialAppEnabled('email')" class="col-4">
-                                        <a class="icon-dropdown icon-mail pr-5"
-                                            ng-href="mailto:?subject=<?php p($l->t('I wanted you to see this article')) ?>&amp;body=<?php p($l->t('Check out this article')) ?>{{ ::item.url }}"></a>
-                                    </div>
+                            <p class="label-group"> <?php p($l->t('Share on social media')) ?> </p>
+                            <div class="row">
+                                <div ng-if="Share.isSocialAppEnabled('facebook')" class="col-4">
+                                    <a target="_blank"
+                                        class="icon-dropdown icon-facebook pr-5"
+                                        ng-href="{{ Share.getFacebookUrl(item.url) }}"></a>
+                                </div>
+                                <div ng-if="Share.isSocialAppEnabled('twitter')" class="col-4">
+                                    <a target="_blank"
+                                        class="icon-dropdown icon-twitter pr-5"
+                                        ng-href="{{ Share.getTwitterUrl(item.url) }}"></a>
+                                </div>
+                                <div ng-if="Share.isSocialAppEnabled('email')" class="col-4">
+                                    <a class="icon-dropdown icon-mail pr-5"
+                                        ng-href="mailto:?subject=<?php p($l->t('I wanted you to see this article')) ?>&amp;body=<?php p($l->t('Check out this article')) ?>{{ ::item.url }}"></a>
                                 </div>
                             </div>
-                        </ng-container>
-                    </li>
+                        </div>
+                    </ng-container>
                     <!-- END DROPDOWN -->
 
                     <li class="util more" news-stop-propagation ng-hide="noPlugins">
-- 
cgit v1.2.3