From a1a9bbf426d17b15b7245e486c9ce63be9cdd2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Tue, 28 Sep 2021 18:31:59 +0200
Subject: [PATCH] switch menu between mobile and desktop

---
 src/App.vue                          | 88 ++++++++++++++++++++++------
 src/views/project/Project_detail.vue |  4 +-
 2 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 988d513b..715ddb2b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,7 @@
           <div
             id="menu-dropdown"
             :class="[
-              'ui dropdown item floated right',
+              'ui dropdown item',
               { 'active visible': menuIsOpen },
             ]"
             @click="menuIsOpen = !menuIsOpen"
@@ -72,27 +72,54 @@
                 <i class="users icon"></i>Membres
               </router-link>
 
-              <router-link v-if="user" to="/my_account/" class="item">
-                {{ userFullname || user.username || "Utilisateur inconnu" }}
-              </router-link>
-              <div
-                v-if="user && user.is_administrator"
-                class="item ui label vertical no-hover"
-              >
-                <span v-if="USER_LEVEL_PROJECTS && project">
-                  {{ USER_LEVEL_PROJECTS[project.slug] }}</span
+              <div class="mobile">
+                <router-link v-if="user" to="/my_account/" class="item">
+                  {{ userFullname || user.username || "Utilisateur inconnu" }}
+                </router-link>
+                <div
+                  v-if="user && user.is_administrator"
+                  class="item ui label vertical no-hover"
+                >
+                  <span v-if="USER_LEVEL_PROJECTS && project">
+                    {{ USER_LEVEL_PROJECTS[project.slug] }}</span
+                  >
+                  <br />
+                  <span v-if="user.is_administrator">
+                    Gestionnaire métier
+                  </span>
+                </div>
+                <!-- // todo : find out SSO_SETTED in django -->
+                <a v-if="user && !SSO_SETTED" @click="logout" class="item"
+                  ><i class="ui logout icon"></i>
+                </a>
+                <router-link v-else-if="!user" to="/connexion/" class="item"
+                  >Se Connecter</router-link
                 >
-                <br />
-                <span v-if="user.is_administrator"> Gestionnaire métier </span>
               </div>
-              <!-- // todo : find out SSO_SETTED in django -->
-              <a v-if="user && !SSO_SETTED" @click="logout" class="item"
-                ><i class="ui logout icon"></i>
-              </a>
-              <router-link v-else-if="!user" to="/connexion/" class="item"
-                >Se Connecter</router-link
+            </div>
+          </div>
+
+          <div class="desktop flex push-right-desktop">
+            <router-link v-if="user" to="/my_account/" class="item">
+              {{ userFullname || user.username || "Utilisateur inconnu" }}
+            </router-link>
+            <div
+              v-if="user && user.is_administrator"
+              class="item ui label vertical no-hover"
+            >
+              <span v-if="USER_LEVEL_PROJECTS && project">
+                {{ USER_LEVEL_PROJECTS[project.slug] }}</span
               >
+              <br />
+              <span v-if="user.is_administrator"> Gestionnaire métier </span>
             </div>
+            <!-- // todo : find out SSO_SETTED in django -->
+            <a v-if="user && !SSO_SETTED" @click="logout" class="item"
+              ><i class="ui logout icon"></i>
+            </a>
+            <router-link v-else-if="!user" to="/connexion/" class="item"
+              >Se Connecter</router-link
+            >
           </div>
         </div>
       </div>
@@ -225,6 +252,10 @@ footer {
   justify-content: center;
 }
 @media screen and (min-width: 560px) {
+  .mobile {
+    display: none !important;
+  }
+
   .header-menu {
     min-width: 560px;
   }
@@ -234,8 +265,14 @@ footer {
     margin-left: 1em !important;
     margin-right: 1em !important;
   }
-}
 
+  .push-right-desktop {
+    margin-left: auto;
+  }
+}
+.flex {
+  display: flex;
+}
 @media screen and (max-width: 560px) {
   .desktop {
     display: none !important;
@@ -264,5 +301,18 @@ footer {
   cursor: auto !important;
   background: white !important;
 }
+/* copy style to apply inside nested div */
+.ui.menu .ui.dropdown .menu .item {
+  margin: 0;
+  text-align: left;
+  font-size: 1em !important;
+  padding: 0.78571429em 1.14285714em !important;
+  background: 0 0 !important;
+  color: #252525 !important;
+  text-transform: none !important;
+  font-weight: 400 !important;
+  box-shadow: none !important;
+  transition: none !important;
+}
 </style>
  
\ No newline at end of file
diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue
index cad93896..9be1dc2c 100644
--- a/src/views/project/Project_detail.vue
+++ b/src/views/project/Project_detail.vue
@@ -207,7 +207,7 @@
                 compact
                 basic
                 button button-hover-green
-                flex
+                important-flex
                 align-center
                 text-left
               "
@@ -618,7 +618,7 @@ export default {
 .fullwidth {
   width: 100%;
 }
-.flex {
+.important-flex {
   display: flex !important;
 }
 .align-center {
-- 
GitLab