Skip to content

Commit 740d905

Browse files
dLamSlo8dLamSlo8
committed
forgot to unstash css changes
1 parent cd84f46 commit 740d905

16 files changed

+154
-221
lines changed

‎src/codemenu.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@ export class CodeMenu extends React.Component<{handleInlineCode: (e: React.Synth
7171
name="code"
7272
canClick={true}
7373
handleClick={this.props.returnToExperimental} />
74-
<div className="jp-scribe-menu-content">
75-
<p className="linkToImage" onClick={this.props.handleInlineCode}>Inline code</p>
76-
<p className="linkToImage" onClick={() => {this.setState({isBlockOption: true})}}>Code block</p>
77-
</div>
74+
<p
75+
className="submenu-item jp-scribe-heading-menu"
76+
onClick={this.props.handleInlineCode}>Inline code</p>
77+
<p
78+
className="submenu-item jp-scribe-heading-menu"
79+
onClick={() => {this.setState({isBlockOption: true})}}>Code block</p>
7880
</div>
7981
)
8082
}
@@ -86,10 +88,12 @@ export class CodeMenu extends React.Component<{handleInlineCode: (e: React.Synth
8688
canClick={true}
8789
handleClick={() => this.setState({isBlockOption: false})}
8890
/>
89-
<form onSubmit={(e) => { e.preventDefault(); this.props.handleBlockCode(e, this.state.blockLanguage)}} className="jp-scribe-menu-content">
91+
<form
92+
style={{paddingTop: "10px"}}
93+
onSubmit={(e) => { e.preventDefault(); this.props.handleBlockCode(e, this.state.blockLanguage)}} className="jp-scribe-menu-content">
9094
<label className="editor-menuLabel" style={{display: "block"}}>
9195
Language
92-
<input type="text" id="languageInput" value={this.state.blockLanguage} onChange={this.handleLanguageChange} autoComplete="off" />
96+
<input type="text" id="languageInput" style={{marginLeft: "3px"}} value={this.state.blockLanguage} onChange={this.handleLanguageChange} autoComplete="off" />
9397
</label>
9498
<div className="linkButtons">
9599
<button className="jp-scribe-menu-cancel jp-mod-styled" type="button" onClick={this.props.cancel}>CANCEL</button>

‎src/headingmenuitem.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ export default class HeadingMenuItem extends React.Component<{level: number, act
2828
render() {
2929
if (this.props.activeLevel === this.props.level) {
3030
return (
31-
<div className="jp-scribe-heading-menu-active">
31+
<div style={{display: "flex", borderBottom: "1px solid var(--jp-border-color2)"}}>
32+
<div style={{display: "flex", alignItems: "center", justifyContent: "center", paddingLeft: "10px"}}>
33+
<img
34+
src={require("../static/scribe-check.png")}
35+
style={{height: "18px", width: "18px"}}
36+
alt=""/>
37+
</div>
3238
<p
3339
id={`heading${this.props.level}`}
3440
className={`jp-scribe-menu-heading${this.props.level}`}
35-
style={{padding: "10px 6px", borderBottom: "1px solid #E0E0E0"}}
36-
><i className="material-icons check-icon" style={{fontSize: "14px"}}>check</i>{this.getLevelText()}</p>
41+
style={{padding: "10px 7px"}}
42+
>{this.getLevelText()}</p>
3743

3844
</div>
3945
)
@@ -44,7 +50,7 @@ export default class HeadingMenuItem extends React.Component<{level: number, act
4450
<p
4551
id={`heading${this.props.level}`}
4652
className={`jp-scribe-menu-heading${this.props.level}`}
47-
style={{padding: "10px 25px", borderBottom: "1px solid #E0E0E0"}}
53+
style={{padding: "10px 35px", borderBottom: "1px solid var(--jp-border-color2)"}}
4854
onClick={this.props.handleClick}>{this.getLevelText()}</p>
4955

5056
</div>

‎src/imagemenu.tsx

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ export class ImageMenu extends React.Component<{handleImgUpload: (fileUrl: unkno
6464
canClick={true}
6565
handleClick={this.props.returnToExperimental}
6666
/>
67-
<div className="jp-scribe-menu-content">
68-
<span className="linkToImage" onClick={this.handleLinkClick}>Link to image</span>
69-
<form>
70-
<span style={{cursor: "pointer"}} onClick={() => document.getElementById('file1').click()}>Upload image</span>
71-
<input type="file" id="file1" style={{display: "none"}} onChange={this.handleChange} />
72-
</form>
73-
</div>
67+
<p
68+
className="submenu-item jp-scribe-heading-menu"
69+
onClick={this.handleLinkClick}>Link to image</p>
70+
<form
71+
onClick={() => document.getElementById('file1').click()}
72+
className="submenu-item jp-scribe-heading-menu">
73+
<span>Upload image</span>
74+
<input type="file" id="file1" style={{display: "none"}} onChange={this.handleChange} />
75+
</form>
7476

7577
</div>
7678
);
@@ -84,7 +86,15 @@ export class ImageMenu extends React.Component<{handleImgUpload: (fileUrl: unkno
8486
handleClick={() => this.setState({isLinkOption: false})}
8587
/>
8688
<form onSubmit={this.handleSubmit} className="jp-scribe-menu-content">
87-
<input type="text" value={this.state.imageUrl} onChange={this.handleLinkChange} style={{display: "block"}}/>
89+
<label className="editor-menuLabel">
90+
Link
91+
<input
92+
type="text"
93+
style={{marginLeft: "3px"}}
94+
value={this.state.imageUrl}
95+
onChange={this.handleLinkChange}
96+
/>
97+
</label>
8898
<div className="linkButtons">
8999
<button className="jp-scribe-menu-cancel jp-mod-styled" type="button" onClick={this.props.cancel}>CANCEL</button>
90100
<button type="submit" className="jp-scribe-menu-apply jp-mod-styled">APPLY</button>

‎src/linkmenu.tsx

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,25 @@ export class LinkMenu extends React.Component<{initialText: string,
5656
handleClick={this.props.returnToExperimental}
5757
/>
5858
<form onSubmit={this.handleSubmit} className="jp-scribe-menu-content">
59-
<div style={{display: "flex"}}>
60-
<div>
61-
<label className="editor-menuLabel" style={{display: "block", marginBottom: "5px"}}>
62-
Text
63-
<input
64-
type="text"
65-
name="text"
66-
id="text"
67-
value={this.state.textValue}
68-
onChange={this.handleChange}
69-
style={{marginLeft: "3px"}}
70-
/>
71-
</label>
59+
<div>
60+
<label className="editor-menuLabel" style={{display: "block", marginBottom: "5px"}}>
61+
Text
62+
<input
63+
type="text"
64+
name="text"
65+
id="text"
66+
value={this.state.textValue}
67+
onChange={this.handleChange}
68+
style={{marginLeft: "3px"}}
69+
/>
70+
</label>
7271

73-
74-
<label className="editor-menuLabel">
72+
<div
73+
style={{display: "flex"}}
74+
>
75+
<label
76+
className="editor-menuLabel"
77+
style={{display: "inline-block"}}>
7578
Link
7679
<input
7780
type="text"
@@ -80,12 +83,13 @@ export class LinkMenu extends React.Component<{initialText: string,
8083
value={this.state.linkValue}
8184
onChange={this.handleChange}
8285
style={{marginLeft: "7px"}} />
83-
</label>
84-
</div>
85-
<div style={{maxWidth: "25px", marginTop: "23px", marginLeft: "3px"}}>
86-
<i
87-
className={(this.props.initialLink && this.props.initialLink === this.state.linkValue) ? "material-icons" : "material-icons inactive-icon"}
88-
onClick={this.handleClick}>link_off</i>
86+
</label>
87+
<img
88+
className="link-hover"
89+
src={require("../static/scribe-format-link-off.png")}
90+
style={{height: "18px", width: "18px", marginLeft: "7px"}}
91+
onClick={this.handleClick}
92+
alt=""/>
8993
</div>
9094
</div>
9195

‎src/mathexperimentalmenu.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ export function MathExperimentalMenu(props: any)
1010
canClick={true}
1111
handleClick={props.returnToExperimental}
1212
/>
13-
<div style={{padding: "10px 25px"}}>
14-
<p>Auto-render LaTeX in Markdown cells</p>
15-
13+
<div style={{padding: "10px 25px", borderBottom: "1px solid var(--jp-border-color2)"}}>
14+
<p>Auto-render LaTeX <br />in Markdown cells</p>
1615
</div>
1716
<div className={!props.enabled ? "jp-scribe-heading-menu-no-click" : "jp-scribe-heading-menu"}>
1817
<p
19-
style={{padding: "10px 25px", borderBottom: "1px solid #E0E0E0"}}
18+
style={{padding: "10px 25px", borderBottom: "1px solid var(--jp-border-color2)"}}
2019
onClick={props.enabled ? props.handleClick : () => null}>Disable</p>
2120
</div>
2221
<div className={props.enabled ? "jp-scribe-heading-menu-no-click" : "jp-scribe-heading-menu"}>
2322
<p
24-
style={{padding: "10px 25px", borderBottom: "1px solid #E0E0E0"}}
23+
style={{padding: "10px 25px", borderBottom: "1px solid var(--jp-border-color2)"}}
2524
onClick={!props.enabled ? props.handleClick : () => null}>Enable</p>
2625
</div>
2726
</div>

‎src/menuheader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default function MenuHeader(props: any) {
66
<div onClick={props.handleClick}>
77
<p
88
className="editor-menuLabel backToMenu"
9-
style={{padding: "12px 0px 5px 12px", borderBottom: "1px solid #E0E0E0"}}
9+
style={{padding: "12px 0px 5px 12px", borderBottom: "1px solid var(--jp-border-color2)"}}
1010
>{props.name}</p>
1111

1212

@@ -18,7 +18,7 @@ export default function MenuHeader(props: any) {
1818
<div>
1919
<p
2020
className="editor-menuLabel"
21-
style={{padding: "12px 0px 5px 12px", borderBottom: "1px solid #E0E0E0"}}
21+
style={{padding: "12px 0px 5px 12px", borderBottom: "1px solid var(--jp-border-color2)"}}
2222
>{props.name}</p>
2323

2424
</div>

‎src/menuitem.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,27 +149,27 @@ export default class MenuItem extends React.Component<{format: string, active: b
149149
if (this.props.cancelled) {
150150
return (
151151
<img
152-
// src={this.getImgSrc()}
153-
// alt="formatting"
154152
id={this.props.format}
155153
src={this.getImgSrc()}
156-
style={{height: "24px", width: "24px"}}
157-
className="inactive-menu-icon"
154+
style={{height: "18px", width: "18px"}}
155+
className="inactive-menu-icon menuItem"
158156
title={this.props.tooltip}
159157
/>
160158
)
161159
}
162160
else {
163161
return (
164-
<img
165-
// src={this.getImgSrc()}
166-
// alt="formatting"
167-
id={this.props.format}
162+
<div
168163
className={this.getClassName()}
169-
src={this.getImgSrc()}
170-
title={this.props.tooltip}
171-
style={{height: "24px", width: "24px"}}
172-
onClick={this.props.format !== "stick" ? this.props.handleClick : () => null} />
164+
style={{display: "flex", alignItems: "center", justifyContent: "center"}}>
165+
<img
166+
id={this.props.format}
167+
src={this.getImgSrc()}
168+
title={this.props.tooltip}
169+
style={{height: "18px", width: "18px"}}
170+
onClick={this.props.format !== "stick" ? this.props.handleClick : () => null} />
171+
</div>
172+
173173
)
174174
}
175175

‎src/prosemirror/ProseMirrorEditor.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class ProseMirrorEditor implements CodeEditor.IEditor {
114114
]
115115
}),
116116
nodeViews: {
117-
code_block(node, view, getPos) { return new CodeBlockMarkdownView(node, view, getPos)},
117+
code_block(node, view, getPos) { return new CodeBlockMarkdownView(node, view, (getPos as () => number))},
118118

119119
},
120120
handleDOMEvents: {
@@ -161,10 +161,10 @@ export class ProseMirrorEditor implements CodeEditor.IEditor {
161161
]
162162
}),
163163
nodeViews: {
164-
code_block(node, view, getPos) { return new CodeBlockView(node, view, getPos)},
165-
inline_math(node, view, getPos) { return new InlineMathView(node, view, getPos)},
164+
code_block(node, view, getPos) { return new CodeBlockView(node, view, (getPos as () => number))},
165+
inline_math(node, view, getPos) { return new InlineMathView(node, view, (getPos as () => number))},
166166
image(node) {return new ImageView(node)},
167-
block_math(node, view, getPos) { return new BlockMathView(node, view, getPos)}
167+
block_math(node, view, getPos) { return new BlockMathView(node, view, (getPos as () => number))}
168168
},
169169
handleDOMEvents: {
170170
copy: (view: EditorView, event: Event): boolean => {
@@ -455,7 +455,7 @@ namespace Private {
455455
]
456456
}),
457457
nodeViews: {
458-
code_block(node, view, getPos) { return new CodeBlockMarkdownView(node, view, getPos)},
458+
code_block(node, view, getPos) { return new CodeBlockMarkdownView(node, view, (getPos as () => number))},
459459

460460
},
461461
handleDOMEvents: {
@@ -536,10 +536,10 @@ namespace Private {
536536
]
537537
}),
538538
nodeViews: {
539-
code_block(node, view, getPos) { return new CodeBlockView(node, view, getPos)},
540-
inline_math(node, view, getPos) { return new InlineMathView(node, view, getPos)},
539+
code_block(node, view, getPos) { return new CodeBlockView(node, view, (getPos as () => number))},
540+
inline_math(node, view, getPos) { return new InlineMathView(node, view, (getPos as () => number))},
541541
image(node) {return new ImageView(node)},
542-
block_math(node, view, getPos) { return new BlockMathView(node, view, getPos)}
542+
block_math(node, view, getPos) { return new BlockMathView(node, view, (getPos as () => number))}
543543
},
544544
handleDOMEvents: {
545545
copy: (view: EditorView, event: Event): boolean => {

‎static/scribe-check.png

305 Bytes
Loading

‎static/scribe-experimental-icon.png

100644100755
65 Bytes
Loading

0 commit comments

Comments
 (0)