Skip to content

fixed disappearing scroll bar #2033

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.

Sign up for GitHub

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

Merged
Rokt33r merged 3 commits into from
Jul 6, 2018
Merged

fixed disappearing scroll bar #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6a9c9c
fixed disappear scrollbar
ZeroX-DG Jun 5, 2018
31f1ebe
removed unnecessary style
ZeroX-DG Jun 5, 2018
7bfb094
use lighter color for scroll bar
Rokt33r Jul 6, 2018
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
37 changes: 37 additions & 0 deletions browser/components/MarkdownPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,25 @@ body p {
`
}

const scrollBarStyle = `
::-webkit-scrollbar {
width: 12px;
}

::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, 0.15);
}
`
const scrollBarDarkStyle = `
::-webkit-scrollbar {
width: 12px;
}

::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, 0.3);
}
`

const { shell } = require('electron')
const OSX = global.process.platform === 'darwin'

Expand Down Expand Up @@ -290,6 +309,21 @@ export default class MarkdownPreview extends React.Component {
}
}

getScrollBarStyle () {
const {
theme
} = this.props

switch (theme) {
case 'dark':
case 'solarized-dark':
case 'monokai':
return scrollBarDarkStyle
default:
return scrollBarStyle
}
}

componentDidMount () {
this.refs.root.setAttribute('sandbox', 'allow-scripts')
this.refs.root.contentWindow.document.body.addEventListener('contextmenu', this.contextMenuHandler)
Expand All @@ -298,6 +332,9 @@ export default class MarkdownPreview extends React.Component {
<style id='style'></style>
<link rel="stylesheet" id="codeTheme">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style>
${this.getScrollBarStyle()}
</style>
`

CSS_FILES.forEach((file) => {
Expand Down
15 changes: 13 additions & 2 deletions browser/main/global.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ body
font-weight 200
-webkit-font-smoothing antialiased

::-webkit-scrollbar
width 12px

::-webkit-scrollbar-thumb
background-color rgba(0, 0, 0, 0.15)

button, input, select, textarea
font-family DEFAULT_FONTS

Expand Down Expand Up @@ -85,9 +91,11 @@ modalBackColor = white
absolute top left bottom right
background-color modalBackColor
z-index modalZIndex + 1


body[data-theme="dark"]
::-webkit-scrollbar-thumb
background-color rgba(0, 0, 0, 0.3)
.ModalBase
.modalBack
background-color $ui-dark-backgroundColor
Expand Down Expand Up @@ -128,16 +136,19 @@ body[data-theme="dark"]
z-index modalZIndex + 5

body[data-theme="solarized-dark"]
::-webkit-scrollbar-thumb
background-color rgba(0, 0, 0, 0.3)
.ModalBase
.modalBack
background-color $ui-solarized-dark-backgroundColor
.sortableItemHelper
color: $ui-solarized-dark-text-color

body[data-theme="monokai"]
::-webkit-scrollbar-thumb
background-color rgba(0, 0, 0, 0.3)
.ModalBase
.modalBack
background-color $ui-monokai-backgroundColor
.sortableItemHelper
color: $ui-monokai-text-color