From 28c9be4268a6b989a01ac700c5fb69e68e82dc4d Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Tue, 10 Apr 2012 00:22:27 +0100 Subject: [PATCH] [#81,css][s]: tidying up css by ensuring top level data explorer and grid view have recline- in them. --- css/data-explorer.css | 34 +++++++++++++++++----------------- src/view-grid.js | 4 ++-- src/view.js | 6 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/css/data-explorer.css b/css/data-explorer.css index f18faa63..f2dcb40e 100644 --- a/css/data-explorer.css +++ b/css/data-explorer.css @@ -1,18 +1,18 @@ -.data-explorer .header .navigation, -.data-explorer .header .navigation li, -.data-explorer .header .pagination, -.data-explorer .header .pagination form +.recline-data-explorer .header .navigation, +.recline-data-explorer .header .navigation li, +.recline-data-explorer .header .pagination, +.recline-data-explorer .header .pagination form { display: inline; } -.data-explorer .header .navigation { +.recline-data-explorer .header .navigation { float: left; margin-left: 0; padding-left: 0; } -.data-explorer .header .menu-right { +.recline-data-explorer .header .menu-right { float: right; margin-left: 5px; padding-left: 5px; @@ -54,7 +54,7 @@ vertical-align: top; } -.data-view-container { +.recline-data-explorer .data-view-container { display: block; clear: both; } @@ -71,7 +71,7 @@ * Notifications *********************************************************/ -.notification-loader { +.recline-data-explorer .notification-loader { width: 18px; margin-left: 5px; background: url(images/small-spinner.gif) no-repeat; @@ -83,33 +83,33 @@ * Data Table *********************************************************/ -.data-table .btn-group .dropdown-toggle { +.recline-grid .btn-group .dropdown-toggle { padding: 1px 3px; line-height: auto; } -.data-table-container { +.recline-grid-container { overflow: auto; height: 550px; } -.data-table { +.recline-grid { border: 1px solid #ccc; width: 100%; } -.data-table td, .data-table th { +.recline-grid td, .recline-grid th { border-left: 1px solid #ccc; padding: 3px 4px; text-align: left; } -.data-table tr td:first-child, .data-table tr th:first-child { +.recline-grid tr td:first-child, .recline-grid tr th:first-child { width: 20px; } /* direct borrowing from twitter buttons */ -.data-table th, +.recline-grid th, .transform-column-view .expression-preview-table-wrapper th { background-color: #e6e6e6; @@ -196,7 +196,7 @@ a.data-table-cell-edit:hover { background-position: -25px 0px; } -.data-table td:hover .data-table-cell-edit { +.recline-grid td:hover .data-table-cell-edit { visibility: visible; } @@ -440,8 +440,8 @@ td.expression-preview-value { * Read-only mode *********************************************************/ -.read-only .no-hidden .data-table tr td:first-child, -.read-only .no-hidden .data-table tr th:first-child +.read-only .no-hidden .recline-grid tr td:first-child, +.read-only .no-hidden .recline-grid tr th:first-child { display: none; } diff --git a/src/view-grid.js b/src/view-grid.js index ac539f67..aa884cdb 100644 --- a/src/view-grid.js +++ b/src/view-grid.js @@ -15,7 +15,7 @@ this.recline.View = this.recline.View || {}; // * cellRenderer: function used to render individual cells. See DataGridRow for more. my.DataGrid = Backbone.View.extend({ tagName: "div", - className: "data-table-container", + className: "recline-grid-container", initialize: function(modelEtc, options) { var self = this; @@ -151,7 +151,7 @@ my.DataGrid = Backbone.View.extend({ // ====================================================== // #### Templating template: ' \ - \ +
\ \ \ {{#notEmpty}} \ diff --git a/src/view.js b/src/view.js index 20bf6311..252e22c6 100644 --- a/src/view.js +++ b/src/view.js @@ -54,7 +54,7 @@ this.recline.View = this.recline.View || {}; // FlotGraph subview. my.DataExplorer = Backbone.View.extend({ template: ' \ -
\ +
\
\ \
\ @@ -534,7 +534,7 @@ my.notify = function(message, options) { {{/loader}} \
'; var _templated = $.mustache(_template, tmplData); - _templated = $(_templated).appendTo($('.data-explorer .alert-messages')); + _templated = $(_templated).appendTo($('.recline-data-explorer .alert-messages')); if (!options.persist) { setTimeout(function() { $(_templated).fadeOut(1000, function() { @@ -548,7 +548,7 @@ my.notify = function(message, options) { // // Clear all existing notifications my.clearNotifications = function() { - var $notifications = $('.data-explorer .alert-messages .alert'); + var $notifications = $('.recline-data-explorer .alert-messages .alert'); $notifications.remove(); }