Skip to content

Add Vocabulary Select implementation instead of buefy select #276

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
merged 4 commits into from
Jan 7, 2021
Merged

Add Vocabulary Select implementation instead of buefy select #276

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f09c17
Add Vocabulary Select implementation instead of buefy select
obulat Dec 17, 2020
11b58a4
Revert "Add Vocabulary Select implementation instead of buefy select"
obulat Dec 17, 2020
7142cf3
Add Vocabulary Select implementation instead of buefy select
obulat Dec 17, 2020
f5d5aa6
Merge branch 'master' into vselect
obulat Jan 6, 2021
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
Prev Previous commit
Merge branch 'master' into vselect 
# Conflicts:
#	src/App.vue
#	src/components/DropdownStep.vue
  • Loading branch information
@obulat
obulat committed Jan 6, 2021
commit f5d5aa66e28e862bf65f7efba622ce108deb0ee2
14 changes: 0 additions & 14 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,20 +172,6 @@ export default {
</script>
<style lang="scss">

// Links
$link: $primary;
$link-focus-border: $primary;
// Fonts
$family-primary: Source Sans Pro,Noto Sans,Arial,Helvetica Neue,Helvetica,sans-serif;
$family-sans-serif: Source Sans Pro,Noto Sans,Arial,Helvetica Neue,Helvetica,sans-serif!important;

// Import Bulma and Buefy styles
@import "~bulma";
@import '~buefy/src/scss/utils/_variables.scss';
@import '~buefy/src/scss/components/_modal.scss';
@import '~buefy/src/scss/components/_form.scss';
@import '~buefy/src/scss/components/_icon.scss';

@import "~@creativecommons/vocabulary/scss/vocabulary.scss";

#app {
Expand Down
6 changes: 6 additions & 0 deletions src/components/DropdownStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ export default {
components: { VSelect },
inheritAttrs: false,
props: {
status: {
type: String,
validator(value) {
return ['active', 'previous', 'inactive'].includes(value)
}
},
id: Number
},
data() {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.