Skip to content

Commit

Permalink
Merge master (v1.33.3) into develop (#1162)
Browse files Browse the repository at this point in the history
Merge master (v1.33.3) into develop
  • Loading branch information
nmanu1 committed Dec 12, 2023
2 parents 7aff0d8 + f2d3f2b commit 819809a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "answers-hitchhiker-theme",
"version": "1.33.2",
"version": "1.33.3",
"description": "A starter Search theme for hitchhikers",
"keywords": [
"jambo",
Expand Down
8 changes: 4 additions & 4 deletions static/js/overlay/parent-frame/dom/stylist.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ export default class Stylist {
this._iframeWrapperEl.style['opacity'] = '1';
this._iframeWrapperEl.style['transition'] = `opacity ${AnimationStyling.TRANSITION_TIMING}`;
this._iframeWrapperEl.style['width'] = this._currentWidth;
this._iframeWrapperEl.style['height'] = `${isTaller
this._iframeWrapperEl.style['height'] = isTaller
? AnimationStyling.CONTAINER_HEIGHT_TALLER
: this._minHeight}px`;
: `${this._minHeight}px`;

this._overlayContainerEl.style['transition'] =
`box-shadow ${AnimationStyling.TRANSITION_TIMING}`;
Expand Down Expand Up @@ -152,8 +152,8 @@ export default class Stylist {
this._buttonHeight = height;
this._buttonWidth = Math.min(AnimationStyling.MAX_BUTTON_WIDTH, width);

this._buttonFrameEl.style['width'] = this._buttonWidth;
this._buttonFrameEl.style['height'] = this._buttonHeight;
this._buttonFrameEl.style['width'] = `${this._buttonWidth}px`;
this._buttonFrameEl.style['height'] = `${this._buttonHeight}px`;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions static/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion static/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "answers-hitchhiker-theme",
"version": "1.33.2",
"version": "1.33.3",
"description": "Toolchain for use with the HH Theme",
"main": "Gruntfile.js",
"scripts": {
Expand Down

0 comments on commit 819809a

Please sign in to comment.