Skip to content

Commit

Permalink
Fix #1737
Browse files Browse the repository at this point in the history
  • Loading branch information
jlpereira committed Nov 2, 2020
1 parent f30cf8d commit d3b7a29
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

### Changed
- Running `rake db:seed` without `user_id`/`project_id` is now possible.
- Disabled hamburger menu when no functionality behind it on Browse OTU [#1737]


[#1737]: https://github.com/SpeciesFileGroup/taxonworks/issues/1737
[#1865]: https://github.com/SpeciesFileGroup/taxonworks/issues/1865
[#1822]: https://github.com/SpeciesFileGroup/taxonworks/issues/1822
[#1846]: https://github.com/SpeciesFileGroup/taxonworks/issues/1846
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
:status="status"
:spinner="loadState.assertedDistribution"
:title="title"
menu
@menu="setModalView(true)">
<a
v-if="currentOtu"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
:status="status"
:title="title"
:spinner="loadState.biologicalAssociations"
menu
@menu="setModalView(true)">
<a name="biological-associations"/>
<table class="full_width">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
:status="status"
:title="title"
:spinner="isLoading"
menu
@menu="showModal = true">
<a name="timeline"/>
<div class="switch-radio separate-top separate-bottom">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
:spinner="isLoading"
:status="status"
:title="title"
menu
@menu="showModal = true">
<a name="descendants"/>
<tree-view
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
data-icon="w_scroll-v"
class="option-box button-default cursor-pointer handle"
/>
<div
class="option-box button-default cursor-pointer"
<button
type="button"
class="option-box cursor-pointer"
:class="{ 'button-default': menu }"
:disabled="!menu"
v-help.section.options.filter
@click="$emit('menu')"
>
Expand All @@ -30,7 +33,7 @@
<div class="hamburger-menu-bar" />
<div class="hamburger-menu-bar" />
</div>
</div>
</button>
</div>
</div>
<div class="content">
Expand Down Expand Up @@ -61,6 +64,10 @@ export default {
anchor: {
type: String,
default: undefined
},
menu: {
type: Boolean,
default: false
}
},
data () {
Expand All @@ -80,6 +87,7 @@ export default {
padding: 0px;
background-position: center;
background-size: 14px;
border: 0px;
}
.hamburger-menu {
position: absolute;
Expand Down

0 comments on commit d3b7a29

Please sign in to comment.