gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: normalize font weights globally and font hierarchy on map

Browse Source
This commit is contained in:
Ahmad Abdolsaheb
2019-02-19 10:28:24 +03:00
committed by mrugesh mohapatra
parent 9124dfb126
commit 56bf132af0
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Map/components/Block.js
View File

@ -131,7 +131,7 @@ export class Block extends Component {
<li className={`block ${isExpanded ? 'open' : ''}`}> <li className={`block ${isExpanded ? 'open' : ''}`}>
<div className='map-title' onClick={this.handleBlockClick}> <div className='map-title' onClick={this.handleBlockClick}>
<Caret /> <Caret />
<h5>{blockNameify(blockDashedName)}</h5> <h4>{blockNameify(blockDashedName)}</h4>
<div className='map-title-completed'> <div className='map-title-completed'>
<span> <span>
{this.renderCheckMark( {this.renderCheckMark(

4
client/src/components/Map/components/Block.test.js
View File

@ -74,7 +74,7 @@ test('<Block /> should handle toggle clicks correctly', () => {
expect( expect(
enzymeWrapper enzymeWrapper
.find('.map-title') .find('.map-title')
.find('h5') .find('h4')
.text() .text()
).toBe('Block A'); ).toBe('Block A');
@ -88,7 +88,7 @@ test('<Block /> should handle toggle clicks correctly', () => {
expect( expect(
enzymeWrapper enzymeWrapper
.find('.map-title') .find('.map-title')
.find('h5') .find('h4')
.text() .text()
).toBe('Block A'); ).toBe('Block A');
expect(enzymeWrapper.find('ul').length).toBe(1); expect(enzymeWrapper.find('ul').length).toBe(1);

8
client/src/components/Map/components/__snapshots__/Block.test.js.snap
View File

@ -9,9 +9,9 @@ exports[`<Block /> not expanded snapshot: block-not-expanded 1`] = `
onClick={[Function]} onClick={[Function]}
> >
<Caret /> <Caret />
<h5> <h4>
Block A Block A
</h5> </h4>
<div <div
className="map-title-completed" className="map-title-completed"
> >
@ -44,9 +44,9 @@ exports[`<Block expanded snapshot: block-expanded 1`] = `
onClick={[Function]} onClick={[Function]}
> >
<Caret /> <Caret />
<h5> <h4>
Block A Block A
</h5> </h4>
<div <div
className="map-title-completed" className="map-title-completed"
> >

2
client/src/components/Map/map.css
View File

@ -23,7 +23,7 @@
border-bottom: 1px solid #e2e2e2; border-bottom: 1px solid #e2e2e2;
} }
.map-title > h5 { .map-title > h4 {
margin-bottom: 0; margin-bottom: 0;
} }

6
client/src/components/layouts/layout.css
View File

@ -223,7 +223,6 @@ h1 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 2.25rem; font-size: 2.25rem;
line-height: 1.1; line-height: 1.1;
@ -240,7 +239,6 @@ h2 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 1.62671rem; font-size: 1.62671rem;
line-height: 1.1; line-height: 1.1;
@ -257,7 +255,6 @@ h3 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 1.38316rem; font-size: 1.38316rem;
line-height: 1.1; line-height: 1.1;
@ -274,7 +271,6 @@ h4 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 1rem; font-size: 1rem;
line-height: 1.1; line-height: 1.1;
@ -291,7 +287,6 @@ h5 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 0.85028rem; font-size: 0.85028rem;
line-height: 1.1; line-height: 1.1;
@ -308,7 +303,6 @@ h6 {
color: inherit; color: inherit;
font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, font-family: 'Lato', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-size: 0.78405rem; font-size: 0.78405rem;
line-height: 1.1; line-height: 1.1;