Skip to content
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.

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

Update Typescript definitions and font size #1057

Merged
merged 4 commits into from
Apr 28, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion packages/zent/assets/alert.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

@mixin vertical-center {
position: absolute;
Expand All @@ -19,7 +20,7 @@ $close-icon-size: 14px;
.zent-alert {
box-sizing: border-box;
width: 100%;
font-size: 12px;
font-size: $font-size-normal;
line-height: 12px;
position: relative;

Expand Down
8 changes: 5 additions & 3 deletions packages/zent/assets/avatar.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import './theme/default';
@import './theme/font';

$avatar-size-small: 24px;
$avatar-size-default: 32px;
$avatar-size-large: 40px;
Expand All @@ -11,7 +13,7 @@ $avatar-size-large: 40px;
cursor: default;
overflow: hidden;
position: relative;
font-size: 16px;
font-size: $font-size-large;

&--size-default {
width: $avatar-size-default;
Expand Down Expand Up @@ -49,7 +51,7 @@ $avatar-size-large: 40px;
}

&.zent-avatar--size-small {
font-size: 14px;
font-size: $font-size-normal;
}

&.zent-avatar--size-large {
Expand All @@ -62,7 +64,7 @@ $avatar-size-large: 40px;
font-size: 18px;

&.zent-avatar--size-small {
font-size: 14px;
font-size: $font-size-normal;
}

&.zent-avatar--size-large {
Expand Down
7 changes: 4 additions & 3 deletions packages/zent/assets/block-header.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-block-header {
position: relative;
Expand Down Expand Up @@ -26,7 +27,7 @@
margin: 0;
padding-left: 5px;
font-weight: normal;
font-size: 14px;
font-size: $font-size-normal;
}
}

Expand All @@ -42,7 +43,7 @@
&__pop {
display: inline-block;
color: $theme-stroke-4;
font-size: 16px;
font-size: $font-size-large;
}

&__tooltip {
Expand All @@ -52,7 +53,7 @@
&-trigger {
color: $theme-stroke-5;
margin-left: 10px;
font-size: 14px;
font-size: $font-size-normal;
cursor: pointer;
}
}
Expand Down
5 changes: 3 additions & 2 deletions packages/zent/assets/breadcrumb.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-breadcrumb {
color: $theme-stroke-3;
Expand All @@ -8,7 +9,7 @@

span,
a {
font-size: 14px;
font-size: $font-size-normal;
line-height: 1em;
display: inline-block;
vertical-align: middle;
Expand Down Expand Up @@ -53,7 +54,7 @@
min-width: 0;
border: 0;
background: transparent;
font-size: 14px;
font-size: $font-size-normal;
color: $theme-stroke-3;
text-align: center;
box-sizing: border-box;
Expand Down
7 changes: 4 additions & 3 deletions packages/zent/assets/card.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-card {
background-color: $theme-stroke-9;
Expand Down Expand Up @@ -36,17 +37,17 @@

&--normal {
.zent-card-header {
font-size: 16px;
font-size: $font-size-large;
}

.zent-card-body {
font-size: 14px;
font-size: $font-size-normal;
}
}

&--nested {
.zent-card-header {
font-size: 14px;
font-size: $font-size-normal;
background: $theme-stroke-8;
}
}
Expand Down
9 changes: 5 additions & 4 deletions packages/zent/assets/cascader.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

$c-border: $theme-stroke-4;
$c-blue: $theme-primary-1;
Expand Down Expand Up @@ -45,7 +46,7 @@ $c-blue-hover: $theme-primary-6;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 12px;
font-size: $font-size-normal;

&-content {
line-height: inherit;
Expand All @@ -61,7 +62,7 @@ $c-blue-hover: $theme-primary-6;
right: 10px;
top: 50%;
transition: transform 0.25s;
font-size: 12px;
font-size: $font-size-normal;
transform: scale(0.5);
}
}
Expand All @@ -79,7 +80,7 @@ $c-blue-hover: $theme-primary-6;
overflow: auto;

&-item {
font-size: 12px;
font-size: $font-size-normal;
cursor: pointer;
white-space: nowrap;
transition: all 0.3s;
Expand Down Expand Up @@ -143,7 +144,7 @@ $c-blue-hover: $theme-primary-6;
&-link {
cursor: pointer;
display: inline-block;
font-size: 12px;
font-size: $font-size-normal;
padding: 0 5px;
line-height: 18px;
vertical-align: middle;
Expand Down
3 changes: 2 additions & 1 deletion packages/zent/assets/colorpicker.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import './theme/default';
@import './theme/font';

$c-border: $theme-stroke-5;
$c-blue: $theme-primary-2;
$c-light-blue: $theme-primary-4;
Expand All @@ -10,7 +12,6 @@ $c-light-blue: $theme-primary-4;
.zent-color-picker {
cursor: pointer;
display: inline-block;
font-size: 12px;
margin-right: 10px;
outline: none;
position: relative;
Expand Down
3 changes: 2 additions & 1 deletion packages/zent/assets/date-range-quick-picker.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-date-range-picker__filter {
display: inline-block;
Expand All @@ -8,7 +9,7 @@
margin-left: 10px;
display: inline-block;
padding: 2px 4px;
font-size: 12px;
font-size: $font-size-normal;
color: $theme-stroke-4;
cursor: pointer;
box-sizing: border-box;
Expand Down
3 changes: 2 additions & 1 deletion packages/zent/assets/error-boundary.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@import './theme/default';
@import './theme/font';

.zent-error-boundary-fallback-component {
&__error {
color: $theme-error-2;
font-size: 14px;
font-size: $font-size-normal;

.zenticon-error-circle {
margin-right: 5px;
Expand Down
19 changes: 10 additions & 9 deletions packages/zent/assets/form.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-form {
margin-bottom: 30px;
Expand All @@ -22,7 +23,7 @@
margin-bottom: 20px;
width: 100%;
border-bottom: 1px solid $theme-stroke-6;
font-size: 14px;
font-size: $font-size-normal;
font-weight: bold;
}

Expand All @@ -39,7 +40,7 @@

.zent-form__static-value {
padding-top: 5px;
font-size: 14px;
font-size: $font-size-normal;
line-height: 18px;
padding-bottom: 5px;
word-break: break-all;
Expand All @@ -48,13 +49,13 @@
.zent-form__control-action {
padding-top: 5px;
display: inline-block;
font-size: 14px;
font-size: $font-size-normal;
line-height: 18px;
}

.zent-form__required {
margin-right: 6px;
font-size: 16px;
font-size: $font-size-large;
color: $theme-error-1;
vertical-align: middle;
}
Expand All @@ -64,13 +65,13 @@
.zent-form__help-desc,
.zent-form__notice-desc {
line-height: 14px;
font-size: 12px;
font-size: $font-size-small;
margin-top: 10px;
margin-bottom: 0;
color: $theme-stroke-3;

ul li {
font-size: 12px;
font-size: $font-size-small;
line-height: 12px;
}

Expand All @@ -94,7 +95,7 @@
.zent-form__control-label {
display: inline-block;
width: 120px;
font-size: 12px;
font-size: $font-size-normal;
line-height: 30px;
text-align: right;
vertical-align: top;
Expand Down Expand Up @@ -139,7 +140,7 @@

.zent-form__control-label {
display: inline-block;
font-size: 12px;
font-size: $font-size-normal;
vertical-align: top;

& + .zent-form__controls {
Expand All @@ -153,7 +154,7 @@
.zent-form--vertical {
.zent-form__control-label {
display: block;
font-size: 12px;
font-size: $font-size-normal;
margin-bottom: 10px;
}
}
5 changes: 3 additions & 2 deletions packages/zent/assets/grid.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
@import './theme/default';
@import './theme/font';

$thead-background-color: $theme-stroke-7;
$border-color: $theme-stroke-6;

.zent-grid {
font-size: 12px;
font-size: $font-size-normal;
color: $theme-stroke-1;
position: relative;
line-height: 1.5;
Expand Down Expand Up @@ -236,7 +237,7 @@ $border-color: $theme-stroke-6;

&-th,
&-td {
font-size: 14px;
font-size: $font-size-normal;
display: table-cell;
box-sizing: border-box;
box-shadow: inset 0 -1px 0 0 $theme-stroke-6;
Expand Down
3 changes: 2 additions & 1 deletion packages/zent/assets/input.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import './theme/default';
@import './theme/font';

$defaultBorderColor: $theme-stroke-5;
$errorBorderColor: $theme-error-4;
$borderRadius: 2px;
Expand Down Expand Up @@ -68,7 +69,7 @@ $large-size: 40px;
color: $theme-stroke-5;

&-close-circle {
font-size: 12px;
font-size: $font-size-small;
right: 10px;
cursor: pointer;
padding: 4px 0;
Expand Down
3 changes: 2 additions & 1 deletion packages/zent/assets/mixins/_popup.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '../theme/default';
@import '../theme/font';

@mixin popup {
box-shadow: $shadow-spec-layer;
Expand All @@ -11,5 +12,5 @@
background-color: $theme-stroke-9;
max-height: 224px;
border-radius: 3px;
font-size: 12px;
font-size: $font-size-normal;
}
3 changes: 2 additions & 1 deletion packages/zent/assets/notify.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

.zent-notify-container {
z-index: 10000;
Expand All @@ -18,7 +19,7 @@
line-height: 40px;
max-height: 200px;
overflow-y: auto;
font-size: 14px;
font-size: $font-size-normal;
color: $theme-stroke-9;
text-align: center;
border-radius: 2px;
Expand Down
1 change: 1 addition & 0 deletions packages/zent/assets/pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.zent-pagination {
display: flex;
font-size: $font-size-normal;

&-page-list--normal,
&-page-list--mini,
Expand Down
5 changes: 3 additions & 2 deletions packages/zent/assets/preview-image.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './theme/default';
@import './theme/font';

$graycolor: $theme-stroke-3;
$rgbamaskbgcolor: rgba(black, 0.6);
Expand Down Expand Up @@ -60,7 +61,7 @@ $rgbamaskbgcolor: rgba(black, 0.6);
line-height: 40px;
color: $theme-stroke-1;
z-index: 2;
font-size: 16px;
font-size: $font-size-large;

&.image-p-footer-paging {
min-width: 216px;
Expand All @@ -79,7 +80,7 @@ $rgbamaskbgcolor: rgba(black, 0.6);
cursor: pointer;
padding: 0 30px;
user-select: none;
font-size: 16px;
font-size: $font-size-large;
min-width: 65px;
text-align: center;

Expand Down
Loading