Skip to content

Commit

Permalink
added multiple small fixes (#350)
Browse files Browse the repository at this point in the history 
* added multiple small fixes

* fixed coding style
  • Loading branch information
@memurats
memurats authored Jun 12, 2024
1 parent a784d0b commit 2f6b0b2
Show file tree
Hide file tree
Showing 13 changed files with 262 additions and 70 deletions.
26 changes: 25 additions & 1 deletion css/apps/files-right-click.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

&[data-cy-files-list-row-action="details"],
&[data-cy-files-list-row-action="edit-locally"],
&[data-cy-files-list-row-action="view"] {
&[data-cy-files-list-row-action="view"],
&[data-cy-files-list-row-action="cancel_select"] {
display: none;
}

Expand All @@ -29,6 +30,11 @@
}
}

span.icon-vue {
background-size: 24px;
}


&[data-cy-files-list-row-action="rename"] {
span.icon-vue {
background-image: var(--icon-edit-dark);
Expand All @@ -52,6 +58,24 @@
background-image: var(--icon-delete-dark);
}
}

&[data-cy-files-list-row-action="view-in-folder"] {
span.icon-vue {
background-image: var(--icon-folder-dark);
}
}

&[data-cy-files-list-row-action="files_zip"] {
span.icon-vue {
background-image: var(--icon-compress-zip-dark);
}
}

&[data-cy-files-list-row-action="sharing-status-menu"] {
span.icon-vue {
background-image: var(--icon-shared-dark);
}
}
}
}
}
Expand Down
128 changes: 106 additions & 22 deletions css/apps/files.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,61 @@
.button-vue__text {
padding-right: 1rem;
}
}

&:nth-of-type(1) {
.button-vue__icon {
background-image: var(--original-icon-star-dark);
background-repeat: no-repeat;
background-position: center;
background-size: 1.25rem;

svg {
display: none;
}
}
}

&:nth-of-type(2) {
&.action-item__menutoggle {
padding-right: 1rem;
}

&.files-list__row-actions-batch-favorite {
.button-vue__icon {
background-image: var(--original-icon-star-dark);
}
}

&.files-list__row-actions-batch-move-copy {
.button-vue__icon {
background-image: var(--icon-external-dark);
background-repeat: no-repeat;
background-position: center;
background-size: 1.25rem;
}
}

svg {
display: none;
}
&.files-list__row-actions-batch-download {
.button-vue__icon {
background-image: var(--icon-download-dark);
}
}

&.files-list__row-actions-batch-delete {
.button-vue__icon {
background-image: var(--icon-delete-dark);
}
}

&.files-list__row-actions-batch-restore {
.button-vue__icon {
background-image: var(--icon-restore-dark);
}
}

&.files-list__row-actions-batch-files_zip {
.button-vue__icon {
background-image: var(--icon-compress-zip-dark);
}
}

&.files-list__row-actions-batch-cancel_select {
.button-vue__icon {
background-image: var(--icon-close-dark);
}
}

Expand Down Expand Up @@ -85,7 +115,7 @@

.action-item {
button .button-vue__icon {
background-image: var(--icon-delete-dark);
background-image: var(--icon-more-dark);
background-repeat: no-repeat;
background-position: center;
background-size: 1.25rem;
Expand Down Expand Up @@ -388,6 +418,7 @@ table.files-filestable {
width: 50px;

img {
background-color: unset;
background-position: center;
background-repeat: no-repeat;
background-size: contain;
Expand Down Expand Up @@ -434,7 +465,7 @@ table.files-filestable {
display: flex;

.action-items {
// 'Share' status styles

button.action-item {
padding: 0;

Expand All @@ -444,12 +475,12 @@ table.files-filestable {
}

.button-vue__wrapper {

.button-vue__text {
margin: 0;
}

.button-vue__icon {
background-image: var(--icon-shared-dark);
background-position: center;
background-repeat: no-repeat;
background-size: 24px;
Expand All @@ -460,9 +491,23 @@ table.files-filestable {
}
}

// color Shared icon
&.button-vue--icon-and-text .button-vue__icon {
@include magenta-icon;
&.files-list__row-action-restore {

.button-vue__icon {
background-image: var(--icon-restore-dark);
@include magenta-icon;
}
}

&.files-list__row-action-sharing-status {

.button-vue__icon {
background-image: var(--icon-shared-dark);
}

&.button-vue--icon-and-text .button-vue__icon {
@include magenta-icon;
}
}
}

Expand Down Expand Up @@ -638,6 +683,10 @@ table.files-filestable {
&__column {
width: fit-content;

& > .action-items {
justify-content: end;
}

&.files-list__row-size {
display: none;
}
Expand Down Expand Up @@ -667,11 +716,7 @@ table.files-filestable {
&.files-list__row-actions-batch {
@include header-menu-files();

.action-item--single.files-list__row-actions-batch-restore {
padding-left: 0;
}

.action-item--single.files-list__row-actions-batch-delete {
.action-item--single {
padding-left: 0;
}
}
Expand All @@ -685,4 +730,43 @@ table.files-filestable {
}
}
}
}

// Files actions menu items
.v-popper__popper.action-item__popper {

li.action {

.icon-vue {
background-size: 24px;
}

.icon-vue svg {
display: none;
}

&.files-list__row-actions-batch-delete .icon-vue {
background-image: var(--icon-delete-dark);
}

&.files-list__row-actions-batch-favorite .icon-vue {
background-image: var(--original-icon-star-dark);
}

&.files-list__row-actions-batch-move-copy .icon-vue {
background-image: var(--icon-external-dark);
}

&.files-list__row-actions-batch-download .icon-vue {
background-image: var(--icon-download-dark);
}

&.files-list__row-actions-batch-files_zip .icon-vue {
background-image: var(--icon-compress-zip-dark);
}

&.files-list__row-actions-batch-cancel_select .icon-vue {
background-image: var(--icon-close-dark);
}
}
}
6 changes: 1 addition & 5 deletions css/apps/settings.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
}

.settings-section {
padding: 2rem;
padding: 3rem 3rem 0;
border: none;

&.theming {
Expand All @@ -562,10 +562,6 @@
p {
max-width: 800px;
}

&:not(:last-child) {
border-bottom: 1px solid var(--color-border);
}
}

.button-vue {
Expand Down
12 changes: 6 additions & 6 deletions l10n/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,14 @@
"Confirm": "Bestätigen",
"End-to-end encryption is currently disabled. You can set it up with the {productName} clients.": "Die Ende-zu-Ende Verschlüsselung ist deaktiviert. Sie können sie in den MagentaCLOUD Apps oder Desktop Clients einrichten.",
"End-to-End encryption is currently disabled. You can set it up with the {productName} clients.": "Die Ende-zu-Ende Verschlüsselung ist deaktiviert. Sie können sie in den MagentaCLOUD Apps oder Desktop Clients einrichten.",
"You are not allowed to lock the root": "Das Sperren deines gesamten Verzeichnisbaumes durch E2E-Encryption wurde verhindert!"
"You are not allowed to lock the root": "Das Sperren deines gesamten Verzeichnisbaumes durch E2E-Encryption wurde verhindert!",
"Confirm and reset end-to-end encryption": "Bestätigen und Ende-zu-Ende Verschlüsselung zurücksetzen"
},
"pluralForm": "nplurals=2; plural=(n != 1);"
},
"files": {
"translations": {
"Crop image previews": "Vorschaubilder beschneiden",
"My shares": "Meine geteilten Inhalte",
"Shared with me": "Mit mir geteilt",
"All": "Alle",
"Toggle grid view": "Ansicht ändern",
"Display settings": "Anzeigeeinstellungen",
Expand All @@ -64,7 +63,8 @@
"_{count} folder_::_{count} folders_" : ["{count} Ordner","{count} Ordner"],
"_{count} file_::_{count} files_" : ["{count} Datei","{count} Dateien"],
"{summaryFile} and {summaryFolder}" : "{summaryFile} und {summaryFolder}",
"_including %n hidden_::_including %n hidden_": ["davon %n versteckt","davon %n versteckt"]
"_including %n hidden_::_including %n hidden_": ["davon %n versteckt","davon %n versteckt"],
"\"{displayName}\" batch action executed successfully" : "Aktion \"{displayName}\" erfolgreich ausgeführt"
},
"pluralForm": "nplurals=2; plural=(n != 1);"
},
Expand Down Expand Up @@ -107,6 +107,8 @@
"The password must contain 10 characters and will not be sent with the mail to maintain confidentiality.": "Das Passwort muss 10 Zeichen enthalten und wird nicht mit der E-Mail verschickt, um die Vertraulichkeit zu wahren.",
"Link to file": "Link zur Datei",
"Link to folder": "Link zum Ordner",
"Shared with others": "Meine geteilten Inhalte",
"Shared with you": "Mit mir geteilt",
"No recommendations. Start typing.": "Keine Empfehlungen.Beginnen..."
},
"pluralForm": "nplurals=2; plural=(n != 1);"
Expand Down Expand Up @@ -195,8 +197,6 @@
"used": "genutzt",
"Display settings": "Anzeigeeinstellungen",
"Show folder info text": "Ordnerinfotext anzeigen",
"Shared with you": "Mit mir geteilt",
"Shared with others": "Meine geteilten Inhalte",
"and": "und",
"System Design (Standard)" : "System-Design (Standard)",
"Enable system design" : "System-Design aktivieren",
Expand Down
12 changes: 6 additions & 6 deletions l10n/de_DE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,14 @@
"Confirm": "Bestätigen",
"End-to-end encryption is currently disabled. You can set it up with the {productName} clients.": "Die Ende-zu-Ende Verschlüsselung ist deaktiviert. Sie können sie in den MagentaCLOUD Apps oder Desktop Clients einrichten.",
"End-to-End encryption is currently disabled. You can set it up with the {productName} clients.": "Die Ende-zu-Ende Verschlüsselung ist deaktiviert. Sie können sie in den MagentaCLOUD Apps oder Desktop Clients einrichten.",
"You are not allowed to lock the root": "Das Sperren deines gesamten Verzeichnisbaumes durch E2E-Encryption wurde verhindert!"
"You are not allowed to lock the root": "Das Sperren deines gesamten Verzeichnisbaumes durch E2E-Encryption wurde verhindert!",
"Confirm and reset end-to-end encryption": "Bestätigen und Ende-zu-Ende Verschlüsselung zurücksetzen"
},
"pluralForm": "nplurals=2; plural=(n != 1);"
},
"files": {
"translations": {
"Crop image previews": "Vorschaubilder beschneiden",
"My shares": "Meine geteilten Inhalte",
"Shared with me": "Mit mir geteilt",
"All": "Alle",
"Toggle grid view": "Ansicht ändern",
"Display settings": "Anzeigeeinstellungen",
Expand All @@ -64,7 +63,8 @@
"_{count} folder_::_{count} folders_" : ["{count} Ordner","{count} Ordner"],
"_{count} file_::_{count} files_" : ["{count} Datei","{count} Dateien"],
"{summaryFile} and {summaryFolder}" : "{summaryFile} und {summaryFolder}",
"_including %n hidden_::_including %n hidden_": ["davon %n versteckt","davon %n versteckt"]
"_including %n hidden_::_including %n hidden_": ["davon %n versteckt","davon %n versteckt"],
"\"{displayName}\" batch action executed successfully" : "Aktion \"{displayName}\" erfolgreich ausgeführt"
},
"pluralForm": "nplurals=2; plural=(n != 1);"
},
Expand Down Expand Up @@ -107,6 +107,8 @@
"The password must contain 10 characters and will not be sent with the mail to maintain confidentiality.": "Das Passwort muss 10 Zeichen enthalten und wird nicht mit der E-Mail verschickt, um die Vertraulichkeit zu wahren.",
"Link to file": "Link zur Datei",
"Link to folder": "Link zum Ordner",
"Shared with others": "Meine geteilten Inhalte",
"Shared with you": "Mit mir geteilt",
"No recommendations. Start typing.": "Keine Empfehlungen.Beginnen..."
},
"pluralForm": "nplurals=2; plural=(n != 1);"
Expand Down Expand Up @@ -195,8 +197,6 @@
"used": "genutzt",
"Display settings": "Anzeigeeinstellungen",
"Show folder info text": "Ordnerinfotext anzeigen",
"Shared with you": "Mit mir geteilt",
"Shared with others": "Meine geteilten Inhalte",
"and": "und",
"System Design (Standard)" : "System-Design (Standard)",
"Enable system design" : "System-Design aktivieren",
Expand Down
Loading

0 comments on commit 2f6b0b2

Please sign in to comment.