From a7bc3852719f75f073a095628c076286555b1d3f Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Wed, 21 Nov 2012 17:25:23 +0400
Subject: [PATCH] force container css when included after bootstrap css
---
src/containers/editable-container.css | 6 +++---
test/loader.js | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/containers/editable-container.css b/src/containers/editable-container.css
index 013d927..927ab10 100644
--- a/src/containers/editable-container.css
+++ b/src/containers/editable-container.css
@@ -1,6 +1,6 @@
-.editable-container {
+.editable-container,
+.editable-container.popover {
width: auto;
white-space: nowrap; /* without this rule buttons wrap input in non-static elements */
max-width: none; /* without this rule poshytip does not stretch */
-}
-
+}
\ No newline at end of file
diff --git a/test/loader.js b/test/loader.js
index 518dd63..136ba5b 100644
--- a/test/loader.js
+++ b/test/loader.js
@@ -78,7 +78,8 @@ function getAssets(f, c, src, libs) {
//core
js.unshift(bootstrap+'js/bootstrap.js')
css.unshift(bootstrap+'css/bootstrap.css');
- css.unshift(bootstrap+'css/bootstrap-responsive.css');
+// css.push(bootstrap+'css/bootstrap.css');
+ //css.unshift(bootstrap+'css/bootstrap-responsive.css');
//editable
js.push(forms+'editable-form-bootstrap.js');