RELATED: FET-24 discarded indigo theme; RELATED: FET-197 deps

gooddata · Dec 7, 2018 · 09e3324 · 09e3324
1 parent e4b6f91
commit 09e3324
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 30 deletions.
diff --git a/examples/src/index.jsx b/examples/src/index.jsx
@@ -14,7 +14,7 @@ import {
 import { createBrowserHistory } from 'history';
 import ReactGA from 'react-ga';
 
-import '@gooddata/goodstrap/lib/theme-indigo.scss';
+import '@gooddata/goodstrap/lib/styles.scss';
 import Header from './components/utils/Header';
 import Menu from './components/utils/Menu';
 import { CustomError } from './components/utils/CustomError';

diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
   },
   "dependencies": {
     "@gooddata/gooddata-js": "10.0.0",
-    "@gooddata/goodstrap": "57.4.0",
+    "@gooddata/goodstrap": "59.0.0",
     "@gooddata/js-utils": "3.2.0",
     "@gooddata/numberjs": "^3.1.2",
     "@gooddata/typings": "2.4.2",

diff --git a/src/components/visualizations/styles/_variables.scss b/src/components/visualizations/styles/_variables.scss
@@ -1,5 +1,5 @@
 // (C) 2007-2018 GoodData Corporation
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/variables';
+@import '~@gooddata/goodstrap/lib/core/styles/variables';
 
 $insight-small-only: 'only screen and (max-width: 480px)';
 $responsive-legend: 'only screen and (max-width: 767px)';

diff --git a/src/components/visualizations/styles/charts.scss b/src/components/visualizations/styles/charts.scss
@@ -1,7 +1,7 @@
 // (C) 2007-2018 GoodData Corporation
-@import '~@gooddata/goodstrap/lib/Bubble/styles/themes/indigo/bubble-mixins';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/variables';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/_mixins';
+@import '~@gooddata/goodstrap/lib/Bubble/styles/mixins';
+@import '~@gooddata/goodstrap/lib/core/styles/variables';
+@import '~@gooddata/goodstrap/lib/core/styles/mixins';
 @import 'variables';
 
 $font-stack-roman: 'Avenir', 'Helvetica Neue', arial, sans-serif;

diff --git a/src/components/visualizations/styles/headline.scss b/src/components/visualizations/styles/headline.scss
@@ -1,5 +1,5 @@
 // (C) 2007-2018 GoodData Corporation
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/_typo-mixins';
+@import '~@gooddata/goodstrap/lib/core/styles/typo-mixins';
 
 .headline {
     text-align: center;

diff --git a/src/components/visualizations/styles/table.scss b/src/components/visualizations/styles/table.scss
@@ -2,15 +2,15 @@
 $gdc-goodstrap-basepath: '~@gooddata/goodstrap/lib/';
 
 @import '~fixed-data-table-2/dist/fixed-data-table.css';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/colors';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/IndigoFont';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/layout';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/Overlay';
-@import '~@gooddata/goodstrap/lib/Dialog/styles/themes/indigo/Dialog';
-@import '~@gooddata/goodstrap/lib/Button/styles/themes/indigo/Button';
-@import '~@gooddata/goodstrap/lib/List/styles/themes/indigo/List';
-@import '~@gooddata/goodstrap/lib/Dropdown/styles/themes/indigo/Dropdown';
-@import '~@gooddata/goodstrap/lib/Bubble/styles/themes/indigo/Bubble';
+@import '~@gooddata/goodstrap/lib/core/styles/colors';
+@import '~@gooddata/goodstrap/lib/core/styles/IndigoFont';
+@import '~@gooddata/goodstrap/lib/core/styles/layout';
+@import '~@gooddata/goodstrap/lib/core/styles/Overlay';
+@import '~@gooddata/goodstrap/lib/Dialog/styles/Dialog';
+@import '~@gooddata/goodstrap/lib/Button/styles/Button';
+@import '~@gooddata/goodstrap/lib/List/styles/List';
+@import '~@gooddata/goodstrap/lib/Dropdown/styles/Dropdown';
+@import '~@gooddata/goodstrap/lib/Bubble/styles/Bubble';
 @import 'variables';
 
 .indigo-table-component {

diff --git a/styles/scss/attributeFilter.scss b/styles/scss/attributeFilter.scss
@@ -2,11 +2,11 @@
 $gdc-goodstrap-basepath: '~@gooddata/goodstrap/lib/';
 
 @import './_settings.scss';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/_typo-mixins.scss';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/Overlay.scss';
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/Spinner.scss';
-@import '~@gooddata/goodstrap/lib/Button/styles/themes/indigo/Button.scss';
-@import '~@gooddata/goodstrap/lib/List/styles/themes/indigo/List.scss';
+@import '~@gooddata/goodstrap/lib/core/styles/typo-mixins.scss';
+@import '~@gooddata/goodstrap/lib/core/styles/Overlay.scss';
+@import '~@gooddata/goodstrap/lib/core/styles/Spinner.scss';
+@import '~@gooddata/goodstrap/lib/Button/styles/Button.scss';
+@import '~@gooddata/goodstrap/lib/List/styles/List.scss';
 
 .gd-attribute-filter {
     display: inline-block;

diff --git a/styles/scss/pivotTable.scss b/styles/scss/pivotTable.scss
@@ -1,5 +1,5 @@
 // (C) 2007-2018 GoodData Corporation
-@import '~@gooddata/goodstrap/lib/core/styles/themes/indigo/variables';
+@import '~@gooddata/goodstrap/lib/core/styles/variables';
 
 $ag-icons-path: "~ag-grid/src/styles/balham-icons/";
 $menu-icon-size: 16px;

diff --git a/yarn.lock b/yarn.lock
@@ -112,9 +112,10 @@
     qs "6.5.1"
     rxjs "^5.5.6"
 
-"@gooddata/goodstrap@57.4.0":
-  version "57.4.0"
-  resolved "https://registry.yarnpkg.com/@gooddata/goodstrap/-/goodstrap-57.4.0.tgz#978ba1ff1754b72839ee5a920b1598694d87df3a"
+"@gooddata/goodstrap@59.0.0":
+  version "59.0.0"
+  resolved "https://registry.yarnpkg.com/@gooddata/goodstrap/-/goodstrap-59.0.0.tgz#76e09ecdae1d7d2bd80d163a14ec220f13b44e67"
+  integrity sha512-GsHU4hEC8kVjUmMs0rW+FHF1tAzInOsObyZwonJmcOXy3mbkGc4bjN+WCJ30ahRQeZPb2cKruh2Dn1MwxXRg/Q==
   dependencies:
     "@gooddata/js-utils" "^2.0.0"
     classnames "2.2.5"
@@ -123,12 +124,12 @@
     foundation-sites "5.5.3"
     immutable "3.8.1"
     invariant "2.2.2"
-    jquery "3.3.1"
     kefir "3.7.1"
     lodash "4.17.4"
     moment "2.18.1"
     moment-timezone "0.5.11"
     prop-types "15.6.0"
+    querystringify "2.1.0"
     react-day-picker "7.0.7"
     react-dnd "5.0.0"
     react-document-title "2.0.3"
@@ -6578,10 +6579,6 @@ jpeg-js@0.2.0, jpeg-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz#53e448ec9d263e683266467e9442d2c5a2ef5482"
 
-jquery@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-
 js-base64@^2.1.8:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.1.tgz#e02813181cd53002888e918935467acb2910e596"
@@ -8889,6 +8886,11 @@ querystringify@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
 
+querystringify@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
+  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+
 querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"