tweaks

apache · Jun 18, 2020 · 8d5119f · 8d5119f
1 parent 09efd2a
commit 8d5119f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -45,7 +45,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = superset
-known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,sphinx_rtd_theme,sqlalchemy,sqlalchemy_utils,sqlparse,werkzeug,wtforms,wtforms_json,yaml
+known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,slack,sphinx_rtd_theme,sqlalchemy,sqlalchemy_utils,sqlparse,werkzeug,wtforms,wtforms_json,yaml
 multi_line_output = 3
 order_by_type = false
 

diff --git a/superset-frontend/src/components/ListView/LegacyFilters.tsx b/superset-frontend/src/components/ListView/LegacyFilters.tsx
@@ -30,6 +30,8 @@ import { Select } from 'src/components/Select';
 import { Filters, InternalFilter, SelectOption } from './types';
 import { extractInputValue, getDefaultFilterOperator } from './utils';
 
+const styleWidth100p = { width: '100%' };
+
 export const FilterMenu = ({
   filters,
   internalFilters,
@@ -181,12 +183,13 @@ export const FilterInputs = ({
     {internalFilters.length > 0 && (
       <>
         <Row>
-          <Col md={10} />
-          <Col md={2}>
+          <Col md={11} />
+          <Col md={1}>
             <Button
               data-test="apply-filters"
               disabled={!!filtersApplied}
               bsStyle="primary"
+              style={styleWidth100p}
               onClick={applyFilters}
               bsSize="small"
             >

diff --git a/superset-frontend/stylesheets/less/cosmo/bootswatch.less b/superset-frontend/stylesheets/less/cosmo/bootswatch.less
@@ -71,9 +71,8 @@
 }
 
 .btn-default:hover {
-  color: @brand-primary;
-  background-color: @brand-primary-light4;
-  border-color: @brand-primary-light1;
+  color: @gray-dark;
+  background-color: @gray-bg;
 }
 
 .nav-tabs {
@@ -423,6 +422,7 @@ a.list-group-item {
 
 .nav-tabs > li > a {
   border-top: 3px solid transparent;
+  color: @text-color;
 }
 
 .nav-tabs > li.active > a,

diff --git a/superset-frontend/stylesheets/less/cosmo/variables.less b/superset-frontend/stylesheets/less/cosmo/variables.less
@@ -150,9 +150,9 @@
 @btn-primary-bg: @brand-primary;
 @btn-primary-border: @brand-primary;
 
-@btn-default-color: @brand-primary;
+@btn-default-color: @bs-gray;
 @btn-default-bg: @lightest;
-@btn-default-border: @brand-primary;
+@btn-default-border: @bs-gray-light;
 
 @btn-success-color: @btn-primary-color;
 @btn-success-bg: @brand-success;

diff --git a/superset-frontend/stylesheets/less/variables.less b/superset-frontend/stylesheets/less/variables.less
@@ -56,7 +56,7 @@
 @darkest: #000000;
 
 /**************************** text-specific *****************************/
-@link: @brand-primary;
+@link: #1985a0;
 @link-hover: darken(@link, @colorstop-one);
 
 /***************************** status colors ****************************/