Skip to content

Commit

Permalink
Merge branch 'main' into font-variables
Browse files Browse the repository at this point in the history
* main:
  chore(demo): copy spaces styles on click (taiga-family#203)
  feat(kit): allow configuration of default checkbox options (taiga-family#139)
  chore(i18n, demo): update i18n instructions (taiga-family#208)
  fix(i18n): correct inconsistencies in English translations (taiga-family#207)
  feat(i18n): add Dutch with 100% support (taiga-family#206)
  chore(i18n): add Turkish to exports
  feat(i18n): add Turkish with 100% support (taiga-family#200)
  chore(demo): fix import sample

# Conflicts:
#	projects/demo/src/modules/markup/typography/typography.template.html
  • Loading branch information
fynnfeldpausch committed Feb 5, 2021
2 parents 56528fc + e858b03 commit 3237de0
Show file tree
Hide file tree
Showing 114 changed files with 1,000 additions and 246 deletions.
6 changes: 3 additions & 3 deletions projects/addon-charts/components/axes/axes.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
}

.name {
.text-body-xs();
font: var(--tui-font-text-xs);
writing-mode: tb;
text-align: center;
padding-left: 12px;
Expand All @@ -74,7 +74,7 @@
}

.labels-y {
.text-body-xs();
font: var(--tui-font-text-xs);
display: flex;
flex-direction: column-reverse;
justify-content: space-between;
Expand Down Expand Up @@ -109,7 +109,7 @@
}

.labels-x {
.text-body-xs();
font: var(--tui-font-text-xs);
display: flex;
border-right: 1px solid transparent;
color: var(--tui-text-02);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

.hint {
.shadow();
.text-body-xs();
font: var(--tui-font-text-xs);
position: absolute;
height: 20px;
line-height: 20px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

.content {
.fullsize();
.text-body-m();
font: var(--tui-font-text-m);
line-height: 20px;
display: flex;
max-height: 100%;
Expand All @@ -48,20 +48,20 @@
color: var(--tui-text-02);

:host[data-tui-host-size='m'] & {
.text-body-xs();
font: var(--tui-font-text-xs);
}
}

.wrapper:first-line {
color: var(--tui-text-01);

:host[data-tui-host-size='l'] & {
.text-body-l();
font: var(--tui-font-text-l);
font-weight: bold;
}

:host[data-tui-host-size='m'] & {
.text-body-m();
font: var(--tui-font-text-m);
font-weight: bold;
}
}
Expand Down
4 changes: 2 additions & 2 deletions projects/addon-doc/src/components/code/code.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

.header {
.text-body-s();
font: var(--tui-font-text-s);
font-weight: bold;
}

Expand All @@ -15,7 +15,7 @@

// highlightjs added class
.hljs:not(:empty) {
.text-body-m();
font: var(--tui-font-text-m);
.customize-scroll();
padding: 24px 32px;
font-family: monospace;
Expand Down
2 changes: 1 addition & 1 deletion projects/addon-doc/src/components/demo/demo.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
}

.resizer-text {
.text-body-s();
font: var(--tui-font-text-s);
position: relative;
z-index: 1;
padding: 12px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

.property {
.text-body-m();
font: var(--tui-font-text-m);
margin-bottom: @space;
font-family: monospace;
color: @color-property;
Expand Down
6 changes: 3 additions & 3 deletions projects/addon-doc/src/components/example/example.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
}

.title {
.text-h5();
font: var(--tui-font-heading-5);
margin: 0 0 8px;

@media @mobile {
.text-h6();
font: var(--tui-font-heading-6);
}
}

.description {
.text-body-m();
font: var(--tui-font-text-m);
font-weight: normal;
margin: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

.sublink {
.clearbtn();
.text-body-m();
font: var(--tui-font-text-m);
margin-left: 8px;
line-height: 44px;

Expand Down
4 changes: 2 additions & 2 deletions projects/addon-doc/src/components/page/page.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.header {
.text-h3();
font: var(--tui-font-heading-3);
display: flex;
flex-wrap: wrap;
min-height: 116px;
Expand All @@ -21,7 +21,7 @@
margin: 0 ~'min(10vw, 140px)';

@media @tablet-s {
.text-h4();
font: var(--tui-font-heading-4);
min-height: 72px;
padding: 20px 20px 0;
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.label {
.text-body-s();
font: var(--tui-font-text-s);
height: var(--tui-height-l);
box-sizing: border-box;
padding: 7px 16px;
Expand All @@ -17,7 +17,7 @@
}

.url {
.text-body-m();
font: var(--tui-font-text-m);
display: flex;
color: var(--tui-text-02);
}
Expand Down
2 changes: 1 addition & 1 deletion projects/addon-editor/components/editor/editor.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:host {
.createStackingContext();
.text-body-m();
font: var(--tui-font-text-m);
display: block;
}

Expand Down
2 changes: 1 addition & 1 deletion projects/addon-table/components/reorder/reorder.style.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'taiga-ui-local';

:host {
.text-body-s();
font: var(--tui-font-text-s);
display: block;
padding: 8px 0;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'taiga-ui-local';

:host {
.text-body-s();
font: var(--tui-font-text-s);
display: flex;
align-items: center;
color: var(--tui-text-03);
Expand Down
4 changes: 2 additions & 2 deletions projects/core/components/data-list/data-list.style.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/taiga-ui-local.less';

tui-data-list {
.text-body-m();
font: var(--tui-font-text-m);
display: flex;
flex-direction: column;
padding: 8px 0;
Expand All @@ -23,7 +23,7 @@ tui-data-list {
}

tui-opt-group {
.text-body-xs();
font: var(--tui-font-text-xs);
.text-overflow();
position: relative;
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions projects/core/components/data-list/option/option.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:host {
.clearbtn();
.text-body-m();
font: var(--tui-font-text-m);
.transition(background);
display: flex;
width: 100%;
Expand Down Expand Up @@ -31,7 +31,7 @@
}

&[data-size='xs'] {
.text-body-s();
font: var(--tui-font-text-s);
min-height: 32px + 16px;
}

Expand Down
2 changes: 1 addition & 1 deletion projects/core/components/dialog/dialog.style.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/taiga-ui-local.less';

:host {
.text-body-m();
font: var(--tui-font-text-m);
position: relative;
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
}

.tooltip {
.text-body-s();
font: var(--tui-font-text-s);
word-wrap: break-word;

:host[data-tui-host-mode='overflow'] & {
Expand Down
2 changes: 1 addition & 1 deletion projects/core/components/label/label.style.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.label {
.text-body-s();
font: var(--tui-font-text-s);
max-width: 100%;
align-self: inherit;
overflow: inherit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

&_weekday {
.text-body-s();
font: var(--tui-font-text-s);
color: var(--tui-text-02);
pointer-events: none;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/taiga-ui-local.less';

:host {
.text-body-l();
font: var(--tui-font-text-l);
display: block;
text-align: center;
font-weight: bold;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.heading {
.text-body-m();
font: var(--tui-font-text-m);
line-height: 20px;
font-weight: bold;
margin: 0;
Expand Down
6 changes: 3 additions & 3 deletions projects/core/styles/markup/tui-form.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.tui-form {
&__header {
.text-h5();
font: var(--tui-font-heading-5);
margin: @fields-space-large 0 @fields-space;

&_margin-top_none {
Expand All @@ -25,7 +25,7 @@
}

@media @mobile {
.text-body-l();
font: var(--tui-font-text-l);
font-weight: bold;
margin-bottom: @fields-space-mobile;
}
Expand Down Expand Up @@ -85,7 +85,7 @@
}

&__field-note {
.text-body-s();
font: var(--tui-font-text-s);
margin-top: @space;
color: var(--tui-text-02);
}
Expand Down
12 changes: 6 additions & 6 deletions projects/core/styles/markup/tui-island.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
}

&_size_s {
.text-body-s();
font: var(--tui-font-text-s);
padding: @padding;
}

&_size_m {
.text-body-m();
font: var(--tui-font-text-m);
padding: @padding;
}

&_size_l {
.text-body-m();
font: var(--tui-font-text-m);
padding: @padding-large;
}

Expand Down Expand Up @@ -95,16 +95,16 @@
}

&__title {
.text-body-m();
font: var(--tui-font-text-m);
margin: 0 0 @space * 2;

.tui-island_size_m & {
.text-h6();
font: var(--tui-font-heading-6);
margin: 0 0 @space * 3;
}

.tui-island_size_l & {
.text-h6();
font: var(--tui-font-heading-6);
}
}

Expand Down
8 changes: 4 additions & 4 deletions projects/core/styles/markup/tui-list.less
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.tui-list {
.text-body-m();
font: var(--tui-font-text-m);
list-style-type: none;
color: var(--tui-text-01);

&_large {
.text-body-l();
font: var(--tui-font-text-l);
}

&_small,
&_extra-small {
.text-body-s();
font: var(--tui-font-text-s);
}

&_nested {
Expand Down Expand Up @@ -93,7 +93,7 @@
}

&__item-title {
.text-h5();
font: var(--tui-font-heading-5);
margin: 0;

.tui-list_small & {
Expand Down
Loading

0 comments on commit 3237de0

Please sign in to comment.