Skip to content
This repository has been archived by the owner on Jan 3, 2024. It is now read-only.

Make ui small again #2270

Merged
merged 21 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
18 changes: 6 additions & 12 deletions src/components/atoms/OcButton/OcButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default {
background-color: transparent;
border-style: none;
color: $color;
font-size: 1rem;
font-size: var(--oc-font-size-small);
font-weight: normal;
min-height: 0;
padding: 0;
Expand Down Expand Up @@ -264,7 +264,7 @@ export default {
color: var(--oc-color-text-inverse);
display: inline-flex;
font-weight: 400;
padding: 0.5rem 0.75rem;
padding: 0.4rem 0.7rem;
text-align: center;
text-decoration: none;

Expand Down Expand Up @@ -323,21 +323,21 @@ export default {
&-s {
@include oc-button-line-height(0.7);

font-size: 0.9rem;
font-size: 0.875rem;
min-height: 1.2rem;
}

&-m {
@include oc-button-line-height(1);

font-size: 1.125rem;
font-size: 1rem;
lookacat marked this conversation as resolved.
Show resolved Hide resolved
min-height: $global-control-height;
}

&-l {
@include oc-button-line-height(1.5);

font-size: 1.5rem;
font-size: 1.375rem;
min-height: 2rem;
}

Expand All @@ -362,13 +362,7 @@ export default {
&-filled {
@extend .oc-background-primary-gradient;
color: var(--oc-color-swatch-inverse-default) !important;

border: 1px solid
linear-gradient(
90deg,
var(--oc-color-swatch-primary-muted) 0%,
var(--oc-color-swatch-primary-gradient) 100%
) !important;
padding: calc(0.4rem + 1px) 0.7rem;

span > svg {
fill: var(--oc-color-swatch-inverse-default) !important;
Expand Down
1 change: 1 addition & 0 deletions src/components/atoms/OcResourceIcon/OcResourceIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default {
.oc-resource-icon {
display: inline-flex;
align-items: center;
vertical-align: middle;
&-file svg {
height: 70%;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/OcBreadcrumb/OcBreadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export default {
a,
button,
span {
font-size: 1rem;
font-size: var(--oc-font-size-small);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/styles/theme/oc-text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ td.oc-text-break {
}

.oc-text-initial {
font-size: 1rem;
font-size: var(--oc-font-size-small);
}

.oc-text-small {
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/ods/font.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
font:
size:
default:
value: 1rem
value: 0.88rem
small:
value: 0.88rem
medium:
Expand Down
6 changes: 3 additions & 3 deletions src/tokens/ods/size.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ size:
value: 150px
max-height:
logo:
value: 65px
value: 60px
height:
small:
value: 50px
table-row:
value: 49px
value: 46px
width:
xsmall:
value: 100px
Expand All @@ -19,6 +19,6 @@ size:
medium:
value: 300px
icon-default:
value: 24px
value: 22px
form-check-default:
value: 16px