Skip to content

fix: Fix "Reasons to use Nextcloud" design #48638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 4 commits into from
Oct 10, 2024
Merged

fix: Fix "Reasons to use Nextcloud" design #48638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c12d27
chore: Add text file icon class
Pytal Oct 9, 2024
2ec6a9c
chore: generate icons css
Pytal Oct 9, 2024
d0262be
fix: Fix "Reasons to use Nextcloud" design
Pytal Oct 9, 2024
c4386d4
chore: compile assets
Pytal Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/settings/css/settings.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 7 additions & 11 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,16 @@ select {
}

.link-button {
display: inline-block;
display: inline-flex;
margin: calc(2 * var(--default-grid-baseline));
padding: calc(2 * var(--default-grid-baseline)) calc(4 * var(--default-grid-baseline));
background-color: var(--color-primary-element);
color: var(--color-primary-element-text);
border-radius: var(--border-radius-element);
border: 1px solid var(--color-primary-element);
box-shadow: 0 2px 9px var(--color-box-shadow);
align-items: center;
gap: calc(var(--default-grid-baseline) * 2);

&:hover,
&:focus {
Expand All @@ -152,19 +154,13 @@ select {
outline: 2px solid var(--color-main-text) !important;
}

&.icon-file {
padding-inline-start: calc(var(--default-grid-baseline) + var(--default-clickable-area));
background-position: calc(2 * var(--default-grid-baseline));
.icon-file-text {
filter: var(--primary-invert-if-dark);
width: 20px;
height: 20px;
}
}

body[dir='ltr'] .link-button.icon-file {
background-position: left 24px center;
}
body[dir='rtl'] .link-button.icon-file {
background-position: right 24px center;
}

.personal-settings-container {
display: inline-grid;
grid-template-columns: 1fr 1fr 1fr;
Expand Down
5 changes: 4 additions & 1 deletion apps/settings/templates/settings/personal/development.notice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
?>
<div class="section development-notice">
<p>
<a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button icon-file" target="_blank"><?php p($l->t('Reasons to use Nextcloud in your organization'));?></a>
<a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button" target="_blank">
<span class="icon-file-text" aria-hidden="true"></span>
<?php p($l->t('Reasons to use Nextcloud in your organization'));?>
</a>
</p>
<p>
<?php print_unescaped(str_replace(
Expand Down
4 changes: 4 additions & 0 deletions core/src/icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ const iconsColor = {
path: path.join(__dirname, '../img', 'filetypes', 'text.svg'),
color: 'grey',
},
'file-text': {
path: path.join(__dirname, '../img', 'filetypes', 'text.svg'),
color: 'black',
},
}

// use this to define aliases to existing icons
Expand Down
4 changes: 4 additions & 0 deletions dist/icons.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.