Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blank theme #419

Merged
merged 3 commits into from
May 2, 2016
Merged

Blank theme #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0104bc9
A white theme
mistercrunch Apr 30, 2016
f56eab5
Updating TODO
mistercrunch Apr 30, 2016
dac1d4d
Fixing tests
mistercrunch Apr 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Expand Down
16 changes: 4 additions & 12 deletions caravel/assets/stylesheets/caravel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
22 changes: 11 additions & 11 deletions caravel/assets/stylesheets/less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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%);
Expand All @@ -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\
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions caravel/templates/appbuilder/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
<img width="50" src="/static/assets/images/caravel_logo.png">
</a>
<span class="navbar-brand">
<a href="{{appbuilder.get_url_for_index}}">
{{ appbuilder.app_name }}
</a>
</span>
</div>
<div class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion tests/core_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def test_client(self, PyDruid):
df = pd.DataFrame(nres)
instance.export_pandas.return_value = df
instance.query_dict = {}
resp = self.client.get('/caravel/explore/druid/1/?viz_type=table&granularity=one+day&druid_time_origin=&since=7+days+ago&until=now&row_limit=5000&include_search=false&metrics=count&flt_col_0=dim1&flt_op_0=in&flt_eq_0=&slice_id=&slice_name=&collapsed_fieldsets=&action=&datasource_name=test_datasource&datasource_id=1&datasource_type=druid&previous_viz_type=table&json=true&force=true')
resp = self.client.get('/caravel/explore/druid/1/?viz_type=table&granularity=one+day&druid_time_origin=&since=7+days+ago&until=now&row_limit=5000&include_search=false&metrics=count&groupby=name&flt_col_0=dim1&flt_op_0=in&flt_eq_0=&slice_id=&slice_name=&collapsed_fieldsets=&action=&datasource_name=test_datasource&datasource_id=1&datasource_type=druid&previous_viz_type=table&json=true&force=true')
print('-'*300)
print(resp.data.decode('utf-8'))
assert "Canada" in resp.data.decode('utf-8')
Expand Down