Fixed alignment issues with IDE sidebar
Fixed sidebar tooltips not hiding after clicking
This commit is contained in:
parent
e30168ddb7
commit
4e322d0778
|
@ -1,4 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
|
import $ from 'jquery';
|
||||||
import { mapActions, mapGetters, mapState } from 'vuex';
|
import { mapActions, mapGetters, mapState } from 'vuex';
|
||||||
import Icon from '~/vue_shared/components/icon.vue';
|
import Icon from '~/vue_shared/components/icon.vue';
|
||||||
import tooltip from '~/vue_shared/directives/tooltip';
|
import tooltip from '~/vue_shared/directives/tooltip';
|
||||||
|
@ -20,6 +21,13 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['updateActivityBarView']),
|
...mapActions(['updateActivityBarView']),
|
||||||
|
changedActivityView(e, view) {
|
||||||
|
e.currentTarget.blur();
|
||||||
|
|
||||||
|
this.updateActivityBarView(view);
|
||||||
|
|
||||||
|
$(e.currentTarget).tooltip('hide');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
activityBarViews,
|
activityBarViews,
|
||||||
};
|
};
|
||||||
|
@ -54,7 +62,7 @@ export default {
|
||||||
:class="{
|
:class="{
|
||||||
active: currentActivityView === $options.activityBarViews.edit
|
active: currentActivityView === $options.activityBarViews.edit
|
||||||
}"
|
}"
|
||||||
@click.prevent="updateActivityBarView($options.activityBarViews.edit)"
|
@click.prevent="changedActivityView($event, $options.activityBarViews.edit)"
|
||||||
:title="s__('IDE|Edit')"
|
:title="s__('IDE|Edit')"
|
||||||
:aria-label="s__('IDE|Edit')"
|
:aria-label="s__('IDE|Edit')"
|
||||||
>
|
>
|
||||||
|
@ -73,7 +81,7 @@ export default {
|
||||||
:class="{
|
:class="{
|
||||||
active: currentActivityView === $options.activityBarViews.review
|
active: currentActivityView === $options.activityBarViews.review
|
||||||
}"
|
}"
|
||||||
@click.prevent="updateActivityBarView($options.activityBarViews.review)"
|
@click.prevent="changedActivityView($event, $options.activityBarViews.review)"
|
||||||
:title="s__('IDE|Review')"
|
:title="s__('IDE|Review')"
|
||||||
:aria-label="s__('IDE|Review')"
|
:aria-label="s__('IDE|Review')"
|
||||||
>
|
>
|
||||||
|
@ -92,7 +100,7 @@ export default {
|
||||||
:class="{
|
:class="{
|
||||||
active: currentActivityView === $options.activityBarViews.commit
|
active: currentActivityView === $options.activityBarViews.commit
|
||||||
}"
|
}"
|
||||||
@click.prevent="updateActivityBarView($options.activityBarViews.commit)"
|
@click.prevent="changedActivityView($event, $options.activityBarViews.commit)"
|
||||||
:title="s__('IDE|Commit')"
|
:title="s__('IDE|Commit')"
|
||||||
:aria-label="s__('IDE|Commit')"
|
:aria-label="s__('IDE|Commit')"
|
||||||
>
|
>
|
||||||
|
|
|
@ -458,6 +458,10 @@
|
||||||
width: auto;
|
width: auto;
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
|
||||||
|
a {
|
||||||
|
height: 60px;
|
||||||
|
}
|
||||||
|
|
||||||
a:hover,
|
a:hover,
|
||||||
a:focus {
|
a:focus {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
@ -718,9 +722,17 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ide-new-btn {
|
.ide-new-btn {
|
||||||
|
.btn {
|
||||||
|
padding-top: 3px;
|
||||||
|
padding-bottom: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
.dropdown-toggle svg {
|
.dropdown-toggle svg {
|
||||||
margin-top: -2px;
|
top: 0;
|
||||||
margin-bottom: 2px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
|
@ -877,6 +889,7 @@
|
||||||
border-top: 1px solid transparent;
|
border-top: 1px solid transparent;
|
||||||
border-bottom: 1px solid transparent;
|
border-bottom: 1px solid transparent;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
|
Loading…
Reference in New Issue