http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ea2b081/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index e1cfa06..ec3ff55 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -65,7 +65,7 @@ body { /* OVERRIDE BOOTSTRAP BTN STYLES */ .btn{ .box-shadow(none); - .border-radius(0); + .border-radius(@baseBorderRadius); background-image: none; text-shadow: none; background-repeat: no-repeat; @@ -125,11 +125,19 @@ a:hover{ } } -/* bootstrap override */ +/* bootstrap overrides */ .container-fluid { padding-right: 0px; padding-left: 0px; } +.page-header { + border-bottom: 1px solid #E3E3E3; + margin-bottom: 10px; + h3 { + text-transform: capitalize; + margin-bottom: 0; + } +} /* Fixed side navigation */ #primary-navbar { @@ -209,11 +217,11 @@ a:hover{ } background-color: @red; } - &:hover a.fonticon:before{ + &:hover .fonticon:before{ color: @white; } - &.active a.fonticon:before, - &:hover a.fonticon:before, + &.active .fonticon:before, + &:hover .fonticon:before, { text-shadow: @boxShadow; color: @NavIconActive; @@ -226,7 +234,7 @@ a:hover{ &.closeMenu{ color: transparent; } - & span.fonticon { + .fonticon { position: relative; &:before { position: absolute; @@ -459,6 +467,11 @@ footer#mainFooter{ padding: 10px 5px 10px 15px; color: #333333; border-bottom: 1px solid #989898; + .divider { + background: none; + color: #ccc; + padding: 0 2px; + } } .nav-header{ background-color: #B2B2B2; @@ -499,14 +512,6 @@ footer#mainFooter{ margin-bottom: 10px; } -.navbar-form.pull-right.database-search { - margin: -10px 50px 12px 0; - padding: 11px; - input[type=text]{ - margin-top: 0px; - } -} - #db-views-tabs-nav{ position: fixed; z-index: 12; @@ -600,84 +605,27 @@ tbody {padding-top: 10px;} } .btn { - padding-top: 12px; - padding-bottom: 12px; - margin-top: 0px; -} - -.button{ - .button-style; - .transition(all @transitionSpeed @transitionEaseType); - border: none; - background-color: @redButton; - color: #fff; padding: 10px; + margin-top: 0px; .icon { - margin-right: 10px; - font-size: 20px; - } - &:hover { - color: #fff; - text-decoration: none; - } -} - - -.button-style{ - background-color: @redButton; - color: #fff; - padding: 10px 15px; - cursor: pointer; - &:before{ - padding-right: 5px; + margin-right: 0.2em; } - &.outlineGray{ - border: 1px solid @grayLight; - background-color: transparent; - color: @grayDark; - &:hover{ - border: 1px solid @orange; + &.btn-small { + padding: 5px 10px; + .icon { + margin-right: 0; + font-size: inherit; } } - &.gray{ - background-color: #ddd; - color: @grayDark; - } - &.green{ - background-color: @green; - } - - &.round-btn { - .border-radius(@radius); - } - .icon { - margin-right: 10px; - font-size: 20px; - } - &:hover { - color: #fff; - text-decoration: none; - background-color: @orange; - } - a&, - a&:visited, - a&:active{ - color: #fff; - } - &:disabled { - opacity: 0.5; + &.btn-mini { + padding: 3px 8px; + .icon { + margin-right: 0; + font-size: inherit; + } } } - - - -a.button, -a.button:visited, -a.button:active { - .button-style; -} - .select{ > a{ display: block; @@ -883,15 +831,12 @@ form.view-query-update, form.view-query-save { font-size: 18px; padding: 14px 5px 30px; } + .btn .icon{ + font-size: 21.5px; + margin-right: 0; + } } -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - padding: 10px 5px 14px; -} -.input-append .btn{ - padding: 10px 5px 14px; -} .row-fluid .input-append [class*="span"], .input-prepend input[class*="span"]{ width: auto; @@ -936,6 +881,10 @@ div.spinner { border: solid 1px #ddd; } +.btn-primary { + background: @redButton; +} + .btn-primary a:visited { color: #fff; } @@ -944,11 +893,11 @@ div.spinner { position: relative; } -.button.api-url-btn { +.api-url-btn { position: absolute; right: 15px; top: -50px; - span.icon { + .icon { font-size: 11px; } } @@ -975,17 +924,6 @@ div.spinner { } } -#jump-to-doc, -#jump-to-db - { - width: auto; - float:right; - button{ - padding-left: 20px; - padding-right: 10px; - } -} - #map-function, #reduce-function{ width: 100%; font-size: 16px; @@ -996,7 +934,3 @@ div.spinner { height: 688px; font-size: 16px; } - -#delete-database { - float: right; -}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ea2b081/src/fauxton/assets/less/variables.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/variables.less b/src/fauxton/assets/less/variables.less index bf97b5d..34f8b90 100644 --- a/src/fauxton/assets/less/variables.less +++ b/src/fauxton/assets/less/variables.less @@ -18,6 +18,7 @@ @darkRed: #AF2D24; @linkRed: #DA4F49; @greyBrown: #554D4C; +@greyBrownLighter: #A59D9D; @fontGrey: #808080; @secondarySidebar: #E4DFDC; @@ -77,6 +78,7 @@ @textShadowOff: 1px 2px rgba(0,0,0,0); @radius: 4px; +@baseBorderRadius: 0; @transitionSpeed: .25s; @transitionEaseType: linear; http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ea2b081/src/fauxton/readme.md ---------------------------------------------------------------------- diff --git a/src/fauxton/readme.md b/src/fauxton/readme.md index a0c7702..bb81095 100644 --- a/src/fauxton/readme.md +++ b/src/fauxton/readme.md @@ -21,7 +21,7 @@ A recent of [node.js](http://nodejs.org/) and npm is required. ### CouchDB Setup ### - 1. Clone the Couchdb repo: https://github.com/apache/couchdb.git or http://git-wip-us.apache.org/repos/asf/couchdb.git + 1. Clone the CouchDB repo: https://github.com/apache/couchdb.git or http://git-wip-us.apache.org/repos/asf/couchdb.git cd couchdb ### Fauxton Setup ### @@ -32,7 +32,11 @@ A recent of [node.js](http://nodejs.org/) and npm is required. npm install ### Dev Server - Using the dev server is the easiest way to use fauxton, specially when developing for it. +Using the dev server is the easiest way to use fauxton, specially when +developing for it. Copy or symlink the `settings.json.default` (or the +`settings.json.dev` file if you'd like to see the `styletests` addon). + +And then... grunt dev @@ -63,7 +67,7 @@ A recent of [node.js](http://nodejs.org/) and npm is required. ### To Deploy Fauxton - ./bin/grunt couchapp_deploy - to deploy to your local [Couchdb instance] (http://localhost:5984/fauxton/_design/fauxton/index.html) + ./bin/grunt couchapp_deploy - to deploy to your local [CouchDB instance] (http://localhost:5984/fauxton/_design/fauxton/index.html) ## Understang Fauxton Code layout http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ea2b081/src/fauxton/settings.json.dev ---------------------------------------------------------------------- diff --git a/src/fauxton/settings.json.dev b/src/fauxton/settings.json.dev new file mode 100644 index 0000000..e2df66b --- /dev/null +++ b/src/fauxton/settings.json.dev @@ -0,0 +1,59 @@ +{ + "deps": [ + { "name": "databases" }, + { "name": "documents" }, + { "name": "pouchdb" }, + { "name": "activetasks" }, + { "name": "config" }, + { "name": "logs" }, + { "name": "stats" }, + { "name": "replication" }, + { "name": "plugins" }, + { "name": "contribute" }, + { "name": "permissions" }, + { "name": "compaction" }, + { "name": "auth" }, + { "name": "verifyinstall" }, + { "name": "styletests" } + ], + "template": { + "development": { + "src": "assets/index.underscore", + "dest": "dist/debug/index.html", + "variables": { + "requirejs": "/assets/js/libs/require.js", + "css": "./css/index.css", + "base": null + }, + "app": { + "root": "/", + "host": "../..", + "version": "1.0.dev" + } + }, + "release": { + "src": "assets/index.underscore", + "dest": "dist/debug/index.html", + "variables": { + "requirejs": "./js/require.js", + "css": "./css/index.css", + "base": null + }, + "app": { + "root": "/_utils/fauxton/", + "host": "../..", + "version": "1.0" + } + } + }, + + "couch_config": { + "fauxton": { + "db": "http://localhost:5984/fauxton";, + "app": "./couchapp.js", + "options": { + "okay_if_missing": true + } + } + } +}
