couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject fauxton commit: updated refs/heads/master to 895d13c
Date Tue, 26 Aug 2014 16:22:04 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e24a590ef -> 895d13c42


Fix align for active tasks progress bar and button


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

Branch: refs/heads/master
Commit: 895d13c42615cfca532f3601c2b9363f69ff360c
Parents: e24a590
Author: Alexander Shorin <kxepal@apache.org>
Authored: Mon Aug 25 19:07:37 2014 +0400
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Aug 26 18:21:44 2014 +0200

----------------------------------------------------------------------
 app/addons/replication/assets/less/replication.less | 9 +++++++++
 app/addons/replication/templates/progress.html      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/895d13c4/app/addons/replication/assets/less/replication.less
----------------------------------------------------------------------
diff --git a/app/addons/replication/assets/less/replication.less b/app/addons/replication/assets/less/replication.less
index 0f8a8f5..a60f509 100644
--- a/app/addons/replication/assets/less/replication.less
+++ b/app/addons/replication/assets/less/replication.less
@@ -183,6 +183,15 @@
       margin: 0;
       list-style: none;
       border-top: 1px solid @greyBrownLighter;
+      div.bar {
+        font-size: 16px;
+        line-height: 30px;
+      }
     }
   }
 }
+
+.task-cancel-button {
+    padding: 4px 12px;
+    margin-bottom: 3px;
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/895d13c4/app/addons/replication/templates/progress.html
----------------------------------------------------------------------
diff --git a/app/addons/replication/templates/progress.html b/app/addons/replication/templates/progress.html
index ea9d6c3..76c8e9f 100644
--- a/app/addons/replication/templates/progress.html
+++ b/app/addons/replication/templates/progress.html
@@ -18,5 +18,5 @@ the License.
 </div>
 
 <span class="span1">
-	<button class="cancel btn btn-danger btn-large delete" data-source="<%-source%>"
 data-rep-id="<%-repid%>" data-continuous="<%-continuous%>" data-target="<%-target%>">Cancel</a>
+	<button class="cancel btn btn-danger btn-large delete task-cancel-button" data-source="<%-source%>"
 data-rep-id="<%-repid%>" data-continuous="<%-continuous%>" data-target="<%-target%>">Cancel</a>
 </span>


Mime
View raw message