Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	.php_cs.cache
#	public/mix-manifest.json
#	resources/js/components/FilesView/FilePreviewMedia.vue
#	resources/js/components/Sidebar/SidebarNavigation.vue
#	resources/js/helpers.js
This commit is contained in:
Peter Papp
2021-05-06 16:06:17 +02:00
17 changed files with 482 additions and 240 deletions
+9 -8
View File
@@ -103,14 +103,6 @@ textarea {
width: 100%;
}
input[type="color"] {
width: 38px;
height: 40px;
border: none;
outline: none;
background: none;
}
textarea,
input[type="password"],
input[type="text"],
@@ -152,6 +144,15 @@ input[type="email"] {
}
}
input[type="color"] {
width: 38px !important;
height: 40px;
border: none;
outline: none;
background: none;
min-width: initial !important;
}
.additional-link {
@include font-size(16);
margin-top: 50px;