Fixed merge
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
<!-- "profile xs sm md" -->
|
||||
|
||||
<v-card
|
||||
style="margin-top: 2; border-bottom-left-radius:30px; border-bottom-right-radius:30px; background-color: rgba(11, 170, 178, 0); width: 101vw;"
|
||||
style="margin-top: 2px; border-bottom-left-radius:30px; border-bottom-right-radius:30px; background-color: rgba(11, 170, 178, 0); width: 101vw;"
|
||||
class="profile-container-mobile hidden-md-and-up" hidden-md-and-down>
|
||||
|
||||
<v-img :src="profilePicture" class="elevation-4 mobile-profile-picture-creator "></v-img>
|
||||
@@ -72,7 +72,7 @@
|
||||
<v-col style="margin: 0;">
|
||||
|
||||
|
||||
<v-container style=" overflow-y: hidden;i">
|
||||
<v-container style=" overflow-y: hidden;">
|
||||
<!-- Nav-Btn -->
|
||||
<v-col cols="12" class="px-0">
|
||||
<v-list dense class="main-background">
|
||||
@@ -169,7 +169,7 @@
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
|
||||
<v-card style="border-radius: 25pxo; margin-top: 3%; height: 30px;">
|
||||
<v-card style="border-radius: 25px; margin-top: 3%; height: 30px;">
|
||||
<v-row>
|
||||
<v-col style="margin-right: -2%;" cols="1"
|
||||
class="text-truncate text-center font-weight-bold">T#</v-col>
|
||||
@@ -182,7 +182,7 @@
|
||||
</v-row>
|
||||
</v-card>
|
||||
|
||||
<v-card style=" border-radius: 25pxo; margin-top: .5%; max-height: 450px;">
|
||||
<v-card style=" border-radius: 25px; margin-top: .5%; max-height: 450px;">
|
||||
<v-row>
|
||||
<v-col style="margin-right: -2%;" cols="1" class="text-truncate">1</v-col>
|
||||
<v-col style="margin-right: -1%; background-color: #fbccee;" cols="1"
|
||||
@@ -302,34 +302,16 @@
|
||||
<div
|
||||
style="z-index: 500; margin-bottom: 2%; background-color: rgba(0, 0, 0, 1); height: 3px; width: 100%; margin-top: 20px;">
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div style="background-color: rgba(0, 0, 0, 1); height: 3px; width: 100%; margin-top: 20px;">
|
||||
</div>
|
||||
|
||||
<!-- Comments -->
|
||||
|
||||
<v-text-field style="margin-left: 2%;"
|
||||
placeholder="Commentaire (Commentaire, Aime et Partagez sont non fonctionnel pour le moment)"></v-text-field>
|
||||
</v-container>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</v-card>
|
||||
</v-container>
|
||||
|
||||
|
||||
</v-col>
|
||||
|
||||
<!-- "Large-Monitor-RightCol" Donation -->
|
||||
@@ -466,7 +448,7 @@ export default {
|
||||
.sticky-top-label {
|
||||
position: sticky;
|
||||
bottom: 0;
|
||||
right: 10;
|
||||
right: 10%;
|
||||
width: 100%;
|
||||
z-index: 1000;
|
||||
}
|
||||
@@ -722,7 +704,6 @@ export default {
|
||||
|
||||
.mobile-profile-picture {
|
||||
height: 40px;
|
||||
border-radius: px;
|
||||
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.2);
|
||||
/* Ajouter une ombre à la photo */
|
||||
border: 2px solid #a30e79;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<img style=" max-width: 60vh; max-height: 11vh;" src="../../../images/hutopy.png">
|
||||
<RouterLink :to="{ name: 'login' }">
|
||||
<v-btn size="large"
|
||||
style="margin-left: 20%; margin-top: 50%; background-color: #F4F4F4; min-width: 100px; max-width: 100;"
|
||||
style="margin-left: 20%; margin-top: 50%; background-color: #F4F4F4; min-width: 100px; max-width: 100px;"
|
||||
light elevation="0">
|
||||
Connexion
|
||||
</v-btn>
|
||||
@@ -189,14 +189,14 @@
|
||||
<!-- Colonne de droite -->
|
||||
<v-col cols="3">
|
||||
<v-img src="../../../images/homepage/grinding.png"
|
||||
style="margin-bottom: 4%; border-radius: 30px; width: 80 vw;"></v-img>
|
||||
style="margin-bottom: 4%; border-radius: 30px; width: 80px;"></v-img>
|
||||
<v-img src="../../../images/homepage/girlarmy.png" style="border-radius: 30px; min-width: 250px;"></v-img>
|
||||
</v-col>
|
||||
<v-col cols="3" style>
|
||||
<v-img src="../../../images/homepage/microphone.png"
|
||||
style="margin-bottom: 4%; border-radius: 30px; min-width: 250px; max-height: auto; height: auto;"></v-img>
|
||||
<v-img src="../../../images/homepage/girlvr.png"
|
||||
style="border-radius: 30px; min-width: 250pxpx; max-height: 350;"></v-img>
|
||||
style="border-radius: 30px; min-width: 250px; max-height: 350;"></v-img>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</v-container>
|
||||
@@ -277,7 +277,7 @@
|
||||
<div>
|
||||
|
||||
|
||||
<img src="../../../images/bannieremobile.png" class="banner-image" alt="Bannière" style="margin-top: -100px;">
|
||||
<img src="../../../images/homepage/bannierehomepage.png" class="banner-image" alt="Bannière" style="margin-top: -100px;">
|
||||
|
||||
<div>
|
||||
<v-card-text>
|
||||
@@ -403,7 +403,7 @@
|
||||
<script async setup>
|
||||
import DefaultLayout from '@/layouts/DefaultLayout.vue';
|
||||
import FooterLayout from '@/layouts/FooterLayout.vue';
|
||||
import { useClient } from '@/plugins/clientPlugin';
|
||||
import {useClient} from "@/plugins/api.js";
|
||||
import { ref } from 'vue';
|
||||
import { useRouter } from 'vue-router';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user