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 c5d0cf4
Date Wed, 25 Sep 2013 15:26:27 GMT
Updated Branches:
  refs/heads/master 1d0116399 -> c5d0cf4e8


CSS fix for adding a new view to a design doc that doesn't exist.
More footer css fixes


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

Branch: refs/heads/master
Commit: c5d0cf4e8a3f72b14303dab93346c3cadabb42a6
Parents: 1d01163
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Wed Sep 25 11:26:20 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Wed Sep 25 11:26:20 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/templates/documents/view_editor.html |  9 ++++++---
 src/fauxton/assets/index.underscore                  |  2 +-
 src/fauxton/assets/less/database.less                | 10 ++++++++++
 src/fauxton/assets/less/fauxton.less                 |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5d0cf4e/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 8e9d5bc..b1ca470 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -24,8 +24,9 @@ the License.
         <div class="errors-container"></div>
         <form class="form-horizontal view-query-save">
 
-          <div class="control-group">
-            <label for="ddoc">Design document <a href="<%=getDocUrl('design_doc')%>"
target="_blank"><i class="icon-question-sign"></i></a></label>
+          <div class="control-group design-doc-group">
+            <div class="span3">
+              <label for="ddoc">Design document <a href="<%=getDocUrl('design_doc')%>"
target="_blank"><i class="icon-question-sign"></i></a></label>
               <select id="ddoc">
                 <optgroup label="Select a document">
                   <option id="new-doc">New document</option>
@@ -38,7 +39,9 @@ the License.
                   <% }); %>
                 </optgroup>
               </select>
-            <div id="new-ddoc-section" class="span5 offset1" style="display:none">
+            </div>
+
+            <div id="new-ddoc-section" class="span5" style="display:none">
               <label class="control-label" for="new-ddoc"> _design/ </label>
               <div class="controls">
                 <input type="text" id="new-ddoc" placeholder="newDesignDoc">

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5d0cf4e/src/fauxton/assets/index.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/index.underscore b/src/fauxton/assets/index.underscore
index 3d273d3..cbf5bd6 100644
--- a/src/fauxton/assets/index.underscore
+++ b/src/fauxton/assets/index.underscore
@@ -37,7 +37,7 @@
     <div id="app-container"></div>
 
     <footer>
-      <div id="footer-content" class="container"></div>
+      <div id="footer-content"></div>
     </footer>
   </div>
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5d0cf4e/src/fauxton/assets/less/database.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/database.less b/src/fauxton/assets/less/database.less
index c6b322d..03c0d7f 100644
--- a/src/fauxton/assets/less/database.less
+++ b/src/fauxton/assets/less/database.less
@@ -214,3 +214,13 @@ table.active-tasks{
     }
 }
 
+.design-doc-group{
+    .span3 { margin: 0;}
+    #new-ddoc-section {
+        margin-top: 10px;
+        label{ width: 100px}
+        .controls{
+            margin-left: 100px;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5d0cf4e/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index d2bd3eb..e79d42e 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -37,6 +37,7 @@ footer {
   margin-left: @navWidth;
   padding: 5px 10px;
   background-color: #F2F2F2;
+  width: 100%;
 }
 
 .hide-text {


Mime
View raw message