merge fixes

resources/js/components/FilesView/DesktopToolbar.vue

@@ -35,7 +35,7 @@
 						<ToolbarButton @click.stop.native="showCreateMenu" source="cloud-plus" :action="$t('actions.create')" />
 
 						<PopoverItem name="desktop-create" side="left">
-							<OptionGroup :class="{'is-inactive': canUploadInView || !hasCapacity }">
+							<OptionGroup :class="{'is-inactive': canUploadInView }">
 								<OptionUpload :title="$t('actions.upload')" type="file" />
 								<OptionUpload :title="$t('actions.upload_folder')" type="folder" />
 							</OptionGroup>

resources/js/components/FilesView/OptionUpload.vue

@@ -6,6 +6,7 @@
         </div>
         <div class="text-label group-hover-text-theme">
             {{ title }}
+
              <input
                 v-if="type === 'file'"
                 @change="emmitFiles"
@@ -40,11 +41,12 @@ import {
     export default {
         name: 'Option',
         props:[
-            'title', 'type'
+            'title',
+			'type',
         ],
         components: {
-            UploadCloudIcon,
             FolderUploadIcon,
+            UploadCloudIcon,
         },
 		methods: {
 			emmitFiles(e) {

resources/js/components/Others/ColorLabel.vue

@@ -14,6 +14,7 @@
 </script>
 
 <style lang="scss" scoped>
+    @import '/resources/sass/vuefilemanager/_variables';
 
     .color-label {