Merge pull request #258 from creative-commoners/pulls/2.0/fix-fronten…

…d-warnings FIX Replaced deprecated CSS and React functions
silverstripe · Mar 24, 2023 · e0f29fc · e0f29fc
2 parents c34b96e + 4cce0ff
commit e0f29fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/IntroScreen/IntroScreen.scss b/client/src/components/IntroScreen/IntroScreen.scss
@@ -43,7 +43,7 @@
 }
 
 .campaign-info__icon {
-  margin-right: $panel-padding-x / 2;
+  margin-right: calc($panel-padding-x / 2);
 
   @include media-breakpoint-down(xs) {
     display: none;
@@ -53,7 +53,7 @@
 .campaign-info__buttons {
   position: absolute;
   top: $panel-padding-y;
-  right: $panel-padding-x / 2;
+  right: calc($panel-padding-x / 2);
 }
 
 .campaign-info__links {

diff --git a/client/src/containers/CampaignAdmin/CampaignAdmin.js b/client/src/containers/CampaignAdmin/CampaignAdmin.js
@@ -59,20 +59,20 @@ class CampaignAdmin extends Component {
     this.handleToggleMessage = this.handleToggleMessage.bind(this);
   }
 
-  componentWillMount() {
+  componentDidMount() {
     // Ensure default breadcrumbs are setup
     const { breadcrumbs, title, router: { params: { id, view } } } = this.props;
     if (breadcrumbs.length === 0) {
       this.setBreadcrumbs(view, id, title);
     }
   }
 
-  componentWillReceiveProps(props) {
-    const { title, router: { params: { id, view } } } = props;
+  componentDidUpdate(prevProps) {
+    const { title, router: { params: { id, view } } } = this.props;
     const hasChangedRoute = (
-      this.props.router.params.id !== id ||
-      this.props.router.params.view !== view ||
-      this.props.title !== title
+      prevProps.router.params.id !== id ||
+      prevProps.router.params.view !== view ||
+      prevProps.title !== title
     );
     if (hasChangedRoute) {
       this.setBreadcrumbs(view, id, title);

diff --git a/client/src/containers/CampaignAdmin/CampaignAdmin.scss b/client/src/containers/CampaignAdmin/CampaignAdmin.scss
@@ -47,7 +47,7 @@
   color: $brand-primary;
   position: absolute;
   right: $spacer;
-  bottom: $spacer * 2 / 3;
+  bottom: calc($spacer * 2 / 3);
   font-size: $font-size-sm;
 
   .font-icon-link {