Skip to content

Commit

Permalink
Merge pull request #2268 from nextcloud/backport/2263/stable4
Browse files Browse the repository at this point in the history
[stable4] Set material design icon size to 20
  • Loading branch information
marcoambrosini authored Sep 21, 2021
2 parents 53f821a + c60939a commit 118af82
Show file tree
Hide file tree
Showing 109 changed files with 20 additions and 20 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/ActionButton/ActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ You can also use a custom icon, for example from the vue-material-design-icons l
<ActionButton>
<template #icon>
<HandBackLeft
:size="24"
:size="20"
decorative
title="" />
</template>
Expand All @@ -58,7 +58,7 @@ You can also use a custom icon, for example from the vue-material-design-icons l
<ActionButton>
<template #icon>
<HandBackRight
:size="24"
:size="20"
decorative
title="" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionInput/ActionInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ For the multiselect component, all events will be passed through. Please see the
<!-- allow the custom font to inject a ::before
not possible on input[type=submit] -->
<label v-show="!disabled" :for="id" class="action-input__label">
<ArrowRight :size="24" title="" decorative />
<ArrowRight :size="20" title="" decorative />
</label>
</template>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionTextEditable/ActionTextEditable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ All undocumented attributes will be bound to the textarea. e.g. `maxlength`
<!-- allow the custom font to inject a ::before
not possible on input[type=submit] -->
<label v-show="!disabled" :for="id" class="action-text-editable__label">
<ArrowRight :size="24" title="" decorative />
<ArrowRight :size="20" title="" decorative />
</label>
</form>
</span>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Actions/Actions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ It can be used with one or multiple actions.
<button @click="toggled = !toggled">Toggle multiple action</button>
<Actions>
<template #icon>
<DotsHorizontalCircleOutline :size="24" decorative />
<DotsHorizontalCircleOutline :size="20" decorative />
</template>
<ActionButton>
<template #icon>
<MicrophoneOff :size="24" decorative />
<MicrophoneOff :size="20" decorative />
</template>
Mute
</ActionButton>
Expand Down Expand Up @@ -192,7 +192,7 @@ export default {
@focus="onFocus"
@blur="onBlur">
<slot v-if="iconSlotIsPopulated" name="icon" />
<DotsHorizontal v-else-if="defaultIcon === ''" :size="24" decorative />
<DotsHorizontal v-else-if="defaultIcon === ''" :size="20" decorative />
{{ menuTitle }}
</button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
:class="{'icon-collapse--rotated':open}"
type="button"
@click="onClick">
<MenuDown :size="24" title="" decorative />
<MenuDown :size="20" title="" decorative />
</button>
</template>

Expand Down
4 changes: 2 additions & 2 deletions src/components/AppNavigationItem/InputConfirmCancel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
class="app-navigation-input-confirm__confirm"
:aria-label="labelConfirm"
@click.stop.prevent="confirm">
<ArrowRight :size="24" decorative title="" />
<ArrowRight :size="20" decorative title="" />
</button>

<button type="reset"
class="app-navigation-input-confirm__close"
:aria-label="labelCancel"
@click.stop.prevent="cancel">
<Close :size="24" decorative title="" />
<Close :size="20" decorative title="" />
</button>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class="settings-button"
type="button"
@click="toggleMenu">
<Cog class="settings-button__icon" :size="24" decorative />
<Cog class="settings-button__icon" :size="20" decorative />
<span class="settings-button__label">{{ title }}</span>
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppNavigationToggle/AppNavigationToggle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
aria-controls="app-navigation-vue"
@click="toggleNavigation">
<template #icon>
<Menu :size="24"
<Menu :size="20"
title=""
decorative />
</template>
Expand Down
4 changes: 2 additions & 2 deletions src/components/AppSidebar/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ include a standard-header like it's used by the files app.
subtitle="last edited 3 weeks ago">
<AppSidebarTab icon="icon-settings" name="Settings" id="settings">
<template #icon>
<Cog :size="24" decorative />
<Cog :size="20" decorative />
</template>
Settings tab content
</AppSidebarTab>
Expand Down Expand Up @@ -153,7 +153,7 @@ include a standard-header like it's used by the files app.
href="#"
class="app-sidebar__close"
@click.prevent="closeSidebar">
<Close class="app-sidebar__close-icon" :size="24" decorative />
<Close class="app-sidebar__close-icon" :size="20" decorative />
</a>

<!-- container for figure and description, allows easy switching to compact mode -->
Expand Down
2 changes: 1 addition & 1 deletion src/components/Avatar/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<template #trigger>
<div v-if="contactsMenuLoading" class="icon-loading" />
<DotsHorizontal v-else
:size="24"
:size="20"
class="icon-more"
title=""
decorative />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/Breadcrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ is dropped on a creadcrumb.
<Breadcrumbs @dropped="dropped">
<Breadcrumb title="Home" href="/" @dropped="droppedOnCrumb">
<template #icon>
<Folder :size="24" decorative />
<Folder :size="20" decorative />
</template>
</Breadcrumb>
<Breadcrumb title="Folder 1" href="/Folder 1" />
Expand Down
6 changes: 3 additions & 3 deletions src/components/ColorPicker/ColorPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default {
type="button"
@click="pickColor(color)">
<Check v-if="color === currentColor"
:size="24"
:size="20"
title=""
decorative />
</button>
Expand All @@ -144,14 +144,14 @@ export default {
class="color-picker__navigation-button back"
type="button"
@click="handleBack">
<ArrowLeft :size="24" title="" decorative />
<ArrowLeft :size="20" title="" decorative />
</button>
<button
v-if="!advanced"
class="color-picker__navigation-button more-settings"
type="button"
@click="handleMoreSettings">
<DotsHorizontal :size="24" title="" decorative />
<DotsHorizontal :size="20" title="" decorative />
</button>
<button
v-if="advanced"
Expand Down
2 changes: 1 addition & 1 deletion src/components/SettingsSection/SettingsSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This component is to be used in the settings section of nextcloud.
class="settings-section__info"
role="note"
:title="docTitleTranslated">
<HelpCircle :size="24" decorative title="" />
<HelpCircle :size="20" decorative title="" />
</a>
</h2>
<p v-if="hasDescription"
Expand Down

0 comments on commit 118af82

Please sign in to comment.