From 4c59940b2f169b9d39cbc418121b8d37fb28c1aa Mon Sep 17 00:00:00 2001
From: alexnatalia <alekseenko@soramitsu.co.jp>
Date: Tue, 22 Jun 2021 01:08:30 +0300
Subject: [PATCH 1/3] Removed font feature settings.

---
 package.json              | 2 +-
 src/styles/button.scss    | 1 -
 src/styles/common.scss    | 4 ----
 src/styles/dialog.scss    | 1 -
 src/styles/root.scss      | 9 ---------
 src/styles/variables.scss | 9 ---------
 6 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/package.json b/package.json
index e9824326..2104a951 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
diff --git a/src/styles/button.scss b/src/styles/button.scss
index c9d80ba7..9925901f 100644
--- a/src/styles/button.scss
+++ b/src/styles/button.scss
@@ -160,7 +160,6 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
     }
   }
   span {
-    font-feature-settings: var(--s-font-feature-settings-heading);
     @include font-weight(700, true);
   }
   &:not(.s-action) > span {
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 5f400cec..08c933d4 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -5,7 +5,6 @@
 
 html {
   box-sizing: border-box;
-  font-feature-settings: var(--s-font-feature-settings-common);
 }
 
 *, *:before, *:after {
@@ -24,7 +23,6 @@ h1, h2, h3, h4, h5, h6,
 .ch1, .ch2,
 .p1 {
   @include font-weight(400);
-  font-feature-settings: var(--s-font-feature-settings-heading);
 }
 
 h1, h2, h3, h4, h5, h6,
@@ -33,7 +31,6 @@ h1, h2, h3, h4, h5, h6,
 .ch1, .ch2, .ch3,
 .p1, .p2, .p3, .p4 {
   font-family: $s-font-family-default;
-  font-feature-settings: var(--s-font-feature-settings-heading);
 }
 
 h1, h2,
@@ -133,7 +130,6 @@ h6,
   letter-spacing: var(--s-letter-spacing-extra-large);
   line-height: var(--s-line-height-base);
   font-size: var(--s-heading8-font-size);
-  font-feature-settings: var(--s-font-feature-settings-caps);
 }
 
 .p1 {
diff --git a/src/styles/dialog.scss b/src/styles/dialog.scss
index 9f16603d..e8cb49d1 100644
--- a/src/styles/dialog.scss
+++ b/src/styles/dialog.scss
@@ -27,7 +27,6 @@
   .el-dialog__title {
     font-size: var(--s-heading5-font-size);
     color: var(--s-color-base-content-primary);
-    font-feature-settings: var(--s-font-feature-settings-heading);
   }
   > * {
     word-break: break-word;
diff --git a/src/styles/root.scss b/src/styles/root.scss
index c6cd697e..2774d224 100644
--- a/src/styles/root.scss
+++ b/src/styles/root.scss
@@ -67,15 +67,6 @@
   --s-letter-spacing-big: #{$s-letter-spacing-big};
   --s-letter-spacing-large: #{$s-letter-spacing-large};
   --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large};
-  // Font Feature Settings
-  --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common
-  --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading
-  --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading
-  --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps
-  --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline
-  --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title
-  --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input
-  --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button
   // Size
   --s-size-mini: #{$s-size-mini};
   --s-size-small: #{$s-size-small};
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8a37773d..a8396ec0 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -105,15 +105,6 @@ $s-letter-spacing-medium: -0.01em !default;
 $s-letter-spacing-big: 0.01em !default;
 $s-letter-spacing-large: 0.03em !default;
 $s-letter-spacing-extra-large: 0.06em !default;
-// Font Feature Settings
-$s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on !default;
-$s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on !default;
-$s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on !default;
-$s-font-feature-settings-caps: "case" on !default;
-$s-font-feature-settings-singleline: "salt" on, "case" on !default;
-$s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on !default;
-$s-font-feature-settings-input: "tnum" on, "lnum" on !default;
-$s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on !default;
 
 // Responsive
 $--sm: 640px !default;

From 6a62033420facf806f0632450af7adb641f00d17 Mon Sep 17 00:00:00 2001
From: alexnatalia <alekseenko@soramitsu.co.jp>
Date: Tue, 22 Jun 2021 13:09:24 +0300
Subject: [PATCH 2/3] Revert "Removed font feature settings."

This reverts commit 4c59940b2f169b9d39cbc418121b8d37fb28c1aa.
---
 package.json              | 2 +-
 src/styles/button.scss    | 1 +
 src/styles/common.scss    | 4 ++++
 src/styles/dialog.scss    | 1 +
 src/styles/root.scss      | 9 +++++++++
 src/styles/variables.scss | 9 +++++++++
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2104a951..e9824326 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "0.9.8",
+  "version": "0.9.7",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
diff --git a/src/styles/button.scss b/src/styles/button.scss
index 9925901f..c9d80ba7 100644
--- a/src/styles/button.scss
+++ b/src/styles/button.scss
@@ -160,6 +160,7 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
     }
   }
   span {
+    font-feature-settings: var(--s-font-feature-settings-heading);
     @include font-weight(700, true);
   }
   &:not(.s-action) > span {
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 08c933d4..5f400cec 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -5,6 +5,7 @@
 
 html {
   box-sizing: border-box;
+  font-feature-settings: var(--s-font-feature-settings-common);
 }
 
 *, *:before, *:after {
@@ -23,6 +24,7 @@ h1, h2, h3, h4, h5, h6,
 .ch1, .ch2,
 .p1 {
   @include font-weight(400);
+  font-feature-settings: var(--s-font-feature-settings-heading);
 }
 
 h1, h2, h3, h4, h5, h6,
@@ -31,6 +33,7 @@ h1, h2, h3, h4, h5, h6,
 .ch1, .ch2, .ch3,
 .p1, .p2, .p3, .p4 {
   font-family: $s-font-family-default;
+  font-feature-settings: var(--s-font-feature-settings-heading);
 }
 
 h1, h2,
@@ -130,6 +133,7 @@ h6,
   letter-spacing: var(--s-letter-spacing-extra-large);
   line-height: var(--s-line-height-base);
   font-size: var(--s-heading8-font-size);
+  font-feature-settings: var(--s-font-feature-settings-caps);
 }
 
 .p1 {
diff --git a/src/styles/dialog.scss b/src/styles/dialog.scss
index e8cb49d1..9f16603d 100644
--- a/src/styles/dialog.scss
+++ b/src/styles/dialog.scss
@@ -27,6 +27,7 @@
   .el-dialog__title {
     font-size: var(--s-heading5-font-size);
     color: var(--s-color-base-content-primary);
+    font-feature-settings: var(--s-font-feature-settings-heading);
   }
   > * {
     word-break: break-word;
diff --git a/src/styles/root.scss b/src/styles/root.scss
index 2774d224..c6cd697e 100644
--- a/src/styles/root.scss
+++ b/src/styles/root.scss
@@ -67,6 +67,15 @@
   --s-letter-spacing-big: #{$s-letter-spacing-big};
   --s-letter-spacing-large: #{$s-letter-spacing-large};
   --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large};
+  // Font Feature Settings
+  --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common
+  --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading
+  --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading
+  --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps
+  --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline
+  --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title
+  --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input
+  --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button
   // Size
   --s-size-mini: #{$s-size-mini};
   --s-size-small: #{$s-size-small};
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index a8396ec0..8a37773d 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -105,6 +105,15 @@ $s-letter-spacing-medium: -0.01em !default;
 $s-letter-spacing-big: 0.01em !default;
 $s-letter-spacing-large: 0.03em !default;
 $s-letter-spacing-extra-large: 0.06em !default;
+// Font Feature Settings
+$s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on !default;
+$s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on !default;
+$s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on !default;
+$s-font-feature-settings-caps: "case" on !default;
+$s-font-feature-settings-singleline: "salt" on, "case" on !default;
+$s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on !default;
+$s-font-feature-settings-input: "tnum" on, "lnum" on !default;
+$s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on !default;
 
 // Responsive
 $--sm: 640px !default;

From 882596ccc3a937d6d7e3f65171b09c623da6d721 Mon Sep 17 00:00:00 2001
From: alexnatalia <alekseenko@soramitsu.co.jp>
Date: Tue, 22 Jun 2021 13:13:00 +0300
Subject: [PATCH 3/3] Refactored due to PR comments.

---
 package.json         |  2 +-
 src/styles/root.scss | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index e9824326..2104a951 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
diff --git a/src/styles/root.scss b/src/styles/root.scss
index c6cd697e..741d0318 100644
--- a/src/styles/root.scss
+++ b/src/styles/root.scss
@@ -68,14 +68,14 @@
   --s-letter-spacing-large: #{$s-letter-spacing-large};
   --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large};
   // Font Feature Settings
-  --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common
-  --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading
-  --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading
-  --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps
-  --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline
-  --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title
-  --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input
-  --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button
+  --s-font-feature-settings-common: #{$s-font-feature-settings-common};
+  --s-font-feature-settings-heading: #{$s-font-feature-settings-heading};
+  --s-font-feature-settings-caps-heading: #{$s-font-feature-settings-caps-heading};
+  --s-font-feature-settings-caps: #{$s-font-feature-settings-caps};
+  --s-font-feature-settings-singleline: #{$s-font-feature-settings-singleline};
+  --s-font-feature-settings-card-title: #{$s-font-feature-settings-card-title};
+  --s-font-feature-settings-input: #{$s-font-feature-settings-input};
+  --s-font-feature-settings-button: #{$s-font-feature-settings-button};
   // Size
   --s-size-mini: #{$s-size-mini};
   --s-size-small: #{$s-size-small};