You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2016/09/01 15:09:35 UTC
[1/4] fauxton commit: updated refs/heads/master to e799551
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 700557539 -> e79955110
fix list style type appearing in active tasks
PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e7995511
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e7995511
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e7995511
Branch: refs/heads/master
Commit: e7995511042777c95010fc00c2631ec676ad780f
Parents: 6bd8286
Author: Robert Kowalski <ro...@apache.org>
Authored: Thu Aug 25 14:41:09 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Sep 1 17:09:18 2016 +0200
----------------------------------------------------------------------
app/addons/activetasks/components.react.jsx | 2 +-
app/addons/components/assets/less/tab-element.less | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7995511/app/addons/activetasks/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/activetasks/components.react.jsx b/app/addons/activetasks/components.react.jsx
index 2add311..43c4115 100644
--- a/app/addons/activetasks/components.react.jsx
+++ b/app/addons/activetasks/components.react.jsx
@@ -151,7 +151,7 @@ var ActiveTasksFilterTabs = React.createClass({
return (
<TabElementWrapper>
{filterTabs}
- <li>
+ <li className="component-tab-list-element">
<input
id="active-tasks-search-box"
className="searchbox"
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7995511/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 d9cc152..6ef1d98 100644
--- a/app/addons/components/assets/less/tab-element.less
+++ b/app/addons/components/assets/less/tab-element.less
@@ -24,6 +24,10 @@
min-width: 770px;
}
+.component-tab-list-element {
+ list-style-type: none;
+}
+
.component-tab-element {
background-color: #eee;
margin-top: 10px;
[4/4] fauxton commit: updated refs/heads/master to e799551
Posted by ro...@apache.org.
tabs: minor style updates
- make font for selected tab bold
- don't highlight tab content on hover if tab is selected
- inccrease space between tabs to 5px
- reset margin applied from bootstrap
PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b2c7fc2c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b2c7fc2c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b2c7fc2c
Branch: refs/heads/master
Commit: b2c7fc2c7bb856f665f742a2d3094c0c981180ad
Parents: 7005575
Author: Robert Kowalski <ro...@apache.org>
Authored: Fri Jul 29 15:02:27 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Sep 1 17:09:18 2016 +0200
----------------------------------------------------------------------
.../components/assets/less/tab-element.less | 21 +++++++++++++++++++-
.../components/react-components.react.jsx | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2c7fc2c/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 6258cff..d9cc152 100644
--- a/app/addons/components/assets/less/tab-element.less
+++ b/app/addons/components/assets/less/tab-element.less
@@ -13,6 +13,9 @@
@import "../../../../../assets/less/mixins.less";
.component-tab-element-wrapper {
+ margin-left: 0;
+ padding-left: 0;
+ margin-bottom: 0;
height: 60px;
background-color: #CBCBCB;
padding-left: 20px;
@@ -24,6 +27,10 @@
.component-tab-element {
background-color: #eee;
margin-top: 10px;
+ margin-right: 5px;
+ margin-bottom: -1px;
+ float: left;
+ list-style-type: none;
line-height: 40px;
input {
@@ -32,13 +39,13 @@
label {
margin-right: 0;
+ margin-bottom: 0;
line-height: 25px;
.noselect()
}
.tab-element-content {
padding: 8px 12px 12px 12px;
-
}
.tab-element-indicator-wrapper {
@@ -59,6 +66,10 @@
background-color: #fff;
}
+ &.tab-element-checked .tab-element-content {
+ font-weight: bold;
+ }
+
transition: all .25s linear;
&:hover {
@@ -66,6 +77,14 @@
color: @linkColorHover;
};
+ &.tab-element-checked .tab-element-content:hover {
+ color: initial;
+ };
+
+ &.tab-element-checked:hover {
+ color: initial;
+ };
+
&:hover .tab-element-indicator {
height: 5px;
background-color: @linkColorHover;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2c7fc2c/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 34d0b3d..2938cbc 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1586,7 +1586,7 @@ TabElement.propTypes = {
const TabElementWrapper = ({children}) => {
return (
- <ul className="nav nav-tabs component-tab-element-wrapper">
+ <ul className="component-tab-element-wrapper">
{children}
</ul>
);
[2/4] fauxton commit: updated refs/heads/master to e799551
Posted by ro...@apache.org.
given the tray is not open do not fire tray events to close
PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e617ad26
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e617ad26
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e617ad26
Branch: refs/heads/master
Commit: e617ad26a8cc98b1db027305dc3410c21383d805
Parents: b2c7fc2
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Aug 3 13:51:37 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Sep 1 17:09:18 2016 +0200
----------------------------------------------------------------------
app/addons/components/react-components.react.jsx | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e617ad26/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 2938cbc..d1dcbf1 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1395,6 +1395,11 @@ var APIBar = React.createClass({
componentDidMount: function () {
$('body').on('click.APIBar', function (e) {
+
+ if (!$('.show-tray.api-bar-tray').length) {
+ return;
+ }
+
if ($(e.target).closest('.api-bar-tray,.control-toggle-api-url').length === 0) {
Actions.toggleApiBarVisibility(false);
}
[3/4] fauxton commit: updated refs/heads/master to e799551
Posted by ro...@apache.org.
allow setting amount of decimals
PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6bd82869
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6bd82869
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6bd82869
Branch: refs/heads/master
Commit: 6bd82869bf9923624112f82d9109b72c1c1cec9f
Parents: e617ad2
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Aug 23 13:10:17 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Sep 1 17:09:18 2016 +0200
----------------------------------------------------------------------
app/helpers.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6bd82869/app/helpers.js
----------------------------------------------------------------------
diff --git a/app/helpers.js b/app/helpers.js
index 16f56ee..f80a3f0 100644
--- a/app/helpers.js
+++ b/app/helpers.js
@@ -38,7 +38,7 @@ Helpers.getDocUrl = function (key) {
};
// File size pretty printing, taken from futon.format.js
-Helpers.formatSize = function (size) {
+Helpers.formatSize = function (size, decimals = 1) {
var jump = 512;
if (size < jump) return size + " bytes";
var units = ["KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
@@ -47,7 +47,7 @@ Helpers.formatSize = function (size) {
i += 1;
size /= 1024;
}
- return size.toFixed(1) + ' ' + units[i - 1];
+ return size.toFixed(decimals) + ' ' + units[i - 1];
};
Helpers.formatDate = function (timestamp) {