From 94651fbff47b0843514783ef748d2683bb907795 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Wed, 29 Feb 2012 12:52:03 +0000 Subject: [PATCH] [#55,misc][s]: switch to bootstrap v2.0 making some minor changes to html and css as a result (fixes #55). --- css/data-explorer.css | 16 +- demo/index.html | 12 +- docs/view.html | 7 +- recline.js | 52 +- src/view.js | 7 +- vendor/bootstrap/1.4.0/bootstrap-alerts.js | 113 - vendor/bootstrap/1.4.0/bootstrap.css | 2467 -------------- vendor/bootstrap/2.0.0/bootstrap.css | 3365 ++++++++++++++++++++ vendor/bootstrap/2.0.0/bootstrap.js | 1722 ++++++++++ 9 files changed, 5150 insertions(+), 2611 deletions(-) delete mode 100644 vendor/bootstrap/1.4.0/bootstrap-alerts.js delete mode 100644 vendor/bootstrap/1.4.0/bootstrap.css create mode 100644 vendor/bootstrap/2.0.0/bootstrap.css create mode 100644 vendor/bootstrap/2.0.0/bootstrap.js diff --git a/css/data-explorer.css b/css/data-explorer.css index ea5ba775..25e1ad3e 100644 --- a/css/data-explorer.css +++ b/css/data-explorer.css @@ -20,7 +20,12 @@ .header .recline-query-editor { float: right; - margin: 4px; + height: 30px; +} + +.header .recline-query-editor form { + height: 30px; + margin-bottom: 0; } .header .recline-query-editor label { @@ -39,12 +44,19 @@ .header .recline-query-editor .pagination input { width: 30px; + height: 18px; + padding: 2px 4px; + margin-top: -4px; } .header .recline-query-editor .pagination a { line-height: 28px; } +.header .recline-query-editor form .btn { + margin-top: -23px; +} + .data-view-container { display: block; clear: both; @@ -155,11 +167,13 @@ .data-table { border: 1px solid #ccc; font-size: 12px; + width: 100%; } .data-table td, .data-table th { border-left: 1px solid #ccc; padding: 3px 4px; + text-align: left; } .data-table tr td:first-child, .data-table tr th:first-child { diff --git a/demo/index.html b/demo/index.html index 7e244752..b003c95c 100644 --- a/demo/index.html +++ b/demo/index.html @@ -10,7 +10,7 @@ - + @@ -21,20 +21,20 @@ - + -
-
+
+
Recline Data Explorer -
    + -
    + \