Skip to content

Commit

Permalink
Plugin updates (#29)
Browse files Browse the repository at this point in the history
* activeClassName isn't a link attribute

* Add link for validation token

* Ran `composer update`

* Fix user menu style

* Fix forwardRef warning
  • Loading branch information
wpscholar authored Aug 25, 2020
1 parent 712f7e3 commit ad1d616
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 29 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
}
},
"require": {
"ext-iconv": "*",
"bluehost/endurance-wp-module-business-reviews": "^1.0",
"bluehost/endurance-wp-module-gutenframe": "^0.1",
"bluehost/endurance-wp-module-gutenframe": "^0.1.3",
"bluehost/endurance-wp-module-loader": "^1.0",
"bluehost/endurance-wp-module-spam-prevention": "^1.0",
"bluehost/endurance-wp-module-sso": "^1.0",
"bluehost/endurance-wp-plugin-updater": "^1.0",
"ext-iconv": "*",
"wpscholar/github-archive-installer": "^1.1"
},
"require-dev": {
Expand Down
38 changes: 21 additions & 17 deletions composer.lock

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

11 changes: 6 additions & 5 deletions src/app/components/atoms/bwa-button/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ import { forwardRef } from '@wordpress/element';
*/
import './style.scss';

const BWAButton = forwardRef( ( { className = '', ...props }, ref = null ) => {
const BWAButton = forwardRef((props, ref) => {
const {className = ''} = props;
return (
<Button
{ ...props }
className={ classNames( {
className={ classNames({
bluehost: true,
[ className ]: className.length,
} ) }
[className]: className.length,
}) }
ref={ ref }
/>
);
} );
});

export default BWAButton;
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const UserMenu = () => (
<ul className="user">
{ userMenuItems.map( ( item ) => (
<li className={ [ 'tab' ] } key={ item.href }>
<a href={ item.href } activeClassName="is-active">
<a href={ item.href } className="is-active">
<span className={ [ 'menu-item-icon is-svg-' + item.color ] }><item.icon /></span>
{ item.label }
</a>
Expand Down
9 changes: 6 additions & 3 deletions src/app/components/organisms/bwa-header/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
&:after {
right: -20px;
}
}
}

@media (min-width:$menu-breakpoint) {
.bluehost-header {
Expand Down Expand Up @@ -96,10 +96,13 @@
top: 100px;
text-align: left;
background-color: #fff;
box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.1), 0 3px 6px 0 rgba(0, 0, 0, 0.07);
z-index: 9999;
}

.components-popover__content {
box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.1), 0 3px 6px 0 rgba(0, 0, 0, 0.07);
}

#bluehost-nav-popup-inner {
padding: 8px 0;
li:first-of-type a {
Expand Down Expand Up @@ -315,4 +318,4 @@
// .bluehost-nav-popup::before,
// .bluehost-nav-popup::after {
// margin-left: -22px !important;
// }
// }
2 changes: 1 addition & 1 deletion src/app/components/organisms/bwa-header/user-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default [
},
{
icon: ValidationIcon,
href: '#',
href: 'https://my.bluehost.com/cgi/token',
label: __( 'Validation Token', 'bluehost-wordpress-plugin' ),
color: 'orange',
},
Expand Down

0 comments on commit ad1d616

Please sign in to comment.