couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 7410de9
Date Mon, 18 Jan 2016 14:19:15 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e221bcd01 -> 7410de9fa


table/index-result updates

 - darker icon for trashcan
 - new icon for copying (note: this changes it for all clipboards)
 - save some space by making the search box 50px smaller and
   make include-docs button more responsive

PR: #608
PR-URL: https://github.com/apache/couchdb-fauxton/pull/608
Reviewed-By: Benjamin Keen <ben.keen@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7410de9f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7410de9f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7410de9f

Branch: refs/heads/master
Commit: 7410de9fa0917dd1a6bfb6937fbcc24ca387e56b
Parents: e221bcd
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Fri Jan 15 12:38:37 2016 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Mon Jan 18 15:21:07 2016 +0100

----------------------------------------------------------------------
 .../activetasks/assets/less/activetasks.less    |   2 +-
 .../components/assets/less/bulk-selector.less   |   2 +-
 app/addons/documents/header/header.react.jsx    |   2 +-
 .../index-results.components.react.jsx          |   5 +-
 app/addons/fauxton/assets/less/components.less  |  53 ++++++++
 app/addons/fauxton/assets/less/fauxton.less     |   1 +
 app/addons/fauxton/components.react.jsx         |   8 +-
 .../fauxton/tests/componentsSpec.react.jsx      |   4 +-
 assets/less/fauxton.less                        | 120 ++++++++++++-------
 9 files changed, 141 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/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 bb08bac..8ae0199 100644
--- a/app/addons/activetasks/assets/less/activetasks.less
+++ b/app/addons/activetasks/assets/less/activetasks.less
@@ -193,7 +193,7 @@
     padding: 16px 20px 28px;
 
     position: relative;
-    min-width: 360px;
+    min-width: 365px;
     top: 15px;
     float: right;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/components/assets/less/bulk-selector.less
----------------------------------------------------------------------
diff --git a/app/addons/components/assets/less/bulk-selector.less b/app/addons/components/assets/less/bulk-selector.less
index 193a271..1aaec68 100644
--- a/app/addons/components/assets/less/bulk-selector.less
+++ b/app/addons/components/assets/less/bulk-selector.less
@@ -91,7 +91,7 @@
 
     .fonticon {
       font-size: 8px;
-      color: @darkBorder;
+      color: #505050;
       padding: 3px 0;
     }
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/documents/header/header.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/header/header.react.jsx b/app/addons/documents/header/header.react.jsx
index 74b680f..340f583 100644
--- a/app/addons/documents/header/header.react.jsx
+++ b/app/addons/documents/header/header.react.jsx
@@ -91,7 +91,7 @@ function (app, FauxtonAPI, React, Actions, ReactComponents,
             title="Enable/Disable include_docs"
             fonticon={this.state.includeDocs ? 'icon-check' : 'icon-check-empty'}
             iconDefaultClass="icon fontawesome"
-            text="Include Docs" /> : null}
+            text="" /> : null}  { /* text is set via responsive css */}
         </div>
       );
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/documents/index-results/index-results.components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/index-results/index-results.components.react.jsx b/app/addons/documents/index-results/index-results.components.react.jsx
index 5052609..40af4e2 100644
--- a/app/addons/documents/index-results/index-results.components.react.jsx
+++ b/app/addons/documents/index-results/index-results.components.react.jsx
@@ -146,7 +146,10 @@ function (app, FauxtonAPI, React, Stores, Actions, Components, Documents,
Fauxto
       var text = JSON.stringify(el, null, '  ');
       return (
         <td title={text} className="tableview-el-copy">
-          <Clipboard onClipboardClick={this.showCopiedMessage} title={text} text={text}/>
+          <Clipboard
+            onClipboardClick={this.showCopiedMessage}
+            title={text}
+            text={text} />
         </td>
       );
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/fauxton/assets/less/components.less
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/assets/less/components.less b/app/addons/fauxton/assets/less/components.less
new file mode 100644
index 0000000..dfa9d4d
--- /dev/null
+++ b/app/addons/fauxton/assets/less/components.less
@@ -0,0 +1,53 @@
+@import "../../../../../assets/less/variables.less";
+@import "../../../../../assets/less/bootstrap/variables.less";
+@import "../../../../../assets/less/bootstrap/mixins.less";
+
+.api-bar-tray {
+  padding: 16px 20px;
+  .input-append.input-prepend {
+    margin-bottom: 0px;
+
+    .input-xxlarge {
+      .border-radius(5px 0 0 5px);
+    }
+    .btn {
+      background-color: @navBG;
+      color: #fff;
+      margin-left: -1px;
+      padding: 10px 10px 9px;
+      border: none;
+      line-height: 1.5em;
+      .border-radius(5px);
+      &:hover{
+        background-color: #cbcbcb;
+      }
+    }
+
+    .copy-button {
+      .border-radius(0 5px 5px 0);
+    }
+
+    .zeroclipboard-is-hover {
+      background-color: #cbcbcb;
+    }
+
+    .icon-question-sign {
+      margin-left: 3px;
+    }
+  }
+}
+
+.api-bar-tray:before {
+  right: 95px;
+}
+
+.clipboard-copy-element {
+  i:before {
+    margin-right: 0px;
+  }
+
+}
+
+a.clipboard-copy-element:hover {
+  text-decoration: none;
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/assets/less/fauxton.less b/app/addons/fauxton/assets/less/fauxton.less
new file mode 100644
index 0000000..255589d
--- /dev/null
+++ b/app/addons/fauxton/assets/less/fauxton.less
@@ -0,0 +1 @@
+@import "components.less";

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/fauxton/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.react.jsx b/app/addons/fauxton/components.react.jsx
index 8f2dafa..09731ad 100644
--- a/app/addons/fauxton/components.react.jsx
+++ b/app/addons/fauxton/components.react.jsx
@@ -54,7 +54,7 @@ function (app, FauxtonAPI, React, ZeroClipboard, ReactBootstrap) {
 
     getClipboardElement: function () {
       if (this.props.displayType === 'icon') {
-        return (<i className="fonticon-clipboard"></i>);
+        return (<i className="fontawesome icon-paste"></i>);
       }
       return this.props.textDisplay;
     },
@@ -73,7 +73,7 @@ function (app, FauxtonAPI, React, ZeroClipboard, ReactBootstrap) {
       return (
         <a href="#"
           ref="copy"
-          className="copy"
+          className="copy clipboard-copy-element"
           data-clipboard-text={this.props.text}
           data-bypass="true"
           title={this.props.title}
@@ -113,13 +113,13 @@ function (app, FauxtonAPI, React, ZeroClipboard, ReactBootstrap) {
             value={this.props.textToCopy} />
           <a
             id={"copy-text-" + this.props.uniqueKey}
-            className="fonticon-clipboard icon btn copy-button"
+            className="btn copy-button clipboard-copy-element"
             data-clipboard-text={this.props.textToCopy}
             data-bypass="true"
             ref={"copy-text-" + this.props.uniqueKey}
             title="Copy to clipboard"
           >
-            Copy
+            <i className="fontawesome icon-paste"></i> Copy
           </a>
         </p>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/app/addons/fauxton/tests/componentsSpec.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/componentsSpec.react.jsx b/app/addons/fauxton/tests/componentsSpec.react.jsx
index fd53843..3c7870f 100644
--- a/app/addons/fauxton/tests/componentsSpec.react.jsx
+++ b/app/addons/fauxton/tests/componentsSpec.react.jsx
@@ -261,12 +261,12 @@ define([
 
     it('shows a clipboard icon by default', function () {
       var clipboard = TestUtils.renderIntoDocument(<Views.Clipboard text="copy me" />,
container);
-      assert.equal($(clipboard.getDOMNode()).find('.fonticon-clipboard').length, 1);
+      assert.equal($(clipboard.getDOMNode()).find('.icon-paste').length, 1);
     });
 
     it('shows text if specified', function () {
       var clipboard = TestUtils.renderIntoDocument(<Views.Clipboard displayType="text"
text="copy me" />, container);
-      assert.equal($(clipboard.getDOMNode()).find('.fonticon-clipboard').length, 0);
+      assert.equal($(clipboard.getDOMNode()).find('.icon-paste').length, 0);
     });
 
     it('shows custom text if specified ', function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7410de9f/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index ce86ccd..3c534a5 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -325,44 +325,7 @@ div.spinner {
   }
 }
 
-.api-bar-tray {
-  padding: 16px 20px;
-  .input-append.input-prepend {
-    margin-bottom: 0px;
 
-    .input-xxlarge {
-      .border-radius(5px 0 0 5px);
-    }
-    .btn {
-      background-color: @navBG;
-      color: #fff;
-      margin-left: -1px;
-      padding: 10px 10px 9px;
-      border: none;
-      line-height: 1.5em;
-      .border-radius(5px);
-      &:hover{
-        background-color: #cbcbcb;
-      }
-    }
-
-    .copy-button {
-      .border-radius(0 5px 5px 0);
-    }
-
-    .zeroclipboard-is-hover {
-      background-color: #cbcbcb;
-    }
-
-    .icon-question-sign {
-      margin-left: 3px;
-    }
-  }
-}
-
-.api-bar-tray:before {
-  right: 95px;
-}
 
 .js-filter-form {
   .help-block {
@@ -529,7 +492,7 @@ body #dashboard .flex-body#breadcrumbs {
       .border-radius(5px);
       font-size: 13px;
       padding: 8px 35px 8px 10px;
-      width: 200px;
+      width: 150px;
     }
     .btn-primary {
       background: none repeat scroll 0% 0% transparent;
@@ -624,7 +587,7 @@ footer.pagination-footer {
 }
 
 // left navigationbar is opened
-@media (max-width: 780px) {
+@media (max-width: 730px) {
   .closeMenu {
     .one-pane {
       .searchbox-wrapper {
@@ -634,7 +597,7 @@ footer.pagination-footer {
   }
 }
 
-@media (max-width: 1050px) {
+@media (max-width: 1000px) {
   .closeMenu {
     .with-sidebar {
       .searchbox-wrapper {
@@ -645,7 +608,7 @@ footer.pagination-footer {
 }
 
 // left navigationbar is closed
-@media (max-width: 925px) {
+@media (max-width: 875px) {
   body:not(.closeMenu) {
     .one-pane {
       .searchbox-wrapper {
@@ -655,7 +618,7 @@ footer.pagination-footer {
   }
 }
 
-@media (max-width: 1225px) {
+@media (max-width: 1285px) {
   body:not(.closeMenu) {
     .with-sidebar {
       .searchbox-wrapper {
@@ -665,11 +628,46 @@ footer.pagination-footer {
   }
 }
 
-@media (max-width: 1227px) {
+.control-toggle-include-docs span::before {
+  content: "Include Docs";
+}
+
+@media (max-width: 1177px) {
+  body.closeMenu {
+    .with-sidebar {
+      .two-panel-header {
+        .control-toggle-include-docs span::before {
+          content: " Docs";
+          margin-left: 5px;
+        }
+        i.icon.fonticon-link:before,
+        i.icon.fonticon-gears:before {
+          margin: 10px 0px 0 0;
+        }
+        .icon.fontawesome {
+          margin: 0 -6px 0 0px;
+        }
+        .right-header button i:before{
+          margin: 2px 0 0 0;
+        }
+        #query-options-tray:before {
+          right: 136px
+        }
+      }
+    }
+  }
+}
+
+
+@media (max-width: 1104px) {
   body.closeMenu {
     .with-sidebar {
       .two-panel-header {
-        button span {
+        .control-toggle-include-docs span::before {
+          content: " Docs";
+          margin-left: 5px;
+        }
+        button:not(.control-toggle-include-docs) span {
           display: none;
         }
         button i:before {
@@ -693,11 +691,41 @@ footer.pagination-footer {
   }
 }
 
-@media (max-width: 1389px) {
+@media (max-width: 1339px) {
+  body:not(.closeMenu) {
+    .with-sidebar {
+      .two-panel-header {
+        .control-toggle-include-docs span::before {
+          content: " Docs";
+          margin-left: 5px;
+        }
+        i.icon.fonticon-link:before,
+        i.icon.fonticon-gears:before {
+          margin: 10px 0px 0 0;
+        }
+        .icon.fontawesome {
+          margin: 0 -6px 0 0px;
+        }
+        .right-header button i:before{
+          margin: 2px 0 0 0;
+        }
+        #query-options-tray:before {
+          right: 136px
+        }
+      }
+    }
+  }
+}
+
+@media (max-width: 1082px) {
   body:not(.closeMenu) {
     .with-sidebar {
       .two-panel-header {
-        button span {
+        .control-toggle-include-docs span::before {
+          content: " Docs";
+          margin-left: 5px;
+        }
+        button:not(.control-toggle-include-docs) span {
           display: none;
         }
         button i:before {


Mime
View raw message