Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (30 commits)
  [connect] [ui] Updated the permissions tooltip to show when hovering the title, not only the question mark icon.
  [version]
  [translations] [update]
  [pricing] Explicitly set the default pricing JS path to null to make it clearer.
  [pricing] [refactor] [enhancements]
  [pricing] [refactor] Renamed a variable.
  [pricing] Fixed the loading of the pricing JS path so that it will be based on the SDK that comes with the plugin or theme.
  [license-activation] [optimize] Made it clear that the extensions opt-in is optional (on top of it being off by default).
  [css] [compile]
  [data-sync] [beta-enrollment] [fix]
  [license-activation] [optimize] Optimized the UI for the license activation screen to clarify the context of Freemius, simplify the UI, and explain why data is necessary for the updates and licensing mechanism.
  [license-activation] [new] Introduced a new link to known license activation issues.
  [license-activation] [extension-tracking] The extensions tracking is now off by default upon license activation.
  Update class-fs-logger.php
  [version] + [php-doc]
  [beta-program] [update] Due to the transition to install-level beta enrollment along with the complexity of the multi-store level Account page, only show the beta enrollment option on site-level WP Admin.
  [beta-program] [fix] A user can be "registered" without an install.
  [beta-program] We no longer need to sync the user data with the daily cron as the beta program flag moved to the install-level, which is already synced on a daily basis when running a paid codebase.
  Allow developers to override the extension tracking flag as they wish.
  [beta] [program] [site] Made changes for Beta program, related to API endpoints changes.
  ...

# Conflicts:
#	package.json
  • Loading branch information
vovafeldman committed Feb 8, 2021
2 parents f89d24e + a18b0c9 commit 84a9be4
Show file tree
Hide file tree
Showing 41 changed files with 5,436 additions and 4,922 deletions.
2 changes: 1 addition & 1 deletion assets/css/admin/common.css

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

2 changes: 1 addition & 1 deletion assets/css/admin/connect.css

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions assets/scss/admin/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,27 @@
@include transition(opacity 0.3s ease-in-out);
position: absolute;
background: $tooltip-bkg-color;
color: $tooltip-color;
color: $tooltip-color !important;
font-family: 'arial', serif;
font-size: 12px;
padding: 10px;
z-index: 999999;
bottom: 100%;
margin-bottom: 5px;
left: 0;
left: -17px;
right: 0;
@include border-radius(5px);
@include box-shadow(1px 1px 1px rgba(0, 0, 0, 0.2));
line-height: 1.3em;
font-weight: bold;
text-align: left;
text-transform: none !important;

.rtl &
{
text-align: right;
left: auto;
right: -17px;
}

&::after
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/admin/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ div.fs-notice
}
}

@media screen and (max-width: 500px) {
@media screen and (max-width: 1250px) {
#fs_promo_tab
{
display: none;
Expand Down
12 changes: 10 additions & 2 deletions assets/scss/admin/connect.scss
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ $form_width: 480px;
margin-top: 0;
}

.fs-trigger
& > .fs-trigger
{
font-size: 0.9em;
text-decoration: none;
Expand All @@ -177,7 +177,7 @@ $form_width: 480px;
margin-bottom: 0;
}

i.dashicons
& > i.dashicons
{
float: left;
font-size: 40px;
Expand Down Expand Up @@ -214,6 +214,7 @@ $form_width: 480px;

ul
{
overflow: initial;
height: auto;
margin: 20px 20px 10px 20px;
}
Expand Down Expand Up @@ -554,3 +555,10 @@ $form_width: 480px;
}
}
}

#license_issues_link {
display: block;
text-align: center;
font-size: 0.9em;
margin-top: 10px;
}
Loading

0 comments on commit 84a9be4

Please sign in to comment.