You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2013/06/25 23:07:48 UTC
[41/46] git commit: updated refs/heads/1829-User-Experience-Redesign
to b7ee0e5
_all_dbs is kinda ok
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a69be192
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a69be192
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a69be192
Branch: refs/heads/1829-User-Experience-Redesign
Commit: a69be192a21d9d276a17e07c154fa2690162f1ae
Parents: d2c0eea
Author: suelockwood <de...@gmail.com>
Authored: Tue Jun 18 16:02:39 2013 -0400
Committer: suelockwood <de...@gmail.com>
Committed: Tue Jun 18 16:02:39 2013 -0400
----------------------------------------------------------------------
src/fauxton/app/templates/databases/list.html | 2 +-
src/fauxton/assets/less/fauxton.less | 140 +++++++--------------
2 files changed, 49 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a69be192/src/fauxton/app/templates/databases/list.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/list.html b/src/fauxton/app/templates/databases/list.html
index dda4455..ff47500 100644
--- a/src/fauxton/app/templates/databases/list.html
+++ b/src/fauxton/app/templates/databases/list.html
@@ -13,7 +13,7 @@ the License.
-->
<div class="result-tools" style="">
- <div id="newButton"></div>
+ <div id="newButton" class="pull-left"></div>
<form class="navbar-form pull-right database-search">
<input type="text" class="search-query" placeholder="Search by database name">
</form>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a69be192/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index d62be45..61c45a9 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -23,90 +23,20 @@
@import "database.less";
@import "icons.less";
-/*!
- *
- * OVERRIDES
- *
- * Override styles from included less files here. Record where the style is
- * originally defined.
- *
- */
-
-//
-// Breadcrumbs
-
-// .breadcrumb {
-// background-color: transparent;
-// padding-left: 0px;
-// li {
-// color: @grayLight;
-// background-color: transparent;
-// a {
-// color: @grayLight;
-// }
-// }
-// .divider {
-// padding: 0 5px;
-// color: @grayLight; //ccc
-// }
-// .active {
-// color: @black;
-// font-weight: bold;
-// }
-// }
-
-
-// // Navs
-// // ------
-
-// .nav-tabs > li > a {
-// background-color: @grayLighter;
-// }
-
-// .dropdown-menu li > a {
-// font-size: 12px;
-// }
-
-// .nav-list .divider {
-// color: @grayLight;
-// // This function is defined in mixins
-// .nav-divider(transparent, @white);
-// }
-
-
-// // Misc
-// // ------
-
-// pre.view-code-error {
-// color: red !important; // yuck
-// }
-
-// .CodeMirror-scroll {
-// height: auto;
-// overflow-y: visible;
-// }
-
-// #define-view form textarea.js-editor {
-// width: 95%;
-// }
-
-// #define-view .CodeMirror-scroll {
-// height: auto;
-// min-height: 50px;
-// }
-
/*define variable for color here, remove to seperate file later*/
+@red: #E93F33;
+
/*nav*/
@primaryNav : #3A2C2B;
@navBG: #AF2D24;
-@navBGHighlight: #E93F33;
+@navBGHighlight: @red;
@navIconColor: #3A2C2B;
@navIconHighlight: #FFFFFF;
/*top header*/
@breadcrumbBG: #F1F1F1;
-@breadcrumbText: #E93F33;
+@breadcrumbText: @red;
@breadcrumbArrow: #999999;
@breadcrumbBorder: #E93F33;
@@ -123,13 +53,20 @@
/*buttons */
-@redButton: #E93F33;
+@redButton: @red;
+@linkColor: @red;
-.buttonStyle{
+body {
+ background-color: #F2F2F2;
}
+a,
+a:visited,
+a:active {
+ color: @linkColor;
+}
/* ajax loader */
.loader {
@@ -236,26 +173,13 @@
.closeMenu & {
margin-left: @collapsedNavWidth;
}
- &.one-pane{}
+ &.one-pane{
+ margin-top: 60px;
+ }
}
-
-
-// #dashboard {
-// height: 100%;
-// z-index: 100;
-// padding: 0;
-// margin: 0;
-// .box-shadow(-10px 0 15px -6px #333333);
-// position: absolute;
-// left: 220px;
-// width: 100%;
-// .closeMenu & {
-// left: 105px;
-// }
-// }
#dashboard-content{
padding: 20px;
.with-sidebar &{
@@ -280,6 +204,9 @@
}
+/*tools*/
+
+
.fixed-header{
position: fixed;
top: 0;
@@ -317,6 +244,34 @@ footer#mainFooter{
bottom: 0;
}
+
+
+
+/*ONE PANEL TEMPLATE ONLY STYLES AKA _all_dbs */
+
+.result-tools{
+ border-bottom: 1px solid #999999;
+ padding: 5px 0;
+ border-bottom: 1px solid #999999;
+ padding: 10px 0;
+ float: left;
+ width: 100%;
+ margin-bottom: 10px;
+}
+
+
+.navbar-form input{
+ .border-radius(0);
+ padding: 7px;
+ margin-top: -5px;
+}
+
+/*TABLE STYLES*/
+thead {border-bottom: 2px solid @redButton;}
+
+
+
+
/*form elements and buttons*/
.button{
border: none;
@@ -332,3 +287,4 @@ footer#mainFooter{
text-decoration: none;
}
}
+