Merge branch 'feature/tooltips_fix' into develop

TNRIS · Mar 20, 2017 · e503ba8 · e503ba8
2 parents a8816a1 + 0b0b57e
commit e503ba8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 31 deletions.
diff --git a/src/components/SubscriptionForm.jsx b/src/components/SubscriptionForm.jsx
@@ -100,9 +100,6 @@ class SubscriptionForm extends Component {
             type="submit"
             value="Submit"
             style={{marginRight: "10px"}}>SEARCH</Button>
-            <Button ripple
-            className="flood-form-button"
-            type="button" value="Cancel" onClick="">CANCEL</Button>
         </form>
       )
     }

diff --git a/src/components/SubscriptionList.jsx b/src/components/SubscriptionList.jsx
@@ -107,25 +107,21 @@ class SubscriptionList extends React.Component {
         this.props.subscriptions.subscriptionsById[this.props.gageSubscriptionById[gageSubscriptionId].email]
         .subscription.SubscriptionArn === "PendingConfirmation") {
         return (
-          <Tooltip label="Pending Confirmation">
-            <ListItemAction
-              info="Email"
-              style={{marginBottom: "0px", marginTop: "7px", marginRight: "0", marginLeft: "4px"}}>
-              <Icon name="email" style={{color: "#9BA4D5"}}/>
-            </ListItemAction>
-          </Tooltip>
+          <ListItemAction
+            info="Email" title="Pending Confirmation"
+            style={{marginBottom: "0px", marginTop: "7px", marginRight: "0", marginLeft: "4px"}}>
+            <Icon name="email" style={{color: "#9BA4D5"}}/>
+          </ListItemAction>
         )
       }
       return (
-          <Tooltip label={this.tooltipMessage("email")}>
-            <ListItemAction info="Email">
-              <Checkbox ripple
-              name="email"
-              disabled={this.props.email.length < 1}
-              defaultChecked={this.props.gageSubscriptionById[gageSubscriptionId].hasOwnProperty("email")}
-              onClick={(event) => this.toggleSubscription(event, gageSubscriptionId, "email")}/>
-            </ListItemAction>
-          </Tooltip>
+          <ListItemAction info="Email" title={this.tooltipMessage("email")}>
+            <Checkbox ripple
+            name="email"
+            disabled={this.props.email.length < 1}
+            defaultChecked={this.props.gageSubscriptionById[gageSubscriptionId].hasOwnProperty("email")}
+            onClick={(event) => this.toggleSubscription(event, gageSubscriptionId, "email")}/>
+          </ListItemAction>
         )
     }
 
@@ -136,15 +132,13 @@ class SubscriptionList extends React.Component {
      */
     smsToggle = (gageSubscriptionId) => {
       return (
-        <Tooltip label={this.tooltipMessage("phone")}>
-          <ListItemAction info="SMS">
-            <Checkbox ripple
-            name="textsms"
-            disabled={this.props.phone.length < 1}
-            defaultChecked={this.props.gageSubscriptionById[gageSubscriptionId].hasOwnProperty("sms")}
-            onClick={(event) => this.toggleSubscription(event, gageSubscriptionId, "sms")} />
-          </ListItemAction>
-        </Tooltip>
+        <ListItemAction info="SMS" title={this.tooltipMessage("phone")}>
+          <Checkbox ripple
+          name="textsms"
+          disabled={this.props.phone.length < 1}
+          defaultChecked={this.props.gageSubscriptionById[gageSubscriptionId].hasOwnProperty("sms")}
+          onClick={(event) => this.toggleSubscription(event, gageSubscriptionId, "sms")} />
+       </ListItemAction>
       )
     }
 
@@ -160,6 +154,7 @@ class SubscriptionList extends React.Component {
           <List>
             {this.props.allGageSubscriptions.map(gageSubscriptionId =>
               <ListItem twoLine key={gageSubscriptionId} className="subscription-list-item">
+                <Tooltip label="Zoom to gage location">
                 <ListItemAction className="subscription-list-item__locateAction">
                   <IconButton mini name="room"
                   onClick={(event) => {
@@ -169,6 +164,7 @@ class SubscriptionList extends React.Component {
                     )}
                   }/>
                 </ListItemAction>
+                </Tooltip>
                 <ListItemContent
                 subtitle={this.props.gageInfo[this.props.gageSubscriptionById[gageSubscriptionId].lid].name}>
                   {this.props.gageSubscriptionById[gageSubscriptionId].lid}

diff --git a/src/sass/main.scss b/src/sass/main.scss
@@ -660,9 +660,9 @@ span.mdl-list__item-secondary-action > i {
     font-size: 10px !important;
 }
 
-.mdl-tooltip {
-    will-change: inherit !important;
-}
+// .mdl-tooltip {
+//     will-change: inherit !important;
+// }
 
 .mdl-checkbox.is-checked .mdl-checkbox__box-outline {
     border: 2px solid $lighter-blue-version2 !important;