Repository: ambari Updated Branches: refs/heads/trunk a9ddb2fd2 -> 1d17baf9f
AMBARI-19798. Hive View 2.0: Tab switching on in table view broken. (dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d17baf9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d17baf9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d17baf9 Branch: refs/heads/trunk Commit: 1d17baf9f8cb6f89cc3b2c316b4a5603f1b111d5 Parents: a9ddb2f Author: Dipayan Bhowmick <dipayan.bhowm...@gmail.com> Authored: Thu Feb 2 12:02:12 2017 +0530 Committer: Dipayan Bhowmick <dipayan.bhowm...@gmail.com> Committed: Thu Feb 2 12:02:55 2017 +0530 ---------------------------------------------------------------------- .../resources/ui/app/components/tabs-item.js | 20 +------------------- .../ui/app/styles/bootstrap-overrides.scss | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1d17baf9/contrib/views/hive20/src/main/resources/ui/app/components/tabs-item.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/tabs-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/tabs-item.js index e790c55..16dacac 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/tabs-item.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/tabs-item.js @@ -32,30 +32,12 @@ export default Ember.Component.extend({ } }), - didInsertElement: function() { - Ember.run.later(() => this.send('changeActiveState')); - this.$('a').click(() => { - Ember.run.later(() => { - this.send('changeActiveState'); - }); - }); - }, actions : { selected() { - this.get('tabs').forEach((x) => x.set('active', false)); + this.get('tabs').setEach('active', false); this.set('active', true); this.sendAction('activate', this.get('tab.link')); - }, - - changeActiveState: function() { - if(this.get('shouldTransition')) { - let classes = this.$('a').attr('class').split(' '); - if(classes.contains('active')) { - this.get('tabs').forEach((x) => x.set('active', false)); - this.set('active', true); - } - } } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/1d17baf9/contrib/views/hive20/src/main/resources/ui/app/styles/bootstrap-overrides.scss ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/bootstrap-overrides.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/bootstrap-overrides.scss index ee9d373..b06db65 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/styles/bootstrap-overrides.scss +++ b/contrib/views/hive20/src/main/resources/ui/app/styles/bootstrap-overrides.scss @@ -35,10 +35,14 @@ $nav-tabs-active-link-hover-border-color: darken($body-bg, 15%); .nav-tabs { &.inverse { - li.active { + li { a { - background-color: $gray-dark; - color: #fff; + &.active { + background-color: $gray-dark; + color: #fff; + border: 1px solid darken($body-bg, 15%); + border-bottom: none; + } } } } @@ -46,6 +50,11 @@ $nav-tabs-active-link-hover-border-color: darken($body-bg, 15%); a { font-weight: bold; color: darken($body-bg, 50%); + &.active { + background-color: #fff; + border: 1px solid darken($body-bg, 15%); + border-bottom: none; + } } } }