You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/06/11 14:56:55 UTC
[39/39] couchdb commit: updated refs/heads/Update-Sidebar-Ui to
2cf2eab
Fixes to css and accordions
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2cf2eab1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2cf2eab1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2cf2eab1
Branch: refs/heads/Update-Sidebar-Ui
Commit: 2cf2eab1d2f58362928966208f78b0da295da703
Parents: fe7b6b6
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jun 11 14:49:39 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 11 14:49:39 2014 +0200
----------------------------------------------------------------------
.../app/addons/documents/assets/less/documents.less | 12 ++++--------
src/fauxton/app/addons/documents/sidebarviews.js | 4 +++-
.../app/addons/documents/templates/design_doc_menu.html | 2 +-
.../app/addons/documents/templates/index_menu_item.html | 4 ++--
src/fauxton/app/addons/fauxton/components.js | 1 -
5 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2cf2eab1/src/fauxton/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less
index ca1f599..3dfb2fc 100644
--- a/src/fauxton/app/addons/documents/assets/less/documents.less
+++ b/src/fauxton/app/addons/documents/assets/less/documents.less
@@ -211,7 +211,10 @@ button.beautify {
display: block;
vertical-align: bottom;
}
- > .js-collapse-toggle{
+ .accordion-header:hover .fonticon-play {
+ color: white;
+ }
+ > .accordion-header{
position: relative;
display: block;
border-bottom: 1px solid #d3d7db;
@@ -273,13 +276,6 @@ button.beautify {
.rotate(90deg);
}
- &:hover {
- .fonticon-play {
- color: white;
-
- }
- }
-
}
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2cf2eab1/src/fauxton/app/addons/documents/sidebarviews.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/sidebarviews.js b/src/fauxton/app/addons/documents/sidebarviews.js
index bf07d28..877e56b 100644
--- a/src/fauxton/app/addons/documents/sidebarviews.js
+++ b/src/fauxton/app/addons/documents/sidebarviews.js
@@ -119,7 +119,9 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
.parents(".accordion-body")
.addClass("in")
.parents(".nav-header")
- .find(".js-collapse-toggle").addClass("down");
+ .find(">.js-collapse-toggle").addClass("down");
+
+ this.$('.js-toggle-' + $selectedTab.data('ddoctype')).addClass("down");
}
}
});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2cf2eab1/src/fauxton/app/addons/documents/templates/design_doc_menu.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/templates/design_doc_menu.html b/src/fauxton/app/addons/documents/templates/design_doc_menu.html
index e49ec21..6094cbd 100644
--- a/src/fauxton/app/addons/documents/templates/design_doc_menu.html
+++ b/src/fauxton/app/addons/documents/templates/design_doc_menu.html
@@ -13,7 +13,7 @@ the License.
-->
<li class="nav-header">
- <div class="js-collapse-toggle" data-toggle="collapse" data-target="#<%= ddoc_clean %>">
+ <div class="js-collapse-toggle accordion-header" data-toggle="collapse" data-target="#<%= ddoc_clean %>">
<div class="accordion-list-item">
<div class="fonticon-play"></div>
<p><%= designDoc%></p>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2cf2eab1/src/fauxton/app/addons/documents/templates/index_menu_item.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/templates/index_menu_item.html b/src/fauxton/app/addons/documents/templates/index_menu_item.html
index ad5979b..8b1c33c 100644
--- a/src/fauxton/app/addons/documents/templates/index_menu_item.html
+++ b/src/fauxton/app/addons/documents/templates/index_menu_item.html
@@ -11,7 +11,7 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
-->
-<a class="js-collapse-toggle" data-toggle="collapse" data-target="#<%- ddocType %>" >
+<a class="js-toggle-<%-ddocType%> accordion-header js-collapse-toggle" data-toggle="collapse" data-target="#<%- ddocType %>" >
<div class="fonticon-play"></div>
<span class="<%- icon %> fonticon"></span>
<%- ddocType %>
@@ -19,7 +19,7 @@ the License.
<ul class="accordion-body collapse" id="<%= ddocType %>">
<% _.each(collection, function (item, index) { %>
<li>
- <a id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%=ddocType%>/<%= safeURL(index) %>" class="toggle-view">
+ <a data-ddoctype="<%- ddocType %>" id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%=ddocType%>/<%= safeURL(index) %>" class="toggle-view">
<%- index %>
</a>
</li>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2cf2eab1/src/fauxton/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/components.js b/src/fauxton/app/addons/fauxton/components.js
index c3c0e4f..f237014 100644
--- a/src/fauxton/app/addons/fauxton/components.js
+++ b/src/fauxton/app/addons/fauxton/components.js
@@ -547,7 +547,6 @@ function(app, FauxtonAPI, ace, spin) {
},
serialize: function(){
var sidebarItem = FauxtonAPI.getExtensions('sidebar:links');
- console.log('linls', this.links);
return {
links: this.links
};