Merge branch 'front' into 'master'

fix modal height See merge request listenHub/listenHard!2
EmilienMottet · Jun 1, 2018 · efd71dd · efd71dd
2 parents 80ac0bd + 91b7a98
commit efd71dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/client/src/components/Menu.vue b/client/src/components/Menu.vue
@@ -43,15 +43,11 @@ export default {
   methods: {
     show_login: function (event) {
       this.$modal.show(Login, {}, {
-        text: 'This text is passed as a property'
-      }, {
         height: 'auto'
       })
     },
     show_signup: function (event) {
       this.$modal.show(Signup, {}, {
-        text: 'This text is passed as a property'
-      }, {
         height: 'auto'
       })
     },

diff --git a/client/src/components/Playlist_List.vue b/client/src/components/Playlist_List.vue
@@ -57,8 +57,6 @@ export default {
     },
     show_add: function (event) {
       this.$modal.show(CreatePlaylist, {}, {
-        text: 'This text is passed as a property'
-      }, {
         height: 'auto'
       })
     }

diff --git a/client/src/components/modals/AddSong_modal.vue b/client/src/components/modals/AddSong_modal.vue
@@ -13,9 +13,9 @@
       <fieldset>
         <div id="via_link_fields" v-if="fields_activated == 'link'">
           <div class="field">
-            <label class="label" for="link">Link</label>
+            <label class="label" for="link">Link ( Youtube )</label>
             <div class="control">
-              <input class="input" type="text" name="link" v-model="link" placeholder="Enter the link to the song" required>
+              <input class="input" type="text" name="link" v-model="link" placeholder="Enter a youtube link" required>
             </div>
           </div>
           <div class="field">