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/03 16:44:36 UTC
[3/7] couchdb commit: updated refs/heads/Update-Sidebar-Ui to 1ec81fb
cleaning up Fauxton- adding more in the LESS here to be overridden easier w/addons
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/71d9b067
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/71d9b067
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/71d9b067
Branch: refs/heads/Update-Sidebar-Ui
Commit: 71d9b067cdeaec4f6d955f12c9e3e817cb6eb136
Parents: 40e27f6
Author: sean barclay <fu...@hotmail.com>
Authored: Thu May 29 10:56:16 2014 -0700
Committer: sean barclay <fu...@hotmail.com>
Committed: Thu May 29 10:56:16 2014 -0700
----------------------------------------------------------------------
.../addons/documents/assets/less/documents.less | 48 +++++++++++++-------
.../documents/templates/design_doc_menu.html | 6 ++-
src/fauxton/assets/less/fauxton.less | 5 +-
src/fauxton/assets/less/variables.less | 3 +-
4 files changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/71d9b067/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 4b0ea9d..b8160cc 100644
--- a/src/fauxton/app/addons/documents/assets/less/documents.less
+++ b/src/fauxton/app/addons/documents/assets/less/documents.less
@@ -12,7 +12,7 @@
/*ALL DOCS TABLE*/
@import "../../../style/assets/less/mixins.less";
-@import "../../../style/assets/less/variables.less";
+@import "../../../../../assets/less/variables.less";
tr.all-docs-item {
border: none;
@@ -24,7 +24,7 @@ tr.all-docs-item {
}
}
button.beautify {
- margin-top: 20px;
+ margin-top: 20px;
}
.toggle-btns {
@@ -163,6 +163,14 @@ button.beautify {
.sidenav{
margin-bottom: 40px;
+ .nav-list > .active > a{
+ text-shadow: none;
+ background-color: rgba(0, 0, 0, 0.05);
+ }
+ .nav-list > .active > a:hover,
+ .nav-list > .active > a:focus{
+ color: white;
+ }
li{
position: relative;
&:hover{
@@ -186,40 +194,46 @@ button.beautify {
padding-left: 55px;
font-size: 14px;
&:hover {
- background-color: #af2d24;
color: #fff;
text-decoration: none;
+ background-color: @darkRed;
}
}
}
- > div.js-collapse-toggle{
+ > .js-collapse-toggle{
position: relative;
display: block;
- padding: 10px 13px 10px 30px;
color: #333333;
border-bottom: 1px solid #d3d7db;
- &:hover{
- span, span:before{
+ .accordion-list-item:hover {
+ p, .fonticon-play{
color: white;
}
+ p{
+ background-color: @darkRed;
+ }
}
- span:last-of-type{
- margin-left: 4px;
- }
- span, span:before{
+ .accordion-list-item p, .fonticon-play{
.transition(all 0.25s linear);
- color: #767F89;
}
- span:before{
+ .accordion-list-item p{
+ margin: 0;
+ padding: 10px 13px 10px 36px;
+ color: @linkRed;
+ }
+ .fonticon-play{
+ color: @subListGray;
+ position: absolute;
+ display: block;
vertical-align: bottom;
font-size: 12px;
- padding-right: 0px;
- margin-bottom: 2px;
+ top: 12px;
+ left: 12px;
}
- &.down span:before {
+ &.down .fonticon-play {
.rotate(90deg);
}
- div.add-dropdown{
+ .add-dropdown{
right: 15px;
}
.dropdown-toggle:hover{
http://git-wip-us.apache.org/repos/asf/couchdb/blob/71d9b067/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 634030b..3a1f1f1 100644
--- a/src/fauxton/app/addons/documents/templates/design_doc_menu.html
+++ b/src/fauxton/app/addons/documents/templates/design_doc_menu.html
@@ -14,8 +14,10 @@ the License.
<li class="nav-header">
<div class="js-collapse-toggle" data-toggle="collapse" data-target="#<%= ddoc_clean %>">
- <span class="fonticon-play"></span>
- <span><%= designDoc%></span>
+ <div class="accordion-list-item">
+ <div class="fonticon-play"></div>
+ <p><%= designDoc%></p>
+ </div>
<div class="new-button add-dropdown"></div>
</div>
<ul class="accordion-body collapse" id="<%= ddoc_clean %>">
http://git-wip-us.apache.org/repos/asf/couchdb/blob/71d9b067/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index e242e9b..13fe778 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -699,11 +699,11 @@ table.databases {
background-color: @darkRed;
color: #fff;
}
-
li.active > a {
color: @darkRed;
}
> li > a{
+ color: @linkRed;
padding: 10px 13px 10px 30px;
border-bottom: 1px solid #d3d7db;
}
@@ -716,7 +716,6 @@ table.databases {
display: block;
padding: 10px 5px 10px 15px;
color: #333333;
-
.divider {
background: none;
color: #ccc;
@@ -727,8 +726,6 @@ table.databases {
padding: 0px;
text-shadow: none;
color: #333333;
- margin-bottom: -4px;
-
& > span:hover {
color: @red;
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/71d9b067/src/fauxton/assets/less/variables.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/variables.less b/src/fauxton/assets/less/variables.less
index 2377e6b..d3ea957 100644
--- a/src/fauxton/assets/less/variables.less
+++ b/src/fauxton/assets/less/variables.less
@@ -20,7 +20,8 @@
@greyBrown: #554D4C;
@greyBrownLighter: #A59D9D;
@fontGrey: #808080;
-@secondarySidebar: #E4DFDC;
+@secondarySidebar: white;
+@subListGray: #767F89;
@orange: #F3622D;