Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

chore(*): comment out underline-related code - I97 #99

Merged
merged 2 commits into from
Oct 5, 2019
Merged

chore(*): comment out underline-related code - I97 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01e32f3
Comment out underline-related code
cmccandless Oct 4, 2019
19539ef
adjust CSS grid for removed button
cmccandless Oct 4, 2019
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
6 changes: 3 additions & 3 deletions src/FormattingToolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as tips from './toolbarTooltip';

import * as boldIcon from '../icons/bold';
import * as italicIcon from '../icons/italic';
import * as underlineIcon from '../icons/underline';
// import * as underlineIcon from '../icons/underline';
import * as codeIcon from '../icons/code';
import * as quoteIcon from '../icons/open-quote';
import * as oListIcon from '../icons/OL';
Expand Down Expand Up @@ -379,7 +379,7 @@ export default class FormatToolbar extends React.Component {
'toolbar-0x2'
)
}
{
{/* {
this.renderMarkButton(
underlineIcon.type(),
underlineIcon.icon,
Expand All @@ -389,7 +389,7 @@ export default class FormatToolbar extends React.Component {
underlineIcon.vBox(),
'toolbar-0x3'
)
}
} */}
<VertDivider color={editorProps.DIVIDER} className='toolbar-4x1'/>
{
this.renderMarkButton(
Expand Down
24 changes: 12 additions & 12 deletions src/FormattingToolbar/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
.toolbar-4x0 { grid-column-start: 2; }
.toolbar-0x1 { grid-column-start: 3; }
.toolbar-0x2 { grid-column-start: 4; }
.toolbar-0x3 { grid-column-start: 5; }
.toolbar-4x1 { grid-column-start: 6; }
.toolbar-1x0 { grid-column-start: 7; }
.toolbar-1x1 { grid-column-start: 8; }
.toolbar-1x2 { grid-column-start: 9; }
.toolbar-1x3 { grid-column-start: 10; }
.toolbar-4x2 { grid-column-start: 11; }
.toolbar-2x1 { grid-column-start: 12; }
.toolbar-4x3 { grid-column-start: 13; }
.toolbar-2x2 { grid-column-start: 14; }
.toolbar-2x3 { grid-column-start: 15; }
.toolbar-2x4 { grid-column-start: 16; }
/* .toolbar-0x3 { grid-column-start: 5; } */
.toolbar-4x1 { grid-column-start: 5; }
.toolbar-1x0 { grid-column-start: 6; }
.toolbar-1x1 { grid-column-start: 7; }
.toolbar-1x2 { grid-column-start: 8; }
.toolbar-1x3 { grid-column-start: 9; }
.toolbar-4x2 { grid-column-start: 10; }
.toolbar-2x1 { grid-column-start: 11; }
.toolbar-4x3 { grid-column-start: 12; }
.toolbar-2x2 { grid-column-start: 13; }
.toolbar-2x3 { grid-column-start: 14; }
.toolbar-2x4 { grid-column-start: 15; }
4 changes: 2 additions & 2 deletions src/SlateAsInputEditor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ const SlateAsInputEditor = React.forwardRef((props, ref) => {
return <strong {...attributes}>{children}</strong>;
case 'italic':
return <em {...attributes}>{children}</em>;
case 'underline':
return <u {...{ attributes }}>{children}</u>;
// case 'underline':
// return <u {...{ attributes }}>{children}</u>;
case 'html':
case 'code':
return <code {...attributes}>{children}</code>;
Expand Down
2 changes: 1 addition & 1 deletion src/html/fromHTML.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const BLOCK_TAGS = {
const MARK_TAGS = {
strong: 'bold',
em: 'italic',
u: 'underline',
// u: 'underline',
s: 'strikethrough',
code: 'code',
};
Expand Down