diff --git a/caravel/assets/javascripts/explore/explore.jsx b/caravel/assets/javascripts/explore/explore.jsx index f2fcfd913b..233df2dec4 100644 --- a/caravel/assets/javascripts/explore/explore.jsx +++ b/caravel/assets/javascripts/explore/explore.jsx @@ -18,12 +18,9 @@ require('bootstrap'); require('./../caravel-select2.js'); -require('../../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js'); - // css require('../../vendor/pygments.css'); require('../../stylesheets/explore.css'); -require('../../node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css'); let slice; @@ -131,11 +128,6 @@ function initExploreView() { px.initFavStars(); - $('form .panel-heading').click(function () { - toggle_fieldset($(this), true); - $(this).css('cursor', 'pointer'); - }); - function copyURLToClipboard(url) { var textArea = document.createElement('textarea'); textArea.style.position = 'fixed'; diff --git a/caravel/assets/stylesheets/caravel.css b/caravel/assets/stylesheets/caravel.css index 52a6474844..0881dfe4bf 100644 --- a/caravel/assets/stylesheets/caravel.css +++ b/caravel/assets/stylesheets/caravel.css @@ -52,14 +52,6 @@ input.form-control[type=text], input.form-control[type=search] { margin-left: 365px; } -.favstar { - margin-right: 10px; - opacity: 0.5; - cursor: pointer; - float: left; - margin-top: 13px; -} - .slice_description{ padding: 8px; margin: 5px; @@ -207,3 +199,8 @@ div.widget .slice_container { padding: 5px 10px; margin-top: 15px; } + +.panel-title h5 { + margin-top: 0px; + margin-bottom: 10px; +} diff --git a/caravel/assets/stylesheets/dashboard.css b/caravel/assets/stylesheets/dashboard.css index 6675fe1ec2..43ec0014a3 100644 --- a/caravel/assets/stylesheets/dashboard.css +++ b/caravel/assets/stylesheets/dashboard.css @@ -102,7 +102,7 @@ div.widget .chart-controls { } .dashboard .title .favstar { - font-size: 24px; + font-size: 20px; } .chart-header .header { diff --git a/caravel/assets/stylesheets/explore.css b/caravel/assets/stylesheets/explore.css index ce856f763c..df8b3f2968 100644 --- a/caravel/assets/stylesheets/explore.css +++ b/caravel/assets/stylesheets/explore.css @@ -9,29 +9,6 @@ background-color: #fff; } -.slice-name__container { - background-color: #fff; - padding: 16px 20px 20px 20px; -} -.slice-name__text { - color: #333; - font-size: 20px; - border-bottom: 1px solid #aaa; - padding-bottom: 10px; - padding-left: 42px; - font-weight: bold; -} - -.edit-slice-description-icon { - float: left; - margin-top: -33px; - margin-left: 20px; -} - -.slice-meta { - margin-top: -52px; -} - .navbar { margin-bottom: 22px; } @@ -39,3 +16,12 @@ .query-and-save-btns-container { margin-bottom: 22px; } + +.star-edit-icons { + padding-left: 10px; +} + +.slice-meta-controls { + margin-top: -5px; + margin-right: -5px; +} diff --git a/caravel/assets/stylesheets/less/bootswatch.less b/caravel/assets/stylesheets/less/bootswatch.less index 6acb542c61..920100d489 100644 --- a/caravel/assets/stylesheets/less/bootswatch.less +++ b/caravel/assets/stylesheets/less/bootswatch.less @@ -617,7 +617,8 @@ input[type="checkbox"], .panel > .panel-heading { border-bottom: 1px solid #aaa; background-color: #fff; - margin: 10px 5px; + margin: 0 1em; + padding: 1em 0 .5em 0; font-weight: bold; } diff --git a/caravel/templates/caravel/dashboard.html b/caravel/templates/caravel/dashboard.html index 9eb12e44ed..352ed28f77 100644 --- a/caravel/templates/caravel/dashboard.html +++ b/caravel/templates/caravel/dashboard.html @@ -74,8 +74,11 @@