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

Add monospace font preference for markdown editor #63

Merged
merged 1 commit into from
Nov 6, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default {
name: 'App',
created() {
loadFonts([
'Roboto:300,400,500'
'Roboto:300,400,500',
'Roboto Mono:300',
]);
}
};
Expand Down
9 changes: 8 additions & 1 deletion src/components/board/issues/markdown_editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:value='modelValue'
:disabled='isUploading'
:placeholder='placeholder'
:class='markdownEditorFont'
ref='textarea'
@input='onInput'
@keydown='onKeyDown'
Expand Down Expand Up @@ -91,7 +92,8 @@ export default {
}),
computed: {
...get([
'board/mentionIssues'
'board/mentionIssues',
'user/markdownEditorFont'
]),
filteredItems() {
const items = this.key === '@' ? this.assignableUsers : this.mentionIssues;
Expand Down Expand Up @@ -380,6 +382,11 @@ textarea
resize: none
width: 100%

&.mono
//font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace
font-family: 'Roboto Mono',
font-weight: 300

&::placeholder
color: #9fa8da
opacity: 1
Expand Down
13 changes: 12 additions & 1 deletion src/store/modules/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export default {
state: {
...DEFAULT_STATE,
rememberToken: CookieStore.get(NAMESPACE, 'rememberToken', null),
issueModalStyle: CookieStore.get(NAMESPACE, 'issueModalStyle', 'center')
issueModalStyle: CookieStore.get(NAMESPACE, 'issueModalStyle', 'center'),
markdownEditorFont: CookieStore.get(NAMESPACE, 'markdownEditorFont', 'default')
},

getters: {
Expand Down Expand Up @@ -62,6 +63,12 @@ export default {

commit('UPDATE_ISSUE_MODAL_STYLE', issueModalStyle);
},
updateMarkdownEditorFont({ commit }, { isMono }) {
console.log(isMono);
if (isMono == null) { return; }
const markdownEditorFont = isMono ? 'mono' : 'default';
commit('UPDATE_MARKDOWN_EDITOR_FONT', markdownEditorFont);
},
},

mutations: {
Expand Down Expand Up @@ -94,6 +101,10 @@ export default {
UPDATE_ISSUE_MODAL_STYLE(state, issueModalStyle) {
state.issueModalStyle = issueModalStyle;
saveCookies('issueModalStyle', state.issueModalStyle);
},
UPDATE_MARKDOWN_EDITOR_FONT(state, markdownEditorFont) {
state.markdownEditorFont = markdownEditorFont;
saveCookies('markdownEditorFont', state.markdownEditorFont);
}
}
};
51 changes: 46 additions & 5 deletions src/views/settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
@select='selectTab'
/>
<article v-if='active === "Appearance"' class='body'>
<h2 class='subtitle'>Issue modal position</h2>
<h2 class='subtitle'>Issue view preference</h2>
<p>Select the preferred position of the modal view</p>
<div
v-for='item in issueModalStyles'
class='radio-item'
Expand All @@ -22,10 +23,27 @@
:id='item'
/>
<label :for='item'>
{{ item }}
{{ issueModalStyleLabels[item] }}
<span class='note'>{{issueModalStyleNotes[item]}}</span>
</label>
</div>

<br>
<br>

<h2 class='subtitle'>Markdown editor font preference</h2>
<p>
Font preference for plain text editors that support Markdown
styling (e.g. pull request and issue descriptions, comments.)
</p>
<label class='checkbox'>
<input
v-model='isMonoSelected'
type='checkbox'
@change='updateIsMono'
/>
Use a fixed-width (monospace) font when editing Markdown
</label>
</article>
</template>

Expand All @@ -51,15 +69,21 @@ export default {
'center',
'right',
],
issueModalStyleLabels: {
center: 'Center',
right: 'Right',
},
issueModalStyleNotes: {
center: 'Best for laptop (default)',
right: 'Best for wide monitor',
},
selectedIssueModalStyle: undefined,
isMonoSelected: undefined
}),
computed: {
isLoaded: get('user/isLoaded'),
issueModalStyle: get('user/issueModalStyle'),
markdownEditorFont: get('user/markdownEditorFont'),
token: get('user/token'),
boards: get('user/boards')
},
Expand All @@ -69,22 +93,29 @@ export default {
}
},
async created() {
this.selectedIssueModalStyle = this.issueModalStyle;
this.isMonoSelected = this.markdownEditorFont === 'mono';

const user = await this.fetchProfile();
if (user == null) {
this.$router.push({ name: 'home' });
} else if (user.boards.length === 0) {
this.$router.push({ name: 'board_new' });
}
this.selectedIssueModalStyle = this.issueModalStyle;
},
methods: {
...call([
'user/fetchProfile',
'user/updateIssueModelStyle'
'user/updateIssueModelStyle',
'user/updateMarkdownEditorFont'
]),
selectTab(item) {
this.active = item;
},
updateIsMono(e) {
this.isMonoSelected = e.target.checked;
this.updateMarkdownEditorFont({ isMono: this.isMonoSelected });
}
}
}
</script>
Expand Down Expand Up @@ -116,13 +147,23 @@ article
cursor: pointer

input
margin: 0 4px 0 0
margin: 0 6px 0 0

label
text-transform: capitalize
font-weight: 500

.note
color: #9E9E9E
margin-left: 4px
text-transform: none
font-weight: 400

label.checkbox
display: flex
align-items: center
font-weight: 500

input
margin: 0 6px 0 0
</style>