Skip to content

Commit

Permalink
CONSOLE-2361: Update react-catalog-view-extension to version that doe…
Browse files Browse the repository at this point in the history
…s not require PatternFly 3
  • Loading branch information
rhamilto committed Jul 14, 2021
1 parent 012d0fc commit 53bf1ca
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 43 deletions.
8 changes: 4 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.9.0",
"@patternfly/patternfly": "4.115.2",
"@patternfly/react-catalog-view-extension": "4.12.0",
"@patternfly/patternfly": "4.122.2",
"@patternfly/react-catalog-view-extension": "4.12.15",
"@patternfly/react-charts": "6.15.3",
"@patternfly/react-core": "4.135.0",
"@patternfly/react-core": "4.135.15",
"@patternfly/react-table": "4.29.0",
"@patternfly/react-tokens": "4.12.0",
"@patternfly/react-tokens": "4.12.5",
"@patternfly/react-topology": "4.9.6",
"@patternfly/react-virtualized-extension": "4.8.38",
"abort-controller": "3.0.0",
Expand Down
1 change: 1 addition & 0 deletions frontend/public/components/nav/_nav-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
}
}

// Needed until https://github.com/patternfly/patternfly-design/issues/1068 is resolved
&:before {
border: none;
}
Expand Down
1 change: 0 additions & 1 deletion frontend/public/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// IMPORTANT: Please put non-variable/mixin external dependency imports in vendor.scss!
// Patternfly variables must be imported before Bootstrap
@import '~patternfly/dist/sass/patternfly/variables';
@import '~@patternfly/react-catalog-view-extension/dist/sass/variables';
@import '~bootstrap-sass/assets/stylesheets/bootstrap/variables';
@import '~bootstrap-sass/assets/stylesheets/bootstrap/mixins';
@import '~@fortawesome/fontawesome-free/scss/variables';
Expand Down
18 changes: 0 additions & 18 deletions frontend/public/style/_overrides.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Use this file to override styles from 3rd party dependencies
$pf-4-nav-bar-height: 76px; // Height of the PatternFly 4 masthead

form.pf-c-form {
--pf-c-form__helper-text--Color: var(--pf-global--Color--200);
Expand All @@ -10,12 +9,6 @@ form.pf-c-form {
margin-left: 3px;
}

// Removes PF white gradiant effect since it doesn't work in Firefox. Truncated text still has trailing ...
// Upstream issue https://github.com/patternfly/patternfly-next/issues/2633
.catalog-tile-pf-description .truncated::after {
background: none;
}

// Positions the img in OperatorHub that are nested with <span class="catalog-tile-pf-icon"><img ...>
.catalog-tile-pf-icon--align-top {
vertical-align: top;
Expand All @@ -33,17 +26,6 @@ form.pf-c-form {
}
}

// For input & label alignment while using bootstrap with @patternfly/react-catalog-view-extension
.filter-panel-pf-category-item {
.pf-c-check {
align-items: inherit;
}

.pf-c-check__input {
margin-top: 2px;
}
}

kbd {
border-radius: 3px;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.25);
Expand Down
5 changes: 2 additions & 3 deletions frontend/public/vendor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,18 @@
@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons"; // required by <FilterSidePanelCategory> in patternfly-react
@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/close";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; // required by <CatalogTileBadge> in patternfly-react
@import "~bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; // required by @patternfly/react-console
@import "~patternfly/dist/sass/patternfly/mixins";
@import '~patternfly/dist/sass/patternfly/buttons'; // required by <FilterSidePanelCategory> in patternfly-react
@import '~patternfly/dist/sass/patternfly/buttons';
@import '~patternfly/dist/sass/patternfly/dropdowns'; // required by @patternfly/react-console
@import '~patternfly/dist/sass/patternfly/modals';
@import "~patternfly/dist/sass/patternfly/notifications-drawer";
Expand Down
61 changes: 44 additions & 17 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1765,26 +1765,25 @@
once "^1.4.0"
universal-user-agent "^4.0.0"

"@patternfly/patternfly@4.115.2":
version "4.115.2"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.115.2.tgz#200111d52fe07d1380371530304bad9edf45de51"
integrity sha512-7hbJ4pRmj+rlXclD2F/UwceO6fS+9flGsgHc4eUc7NyTN2GXl6PLcqrjE2CtiKEPV90+KwsGQGJXZj8bz9HweA==
"@patternfly/patternfly@4.122.2":
version "4.122.2"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.122.2.tgz#3e774d78996c7027b8c528edb2e90990676458a5"
integrity sha512-kSoW8mt9eEJcAZX2lX4r/SYvFd44GGb8PUSDjMrpKDZqgn9/9VFh1rSChG4v5kCK6cpS99/gdTapZc3ylf8Rpw==

"@patternfly/patternfly@4.87.3":
version "4.87.3"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.87.3.tgz#eb2e9b22aa8f6f106580e7451bf204a06cb9949e"
integrity sha512-hDNMPa7B1zKD8LWFZO4SS5hC/N+yvuci2sAn8HJd+EIbAvbMAUkRsyZ0/XO3BG3RVtpSlgq7q8x1pAHC/FTFuA==

"@patternfly/react-catalog-view-extension@4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-4.12.0.tgz#86b407ab43994006f355e321ecada429a018e26a"
integrity sha512-F5PRA/WDSyCQoAJw5ZZb9oSa6fnYPhsBbo0ifODw6612Yb1oROTitIff3HbayGe8tbHlqZrRN1KAYjw/Vwsp3w==
"@patternfly/react-catalog-view-extension@4.12.15":
version "4.12.15"
resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-4.12.15.tgz#edb0d6b97b3adf060129fdd1e0c1edc25c31d22e"
integrity sha512-1mp+Ogi7fJfgh5wV9q+PolmplbMj3Tcias8xs0eeD5GCirdzOQxG+wihEM5k6CAGhBAr7jHg5fRSgO8QLTt3UQ==
dependencies:
"@patternfly/patternfly" "4.115.2"
"@patternfly/react-core" "^4.135.0"
"@patternfly/react-styles" "^4.11.0"
"@patternfly/patternfly" "4.122.2"
"@patternfly/react-core" "^4.135.15"
"@patternfly/react-styles" "^4.11.4"
classnames "^2.2.5"
patternfly "^3.59.4"

"@patternfly/react-charts@6.15.3":
version "6.15.3"
Expand Down Expand Up @@ -1827,7 +1826,20 @@
xterm "^4.8.1"
xterm-addon-fit "^0.2.1"

"@patternfly/react-core@4.135.0", "@patternfly/react-core@^4.135.0":
"@patternfly/react-core@4.135.15", "@patternfly/react-core@^4.135.15":
version "4.135.15"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.135.15.tgz#c1a4a7a3435e327efb738ef0d29dec3b02c3529f"
integrity sha512-Vy4V70/qa7Xb5FLyMg2YqsEiM0vZZ+2JZZMTenVmJTb+hfYA24VDnNnBgFsIWsFT3FQwXUSY5VL0E5YwXfDOVQ==
dependencies:
"@patternfly/react-icons" "^4.11.4"
"@patternfly/react-styles" "^4.11.4"
"@patternfly/react-tokens" "^4.12.5"
focus-trap "6.2.2"
react-dropzone "9.0.0"
tippy.js "5.1.2"
tslib "1.13.0"

"@patternfly/react-core@^4.135.0":
version "4.135.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.135.0.tgz#b64ad4da10a8814926e28fad727bc7690cd60e66"
integrity sha512-DZcONUGOR7Znd6BsUJ4L+KrrnIpyjUvh3JNcYiHW3loytxShCGcx+a04QjOOcZm+MtFhkgs/t51yiC5IP12abA==
Expand Down Expand Up @@ -1858,6 +1870,11 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.11.0.tgz#26790eeff22dc3204aa8cd094470f0a2f915634a"
integrity sha512-WsIX34bO9rhVRmPG0jlV3GoFGfYgPC64TscNV0lxQosiVRnYIA6Z3nBSArtJsxo5Yn6c63glIefC/YTy6D/ZYg==

"@patternfly/react-icons@^4.11.4":
version "4.11.4"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.11.4.tgz#8fae0bf215e39e382661a089a1d43f3ccb7fdeef"
integrity sha512-uCtmTYXYdc0scl4M0z+t1kK92ZnAtDskcbwrvWXuXy2XMSGqLKXpor0XkTT0eUymx0FrhHD/tg10iLabbusU1w==

"@patternfly/react-icons@^4.9.2":
version "4.9.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.9.2.tgz#dcb2efa9727de97d5aa5d6be47a75daee49addb8"
Expand All @@ -1868,6 +1885,11 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.11.0.tgz#0068dcb18e1343242f93fa6024dcc077acd57fb9"
integrity sha512-4eIqTwGI4mjt9DMqX6hnan4eRS+3LUWNaneTEJdmk+flKxtAE/O/OmQHvH4GetDnlSbyfATcA0VFbVtR0aRJAg==

"@patternfly/react-styles@^4.11.4":
version "4.11.4"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.11.4.tgz#6b2a5cfd43bdd139179c5298677760d41db67b5e"
integrity sha512-I0fepc/eg3QBrJAB4qfBIsDBQY9yHMmWomUCAb19nM8ZcDDjZE/Z7jwIA3ioWN+/8brHXPfUXxnpkBmYkCNgVA==

"@patternfly/react-styles@^4.8.2":
version "4.8.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.8.2.tgz#4796a77b658541d75d616e2e2a00fc5d7ec42bc7"
Expand All @@ -1885,16 +1907,21 @@
lodash "^4.17.19"
tslib "1.13.0"

"@patternfly/react-tokens@4.12.0", "@patternfly/react-tokens@^4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.12.0.tgz#2973c7f08a2f35997a0054bbf3c886b3c5c68822"
integrity sha512-Oj+GxqTtx0Yu9IDCTibZLQnpcKp58JneNKEFQkJ29WJydhPG4j6oFFElkK+ub+Ft/f9B1Ky1SsfR9eabo6IykQ==
"@patternfly/react-tokens@4.12.5", "@patternfly/react-tokens@^4.12.5":
version "4.12.5"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.12.5.tgz#12ccfdf31e9ac07852fe6e21dcc78a4a3f23c4d5"
integrity sha512-akZ4Hdf5CDKEMfDA+3hqoA5xTzf4ld/QvprriH0zc9glzs2Xngi5HBTE5T1obgvYf2TR1pMu+8WcRlOC7bFCzQ==

"@patternfly/react-tokens@^4.10.2":
version "4.10.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.10.2.tgz#fd0054379ac81c8490b901b5b8fb408263ce91fe"
integrity sha512-/G1MENPxVY7X9UUuieO79yfjJ3g6KjBUBsBQVKOQplCxuvcRCF1MpmQKAxfg9Yb804MbPY+IVzVD3c4u9S3Iww==

"@patternfly/react-tokens@^4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.12.0.tgz#2973c7f08a2f35997a0054bbf3c886b3c5c68822"
integrity sha512-Oj+GxqTtx0Yu9IDCTibZLQnpcKp58JneNKEFQkJ29WJydhPG4j6oFFElkK+ub+Ft/f9B1Ky1SsfR9eabo6IykQ==

"@patternfly/react-topology@4.9.6":
version "4.9.6"
resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-4.9.6.tgz#b6b9a16dc15cba8a0e30fc04152a65e226d48a4b"
Expand Down

0 comments on commit 53bf1ca

Please sign in to comment.