Skip to content

Commit

Permalink
Merge pull request #1542 from nextcloud/add/deafult_font_size
Browse files Browse the repository at this point in the history
Add default font and line size
  • Loading branch information
skjnldsv authored Nov 5, 2020
2 parents dcac5c9 + 48dc0e0 commit 9fb1e94
Show file tree
Hide file tree
Showing 197 changed files with 16 additions and 13 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.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
2 changes: 1 addition & 1 deletion src/components/AppSidebar/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ $top-buttons-spacing: 6px;
.app-sidebar-header__subtitle {
padding: 0;
opacity: $opacity_normal;
font-size: 14px;
font-size: var(--default-font-size);
}

.app-sidebar-header__maintitle-form {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Avatar/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,8 @@ export default {
bottom: -4px;
height: 18px;
width: 18px;
line-height: 14px;
font-size: 14px;
line-height: 15px;
font-size: var(--default-font-size);
border: 2px solid var(--color-main-background);
background-color: var(--color-main-background);
border-radius: 50%;
Expand Down Expand Up @@ -718,7 +718,7 @@ export default {
.popovermenu {
display: block;
margin: 0;
font-size: 14px;
font-size: var(--default-font-size);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/RichContenteditable/AutoCompleteResult.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ $autocomplete-padding: 10px;
border: 2px solid var(--color-main-background);
border-radius: 50%;
background-color: var(--color-main-background);
font-size: 14px;
line-height: 14px;
font-size: var(--default-font-size);
line-height: 15px;
&--online {
color: #49b382;

Expand Down
4 changes: 3 additions & 1 deletion styleguide/assets/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
--border-radius-large:10px;
--border-radius-pill:100px;
--font-face:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
--default-font-size:15px;
--default-line-height:24px;
--animation-quick:100ms;
--animation-slow:300ms
--animation-slow:300ms;
}
13 changes: 7 additions & 6 deletions tests/visual/components/AppSidebar/AppSidebar.visual.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,14 @@ describe('AppSidebar.vue', () => {
compact.forEach(comp => {
header.forEach(head => {
secondary.forEach(second => {
// TODO remove when https://github.com/mjhea0/cypress-visual-regression/pull/56
const fileName = `AppSidebar.vue
subtitle_${subtitle ? 'true' : 'null'}
starred_${star === null ? 'null' : star ? 'true' : 'false'}
compact_${comp ? 'true' : 'false'}
header_${head ? 'image' : 'none'}
secondary_${second ? 'button' : 'none'}
editable_${editable ? 'true' : 'false'}
-subtitle_${subtitle ? 'true' : 'null'}
-starred_${star === null ? 'null' : star ? 'true' : 'false'}
-compact_${comp ? 'true' : 'false'}
-header_${head ? 'image' : 'none'}
-secondary_${second ? 'button' : 'none'}
-editable_${editable ? 'true' : 'false'}
`.replace(/(\n|\t)/gi, '')

const defaultOptions = {
Expand Down

0 comments on commit 9fb1e94

Please sign in to comment.