From ec7dbed800d42b6e0bd6e480939196b5ad1010a6 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Mon, 2 May 2016 10:04:29 -0700 Subject: [PATCH] Blank theme (#419) * A white theme * Updating TODO * Fixing tests --- TODO.md | 4 ---- caravel/assets/stylesheets/caravel.css | 16 ++++---------- .../assets/stylesheets/less/variables.less | 22 +++++++++---------- caravel/templates/appbuilder/navbar.html | 2 -- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/TODO.md b/TODO.md index a12340c544bd1..1e2ab02facd13 100644 --- a/TODO.md +++ b/TODO.md @@ -13,8 +13,6 @@ List of TODO items for Caravel * **Dashboard URL filters:** `{dash_url}#fltin__fieldname__value1,value2` * **Default slice:** choose a default slice for the dataset instead of default endpoint -* **refresh freq**: specifying the refresh frequency of a dashboard and - specific slices within it, some randomization would be nice * **Widget sets / chart grids:** a way to have all charts support making a series of charts and putting them in a grid. The same way that you can groupby for series, you could chart by. The form field set would be @@ -27,8 +25,6 @@ List of TODO items for Caravel some visualizations as annotations. An example of a layer might be "holidays" or "site outages", ... * **Slack integration** - TBD -* **Sexy Viz Selector:** the visualization selector should be a nice large - modal with nice thumbnails for each one of the viz * **Comments:** allow for people to comment on slices and dashes diff --git a/caravel/assets/stylesheets/caravel.css b/caravel/assets/stylesheets/caravel.css index d8fdc1475df1b..e12ebb0610976 100644 --- a/caravel/assets/stylesheets/caravel.css +++ b/caravel/assets/stylesheets/caravel.css @@ -82,14 +82,6 @@ input[type="checkbox"] { form div { padding-top: 1px; } -.navbar-brand a { - color: white; - text-decoration: none; -} -.navbar-brand a:hover { - color: white; - text-decoration: none; -} .header span { margin-left: 5px; @@ -135,10 +127,10 @@ span.title-block { .nvtooltip table td{ font-size: 11px !important; } -.navbar { - -webkit-box-shadow: 0px 3px 3px #AAA; - -moz-box-shadow: 0px 3px 3px #AAA; - box-shadow: 0px 3px 3px #AAA; +div.navbar { + -webkit-box-shadow: 0px 2px 2px #CCC; + -moz-box-shadow: 0px 2px 2px #CCC; + box-shadow: 0px 2px 2px #ccc; z-index: 999; } .panel.panel-primary { diff --git a/caravel/assets/stylesheets/less/variables.less b/caravel/assets/stylesheets/less/variables.less index 305e9926f61f5..3d61578d4d69d 100644 --- a/caravel/assets/stylesheets/less/variables.less +++ b/caravel/assets/stylesheets/less/variables.less @@ -26,7 +26,7 @@ @gray-light: #bbb; @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: darken(@babu, 5%); +@brand-primary: @kazan; @brand-success: darken(@lima, 15%); @brand-info: @beach; @brand-warning: @hackberry; @@ -160,8 +160,8 @@ @btn-default-bg: #fff; @btn-default-border: transparent; -@btn-primary-color: #fff; -@btn-primary-bg: @brand-primary; +@btn-primary-color: #444; +@btn-primary-bg: #eee; @btn-primary-border: transparent; @btn-success-color: #fff; @@ -385,7 +385,7 @@ @navbar-default-link-hover-color: @gray-dark; @navbar-default-link-hover-bg: transparent; @navbar-default-link-active-color: @gray-dark; -@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%); +@navbar-default-link-active-bg: darken(@navbar-default-bg, 30%); @navbar-default-link-disabled-color: #ccc; @navbar-default-link-disabled-bg: transparent; @@ -403,12 +403,12 @@ //=== Inverted navbar // Reset inverted navbar basics @navbar-inverse-color: @gray-light; -@navbar-inverse-bg: @brand-primary; +@navbar-inverse-bg: white; @navbar-inverse-border: transparent; // Inverted navbar links -@navbar-inverse-link-color: lighten(@brand-primary, 30%); -@navbar-inverse-link-hover-color: #fff; +@navbar-inverse-link-color: #888; +@navbar-inverse-link-hover-color: #111; @navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; @navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%); @@ -417,7 +417,7 @@ // Inverted navbar brand label @navbar-inverse-brand-color: @navbar-inverse-link-color; -@navbar-inverse-brand-hover-color: #fff; +@navbar-inverse-brand-hover-color: @navbar-inverse-link-hover-color; @navbar-inverse-brand-hover-bg: transparent; // Inverted navbar toggle\ @@ -728,9 +728,9 @@ @panel-default-border: #ddd; @panel-default-heading-bg: #f5f5f5; -@panel-primary-text: #fff; -@panel-primary-border: @brand-primary; -@panel-primary-heading-bg: @brand-primary; +@panel-primary-text: black; +@panel-primary-border: gray; +@panel-primary-heading-bg: #eee; @panel-success-text: #fff; @panel-success-border: @state-success-border; diff --git a/caravel/templates/appbuilder/navbar.html b/caravel/templates/appbuilder/navbar.html index c4283b74d3810..90cd397497d9e 100644 --- a/caravel/templates/appbuilder/navbar.html +++ b/caravel/templates/appbuilder/navbar.html @@ -13,9 +13,7 @@ - {{ appbuilder.app_name }} -