couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject git commit: updated refs/heads/master to 2e506c0
Date Wed, 11 Sep 2013 15:25:17 GMT
Updated Branches:
  refs/heads/master 100df792a -> 2e506c0f3


Make Action collumns buttons.
Pull less variables out into their own file.


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

Branch: refs/heads/master
Commit: 2e506c0f34972453b907163a3cd3c0b62bf583d1
Parents: 100df79
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Wed Sep 11 11:22:55 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Wed Sep 11 11:24:51 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/templates/databases/item.html | 10 +--
 src/fauxton/assets/less/database.less         | 12 ++++
 src/fauxton/assets/less/fauxton.less          | 63 +------------------
 src/fauxton/assets/less/variables.less        | 72 ++++++++++++++++++++++
 4 files changed, 86 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e506c0f/src/fauxton/app/templates/databases/item.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/item.html b/src/fauxton/app/templates/databases/item.html
index 2f4ed68..8740242 100644
--- a/src/fauxton/app/templates/databases/item.html
+++ b/src/fauxton/app/templates/databases/item.html
@@ -19,13 +19,5 @@ the License.
 <td><%= database.status.numDocs() %></td>
 <td><%= database.status.updateSeq() %></td>
 <td>
-  <div class="dropdown">
-    <a class="dropdown-toggle fonticon-cog"
-       data-toggle="dropdown"
-       href="#">
-    </a>
-    <ul class="dropdown-menu">
-	    <li><a class="set-replication-start" href="#/replication/<%= database.get("name")
%>">replicate</a></li>
-    </ul>
-  </div>
+  <a class="db-actions btn fonticon-replicate set-replication-start" href="#/replication/<%=
database.get("name") %>"></a>
 </td>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e506c0f/src/fauxton/assets/less/database.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/database.less b/src/fauxton/assets/less/database.less
index e1862d9..42b5cf7 100644
--- a/src/fauxton/assets/less/database.less
+++ b/src/fauxton/assets/less/database.less
@@ -200,3 +200,15 @@ table.active-tasks{
 #tabs {
     height: 40px;
 }
+
+.databases{
+    a.db-actions,
+    a.db-actions:visited{
+        color: @red; 
+        border: 1px solid #e3e3e3;
+        padding: 5px 7px;
+        .border-radius(6px);
+        text-decoration: none;
+        font-size: 19px;
+    }
+}

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e506c0f/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 1e0ccd2..e03003a 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -18,6 +18,7 @@
  */
 @import "bootstrap/bootstrap.less";
 @import "bootstrap/mixins.less";
+@import "variables.less";
 @import "config.less";
 @import "logs.less";
 @import "prettyprint.less";
@@ -25,68 +26,6 @@
 @import "icons.less";
 
 
-
-/*define variable for color here, remove to seperate file later*/
-
-@brown: #3A2C2B;
-@red: #E33F3B;
-@darkRed: #AF2D24;
-@linkRed: #DA4F49;
-@greyBrown: #554D4C;
-@fontGrey: #808080;
-@secondarySidebar: #E4DFDC;
-
-
-@orange: #F3622D;
-
-/*nav*/
-@primaryNav : @brown;
-@navBG: @darkRed;
-@navBGHighlight: @red;
-@navBGHover: @red;
-@navIconColor: @darkRed;
-@navIconHighlight: #FFFFFF;
-@bottomNav: @greyBrown;
-
-/*top header*/
-@breadcrumbBG: #F1F1F1;
-@breadcrumbText: @red;
-@breadcrumbArrow: #999999;
-@breadcrumbBorder: @red;
-
-/*background colors*/
-@background: #F2F2F2;
-@leftPanel: @background;
-@rightPanel: #CBCBCB;
-@defaultText: #4D4D4D;
-@defaultHTag: #333333;
-
-@saveButton: #80A221;
-
-@collapsedNavWidth: 62px;
-@navWidth: 220px;
-@sidebarBG: #F2F2F2;
-@sidebarWidth: 330px;
-
-@NavIconActive: #ffffff;
-@NavIcon: @brown;
-
-
-/*buttons */
-@redButton: @red;
-@linkColor: @red;
-
-@boxShadow: 2px 2px rgba(0,0,0,0.2);
-@boxShadowOff: 2px 2px rgba(0,0,0,0);
-@textShadow: 1px 2px rgba(0,0,0,0.2);
-@textShadowOff: 1px 2px rgba(0,0,0,0);
-
-@radius: 4px;
-@transitionSpeed: .25s;
-@transitionEaseType: linear;
-
-
-
 body {
   background-color: #F2F2F2;
 }

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e506c0f/src/fauxton/assets/less/variables.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/variables.less b/src/fauxton/assets/less/variables.less
new file mode 100644
index 0000000..f81b063
--- /dev/null
+++ b/src/fauxton/assets/less/variables.less
@@ -0,0 +1,72 @@
+/*  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *  use this file except in compliance with the License. You may obtain a copy of
+ *  the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations under
+ *  the License.
+ */
+
+/* = color variables
+   ---------------------------------------------------------------------- */
+@brown: #3A2C2B;
+@red: #E33F3B;
+@darkRed: #AF2D24;
+@linkRed: #DA4F49;
+@greyBrown: #554D4C;
+@fontGrey: #808080;
+@secondarySidebar: #E4DFDC;
+
+
+@orange: #F3622D;
+
+/*nav*/
+@primaryNav : @brown;
+@navBG: @darkRed;
+@navBGHighlight: @red;
+@navBGHover: @red;
+@navIconColor: @darkRed;
+@navIconHighlight: #FFFFFF;
+@bottomNav: @greyBrown;
+
+/*top header*/
+@breadcrumbBG: #F1F1F1;
+@breadcrumbText: @red;
+@breadcrumbArrow: #999999;
+@breadcrumbBorder: @red;
+
+/*background colors*/
+@background: #F2F2F2;
+@leftPanel: @background;
+@rightPanel: #CBCBCB;
+@defaultText: #4D4D4D;
+@defaultHTag: #333333;
+
+@saveButton: #80A221;
+
+@collapsedNavWidth: 62px;
+@navWidth: 220px;
+@sidebarBG: #F2F2F2;
+@sidebarWidth: 330px;
+
+@NavIconActive: #ffffff;
+@NavIcon: @brown;
+
+
+/*buttons */
+@redButton: @red;
+@linkColor: @red;
+
+@boxShadow: 2px 2px rgba(0,0,0,0.2);
+@boxShadowOff: 2px 2px rgba(0,0,0,0);
+@textShadow: 1px 2px rgba(0,0,0,0.2);
+@textShadowOff: 1px 2px rgba(0,0,0,0);
+
+@radius: 4px;
+@transitionSpeed: .25s;
+@transitionEaseType: linear;
+


Mime
View raw message