Merge pull request #179 from SizeMeCom/change-signup-box-#175

Change signup box #175
SizeMeCom · Mar 14, 2021 · aa996ca · aa996ca
2 parents cb4821c + bf8e1df
commit aa996ca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/index1.html b/index1.html
@@ -839,6 +839,7 @@ <h2>Product Tags</h2>
 </script>
 
 <script type="text/javascript" src="//code.jquery.com/jquery-1.12.4.min.js"></script>
+<script>jQuery.noConflict();</script>
 <div class="ui-dialog ui-widget ui-widget-content ui-corner-all sizeme_detailed_view_window ui-draggable ui-resizable"
      tabindex="-1" role="dialog" aria-labelledby="ui-id-1"
      style="outline: 0px; z-index: 1002; position: absolute; height: auto; width: 940px; top: 0px; left: 249px; display: none; max-height: 536px;">

diff --git a/src/SizeMeApp.jsx b/src/SizeMeApp.jsx
@@ -66,7 +66,7 @@ class SizeMeApp extends React.Component {
                     {loggedIn && <ProfileMenu profiles={profiles}
                         selectedProfile={selectedProfile.id}
                         setSelectedProfile={setSelectedProfile}/>}
-                    {(!loggedIn || signupStatus.inProgress) && match &&
+                    {(!loggedIn || signupStatus.inProgress || signupStatus.signupDone) && match &&
                     <SignupBox onSignup={onSignup} signupDone={signupStatus.signupDone}/>}
                     {!loggedIn && !match && (<div className="profile-menu-container">
                         <img src={sizemeIcon} alt="SizeMe" data-tip data-for="sizeme-tooltip"

diff --git a/src/common/LoginFrame.scss b/src/common/LoginFrame.scss
@@ -17,6 +17,7 @@
   right: auto;
   transform: translate(-50%, 0);
   border: none;
+  outline: none;
   background: transparent;
   -webkit-overflow-scrolling: touch;
 }
diff --git a/src/sizeguide/SizeGuide.scss b/src/sizeguide/SizeGuide.scss
@@ -169,18 +169,14 @@ a.link-btn.size-guide {
         color: #999;
         font-size: 12px;
         line-height: 22px;
-
-        a {
-          display: inline-block;
-          cursor: pointer;
-          position: relative;
-          top: -1px;
-          left: 5px;
-          background: url(../images/sizeme_logo_plain_h22.png) no-repeat 0 0;
-          width: 110px;
-          height: 22px;
-          vertical-align: top;
-        }
+        display: inline-block;
+        position: relative;
+        top: -1px;
+        left: 5px;
+        background: url(../images/sizeme_logo_plain_h22.png) no-repeat 0 0;
+        width: 110px;
+        height: 22px;
+        vertical-align: top;
       }
     }
   }
@@ -299,7 +295,7 @@ a.link-btn.size-guide {
       border-radius: $border_radius;
       text-align: center;
       background-color: #eee;
-      width: 100%;
+      width: calc(100% - 10px);
       margin-bottom: 0;
 
       p {

diff --git a/src/sizeguide/SizeGuideModal.jsx b/src/sizeguide/SizeGuideModal.jsx
@@ -1,7 +1,6 @@
 import React from "react";
 import FontAwesome from "react-fontawesome";
 import SizeGuideItem from "./SizeGuideItem";
-import {contextAddress} from "../api/sizeme-api";
 import Modal from "react-modal";
 import PropTypes from "prop-types";
 import SizeGuideDetails from "./SizeGuideDetails";
@@ -96,8 +95,6 @@ class SizeGuideModal extends React.Component {
 
                 <div className="modal-footer">
                     <span className="sizeme-advertisement">
-                        <a id="sizeme_ad_link" href={contextAddress}
-                            title={t("sizeGuide.advertisement")} target="_blank" rel="noopener noreferrer"/>
                     </span>
                 </div>
             </div>