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

feat: remove font bold #665

Merged
merged 8 commits into from
May 2, 2023
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
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ License details can be found in the `LICENSE` file. It's available in each packa

>The font "Proxima Nova Fin" shall only be used within Refinitiv products or services. The copyright owner must approve any use of such font outside of Refinitiv products or services, which may be subject to a fee. Please see https://www.fontspring.com/lic/fontspring/webfont#license_text
>
>Font styles in Halo theme are only Regular, Semi Bold and Bold. Do not use 'Italic' style due to the license on Proxima Nova Fin font.
>Do not use 'Italic' style due to the license on Proxima Nova Fin font.
4 changes: 2 additions & 2 deletions documents/src/pages/elements/heatmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ const generateData = (r, c) => {

el.tooltipCallback = (cell) => {
const tooltip = document.createElement('div');
const template = "<div style='font-weight: bold'>Actual value:</div><div style='color:"+ cell.color +"'>" + cell.value + "</div>";
const template = "<div style='font-weight: 600'>Actual value:</div><div style='color:"+ cell.color +"'>" + cell.value + "</div>";
tooltip.innerHTML = template;
return tooltip;
};
Expand All @@ -435,7 +435,7 @@ const el = document.querySelector("ef-heatmap");
el.tooltipCallback = (cell) => {
const tooltip = document.createElement("div");
const template = `
<div style="font-weight: bold">Actual value:</div>
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
`;
tooltip.innerHTML = template;
Expand Down
4 changes: 2 additions & 2 deletions documents/src/pages/elements/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ const tooltip = document.getElementById('symbol-tooltip');
tooltip.renderer = (target) => {
const ret = document.createElement('div');
const title = document.createElement('div');
title.style.fontWeight = 'bold';
title.style.fontWeight = '600';
title.style.paddingBottom = '3px';
const price = document.createElement('div');
ret.appendChild(title);
Expand Down Expand Up @@ -310,7 +310,7 @@ const tooltip = document.getElementById('symbol-tooltip');
tooltip.renderer = (target) => {
const ret = document.createElement('div');
const title = document.createElement('div');
title.style.fontWeight = 'bold';
title.style.fontWeight = '600';
title.style.paddingBottom = '3px';
const price = document.createElement('div');
ret.appendChild(title);
Expand Down
13 changes: 2 additions & 11 deletions documents/src/pages/styles/typography.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ In accordance with Refinitiv's Halo Design System, the default font in your appl

*>The font "Proxima Nova Fin" shall only be used within Refinitiv products or services. The copyright owner must approve any use of such font outside of Refinitiv products or services, which may be subject to a fee. Please see https://www.fontspring.com/lic/fontspring/webfont#license_text

x> Font styles in Halo theme are only Regular, Semi Bold and Bold. Do not use 'Italic' style due to the license on Proxima Nova Fin font.
x> Font styles in Halo theme are only Regular and Semi Bold. Do not use 'Italic' style due to the license on Proxima Nova Fin font.

::
```css
.semibold {
font-weight: 500;
}
.bold {
font-weight: 600;
}
.fonts {
font-size: 24px;
}
Expand All @@ -32,18 +29,12 @@ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
a b c d e f g h i j k l m n o p q r s t u v w x y z
0 1 2 3 4 5 6 7 8 9
</div>
<h6>Proxima Nova Fin Semibold (500)</h6>
<h6>Proxima Nova Fin Semibold (500, 600)</h6>
<div class="fonts semibold">
A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
a b c d e f g h i j k l m n o p q r s t u v w x y z
0 1 2 3 4 5 6 7 8 9
</div>
<h6>Proxima Nova Fin Bold (600)</h6>
<div class="fonts bold">
A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
a b c d e f g h i j k l m n o p q r s t u v w x y z
0 1 2 3 4 5 6 7 8 9
</div>
```
```javascript
import { halo } from '/theme-loader.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/demo-block/src/demo-block.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ themeLabel.style.fontSize = '15px';
themeLabel.style.left = '10px';
themeLabel.style.top = '10px';
themeLabel.style.padding = '2px 4px';
themeLabel.style.fontWeight = 'bold';
themeLabel.style.fontWeight = '600';
themeLabel.style.textTransform = 'uppercase';
themeLabel.innerHTML = removePrefixName(currentTheme);

Expand Down
2 changes: 1 addition & 1 deletion packages/elements/src/heatmap/__demo__/color.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h3>EF Heatmap - Colors</h3>
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
<div style="font-weight: bold">Actual value:</div>
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/src/heatmap/__demo__/custom-cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h3>EF Heatmap - Custom cell</h3>
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
<div style="font-weight: bold">Actual value:</div>
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
`;
Expand Down
12 changes: 6 additions & 6 deletions packages/elements/src/heatmap/__demo__/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3>Sapphire Heatmap</h3>
</code>

<demo-block layout="normal" header="Click" tags="event, click">
<ef-heatmap id="click-test"></ef-heatmap>
<ef-heatmap id="click-test"></ef-heatmap>
</demo-block>

<demo-block layout="normal" header="Double Click" tags="event, dblclick">
Expand All @@ -64,14 +64,14 @@ <h3>Sapphire Heatmap</h3>
<ef-item value="menu1">Menu 1</ef-item>
<ef-item value="menu2" disabled>Menu 2</ef-item>
<ef-item type="divider"></ef-item>
<ef-item value="show-cell" >Show Cell Data</ef-item>
<ef-item value="show-cell" >Show Cell Data</ef-item>
</ef-overlay-menu>
</demo-block>

<ef-dialog id="dlg" header="Heatmap Cell"></ef-dialog>


<script>

<script>
const isIE = (/Trident/g).test(navigator.userAgent);

var generateData = function (r, c, minPoint = -1, maxPoint = 1) {
Expand Down Expand Up @@ -108,7 +108,7 @@ <h3>Sapphire Heatmap</h3>
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
<div style="font-weight: bold">Actual value:</div>
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
`;
Expand Down Expand Up @@ -196,4 +196,4 @@ <h3>Sapphire Heatmap</h3>
initEl('contextmenu-test');
</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion packages/elements/src/heatmap/__demo__/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h3>EF Heatmap</h3>
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
<div style="font-weight: bold">Actual value:</div>
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
`;
Expand Down
11 changes: 11 additions & 0 deletions packages/halo-theme/src/custom-elements/ef-tornado-item.less
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
@import '@refinitiv-ui/elemental-theme/src/custom-elements/ef-tornado-item';

:host {
&[highlighted] {
[part=label],
[part=primary-bar],
[part=secondary-bar] {
font-weight: 600;
}
}
}

9 changes: 0 additions & 9 deletions packages/halo-theme/src/fonts.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,3 @@
src: url('https://cdn.refinitiv.net/public/libs/elf/assets/elf-theme-halo/resources/fonts/proximanovafin/proximanovafin-semibold.woff2') format('woff2'),
url('https://cdn.refinitiv.net/public/libs/elf/assets/elf-theme-halo/resources/fonts/proximanovafin/proximanovafin-semibold.woff') format('woff');
}

@font-face {
font-family: 'Proxima Nova Fin';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('https://cdn.refinitiv.net/public/libs/elf/assets/elf-theme-halo/resources/fonts/proximanovafin/proximanovafin-bold.woff2') format('woff2'),
url('https://cdn.refinitiv.net/public/libs/elf/assets/elf-theme-halo/resources/fonts/proximanovafin/proximanovafin-bold.woff') format('woff');
}
2 changes: 1 addition & 1 deletion packages/halo-theme/src/native-elements/h4.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ h4 {
font-size: 24px;
margin-bottom: 10px;
text-transform: uppercase;
font-weight: bold;
font-weight: 600;
line-height: calc(30/24);
}
2 changes: 1 addition & 1 deletion packages/halo-theme/src/native-elements/h5.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ h5 {
font-size: 18px;
margin-bottom: 10px;
text-transform: uppercase;
font-weight: bold;
font-weight: 600;
line-height: calc(24/18);
}
2 changes: 1 addition & 1 deletion packages/halo-theme/src/native-elements/h6.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ h6 {
font-size: 16px;
margin-bottom: 10px;
text-transform: uppercase;
font-weight: bold;
font-weight: 600;
line-height: calc(22/16);
}