summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbear@apache.org>2014-01-06 10:44:19 -0500
committerGarren Smith <garren.smith@gmail.com>2014-01-13 11:19:11 +0200
commit861f20249a4358dd5acbd8a44f5096f0b47bddf2 (patch)
tree53ff31d189fe63160427faee713c3ac96a3c1ede
parent3465b04d696c8d47f4a5ab9ef748bcc93f1c53d8 (diff)
downloadcouchdb-861f20249a4358dd5acbd8a44f5096f0b47bddf2.tar.gz
Fix css files for addon mode
-rw-r--r--src/fauxton/app/addons/config/assets/less/config.less3
-rw-r--r--src/fauxton/app/addons/documents/assets/less/documents.less11
-rw-r--r--src/fauxton/app/addons/fauxton/base.js19
-rw-r--r--src/fauxton/assets/less/fauxton.less6
4 files changed, 21 insertions, 18 deletions
diff --git a/src/fauxton/app/addons/config/assets/less/config.less b/src/fauxton/app/addons/config/assets/less/config.less
index 8495b6982..737beb422 100644
--- a/src/fauxton/app/addons/config/assets/less/config.less
+++ b/src/fauxton/app/addons/config/assets/less/config.less
@@ -10,14 +10,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-
.config-item {
height: 41px;
.edit-button {
float: right;
- .btn;
- .btn-mini;
display:none;
}
diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less
new file mode 100644
index 000000000..ff9e88c6d
--- /dev/null
+++ b/src/fauxton/app/addons/documents/assets/less/documents.less
@@ -0,0 +1,11 @@
+/*ALL DOCS TABLE*/
+tr.all-docs-item{
+ border: none;
+ background: transparent;
+ .btn-group {
+ position: absolute;
+ right: 0;
+ top: 6px;
+ }
+}
+
diff --git a/src/fauxton/app/addons/fauxton/base.js b/src/fauxton/app/addons/fauxton/base.js
index aa4c3d4e0..1811e845f 100644
--- a/src/fauxton/app/addons/fauxton/base.js
+++ b/src/fauxton/app/addons/fauxton/base.js
@@ -11,19 +11,18 @@
// the License.
define([
- "app",
- // Libs
- "backbone",
- "resizeColumns",
+ "app",
+ // Libs
+ "backbone",
+ "resizeColumns",
],
function(app, Backbone, resizeColumns) {
-
//resizeAnimation
app.resizeColumns = new resizeColumns({});
app.resizeColumns.onResizeHandler();
-
+
var Fauxton = {};
Fauxton.Breadcrumbs = Backbone.View.extend({
@@ -136,7 +135,7 @@ function(app, Backbone, resizeColumns) {
if(!$(e.target).is('a')){
toggleMenu();
}
- }
+ }
});
function toggleMenu(){
@@ -147,8 +146,8 @@ function(app, Backbone, resizeColumns) {
$('#primary-navbar').on("click", ".nav a", function(){
if (!($selectorList.hasClass('closeMenu'))){
- setTimeout(
- function(){
+ setTimeout(
+ function(){
$selectorList.addClass('closeMenu');
app.resizeColumns.onResizeHandler();
},3000);
@@ -266,6 +265,6 @@ function(app, Backbone, resizeColumns) {
}
});
-
+
return Fauxton;
});
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index d41780a03..e1cfa06d9 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -911,11 +911,7 @@ pre.prettyprint {
color: #333333;
}
-/*ALL DOCS TABLE*/
-tr.all-docs-item{
- border: none;
- background: transparent;
-}
+
/*logs*/
#log-sidebar{