Merge pull request #297 from Freemius/develop

Develop
Freemius · Jan 13, 2019 · 34dfa26 · 34dfa26
2 parents 4dab832 + c52cdff
commit 34dfa26
Show file tree

Hide file tree

Showing 32 changed files with 5,069 additions and 2,231 deletions.
diff --git a/assets/css/admin/common.css b/assets/css/admin/common.css
diff --git a/assets/scss/admin/plugin-upgrade-notice.scss → ...ts/scss/admin/_plugin-upgrade-notice.scss b/assets/scss/admin/plugin-upgrade-notice.scss → ...ts/scss/admin/_plugin-upgrade-notice.scss
@@ -1,4 +1,4 @@
-.plugins p.upgrade-notice
+.plugins p.fs-upgrade-notice
 {
     border: 0;
     background-color: #d54e21;

diff --git a/assets/scss/admin/common.scss b/assets/scss/admin/common.scss
@@ -1,7 +1,7 @@
 @import "../start";
 @import "themes";
 
-#iframe
+#fs_frame
 {
     line-height: 0;
     font-size:   0;
@@ -215,4 +215,6 @@ span.fs-submenu-item.fs-sub:before
     h2 {
         text-align: left;
     }
-}
+}
+
+@import "plugin-upgrade-notice";