Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8B503200B31 for ; Tue, 24 May 2016 19:45:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 89F1C160A37; Tue, 24 May 2016 17:45:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2C8F160A36 for ; Tue, 24 May 2016 19:45:15 +0200 (CEST) Received: (qmail 35063 invoked by uid 500); 24 May 2016 17:45:15 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 34954 invoked by uid 99); 24 May 2016 17:45:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2016 17:45:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8C78DFE65; Tue, 24 May 2016 17:45:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Tue, 24 May 2016 17:45:16 -0000 Message-Id: In-Reply-To: <28c488b30e5a4abd915fb8f5bfce6776@git.apache.org> References: <28c488b30e5a4abd915fb8f5bfce6776@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] fauxton commit: updated refs/heads/master to 7cead9e archived-at: Tue, 24 May 2016 17:45:16 -0000 add TabelementWrapper PR: #714 PR-URL: https://github.com/apache/couchdb-fauxton/pull/714 Reviewed-By: garren smith Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7cead9eb Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7cead9eb Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7cead9eb Branch: refs/heads/master Commit: 7cead9eb19cadc5dd630110c52397999c5f60bbf Parents: 2d31245 Author: Robert Kowalski Authored: Tue May 24 14:13:04 2016 +0200 Committer: Robert Kowalski Committed: Tue May 24 19:45:28 2016 +0200 ---------------------------------------------------------------------- app/addons/activetasks/assets/less/activetasks.less | 13 +------------ app/addons/activetasks/components.react.jsx | 8 +++++--- app/addons/components/assets/less/tab-element.less | 12 ++++++++++++ app/addons/components/react-components.react.jsx | 12 +++++++++++- 4 files changed, 29 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cead9eb/app/addons/activetasks/assets/less/activetasks.less ---------------------------------------------------------------------- diff --git a/app/addons/activetasks/assets/less/activetasks.less b/app/addons/activetasks/assets/less/activetasks.less index a7620a2..85d3e9e 100644 --- a/app/addons/activetasks/assets/less/activetasks.less +++ b/app/addons/activetasks/assets/less/activetasks.less @@ -89,18 +89,7 @@ } } - #active-tasks-filter-tabs { - height: 60px; - background-color: #CBCBCB; - padding-left: 20px; - overflow: hidden; - width: 100%; - min-width: 770px; - - input { - display: none; - } - + .component-tab-element-wrapper { #active-tasks-search-box { display: inline; font-size: 14px; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cead9eb/app/addons/activetasks/components.react.jsx ---------------------------------------------------------------------- diff --git a/app/addons/activetasks/components.react.jsx b/app/addons/activetasks/components.react.jsx index d352175..67cef26 100644 --- a/app/addons/activetasks/components.react.jsx +++ b/app/addons/activetasks/components.react.jsx @@ -25,6 +25,7 @@ define([ ], (app, FauxtonAPI, React, ReactDOM, Stores, Resources, Actions, Components, ComponentsReact, ReactCSSTransitionGroup) => { + const TabElementWrapper = Components.TabElementWrapper; const TabElement = Components.TabElement; var activeTasksStore = Stores.activeTasksStore; @@ -150,9 +151,9 @@ define([ }, render: function () { - var filterTabs = this.createFilterTabs(); + const filterTabs = this.createFilterTabs(); return ( -
    + {filterTabs}
    • -
); + + ); } }); http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cead9eb/app/addons/components/assets/less/tab-element.less ---------------------------------------------------------------------- diff --git a/app/addons/components/assets/less/tab-element.less b/app/addons/components/assets/less/tab-element.less index c6413e5..6258cff 100644 --- a/app/addons/components/assets/less/tab-element.less +++ b/app/addons/components/assets/less/tab-element.less @@ -12,12 +12,24 @@ @import "../../../../../assets/less/mixins.less"; +.component-tab-element-wrapper { + height: 60px; + background-color: #CBCBCB; + padding-left: 20px; + overflow: hidden; + width: 100%; + min-width: 770px; +} .component-tab-element { background-color: #eee; margin-top: 10px; line-height: 40px; + input { + display: none; + } + label { margin-right: 0; line-height: 25px; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cead9eb/app/addons/components/react-components.react.jsx ---------------------------------------------------------------------- diff --git a/app/addons/components/react-components.react.jsx b/app/addons/components/react-components.react.jsx index e9cc587..7e05476 100644 --- a/app/addons/components/react-components.react.jsx +++ b/app/addons/components/react-components.react.jsx @@ -1590,6 +1590,15 @@ define([ iconClass: React.PropTypes.string, }; + const TabElementWrapper = ({children}) => { + return ( +
    + {children} +
+ ); + }; + + return { BadgeList: BadgeList, Badge: Badge, @@ -1617,7 +1626,8 @@ define([ ReactDOM.unmountComponentAtNode(el); }, DeleteDatabaseModal: DeleteDatabaseModal, - TabElement: TabElement + TabElement: TabElement, + TabElementWrapper: TabElementWrapper }; });