Merge remote-tracking branch 'refs/remotes/origin/master' into pr/1456

Author: jjeffryes

css/obBase.css

@@ -477,6 +477,32 @@ form {
   flex-grow: 1;
 }
 
+.listingType {
+  background-color: #252525;
+  color: #ffffff;
+  position: absolute;
+  padding: 6px;
+  top: 40px;
+  right: 40px;
+  font-size: 11px;
+  font-weight: 500;
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
+.listingDoesNotShipToYou {
+  background-color: rgba(37, 37, 37, 0.65); 
+  /*border-radius: 20px;*/
+  height: 20px; 
+  left: 32px;
+  line-height: 20px; 
+  padding: 8px 4px; 
+  position: absolute; 
+  text-align: center; 
+  top: calc(50% - 32px); 
+  width: 242px; 
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
 .noPointerEvents {
   pointer-events: none;
 }
@@ -533,6 +559,17 @@ form {
   padding-top: 20px;
 }
 
+.userPage-subViews .gridItem:hover > .listingType,
+.homeView .gridItem:hover > .listingType {
+  opacity: 1;
+  top: 26px;
+}
+
+.userPage-subViews .gridItem:hover > .listingDoesNotShipToYou,
+.homeView .gridItem:hover > .listingDoesNotShipToYou {
+  top: calc(50% - 46px);
+}
+
 .userPage-subViews .gridItem:hover .gridItemControls,
 .homeView .gridItem:hover .gridItemControls{
   opacity: 1;
@@ -2370,7 +2407,6 @@ div.chatSearchOut .chatSearchIcon {
 
 .chatConversationMessageTimestamp {
   font-size: 11px;
-  color: #fff;
   opacity: .35;
   font-weight: 500;
   letter-spacing: 0;
@@ -3378,7 +3414,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   padding: 10px 0;
   width: 230px;
   overflow: hidden;
-  transform: translateY(-330px);
+  transform: translateY(-110%);
   transition: transform 200ms;
 }
 
@@ -4045,6 +4081,14 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   top: 100%;
 }
 
+.tooltip.tooltip-box2:hover:after {
+  height: auto;
+  width: 200px;
+  white-space: normal;
+  bottom: auto;
+  top: 100%;
+}
+
 .tooltip.tooltip-box.tooltip-boxUp:hover:after {
   bottom: 120%;
 }
@@ -4261,7 +4305,53 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 }
 
-/* protect customize controls from custom page styles */
+.violatorTR {
+  /* sets triangle to be in the top right corner */
+  /* must be given equal height and width properties */
+  /* text or icons inside the violator should have positionTopRight and a right and top margin or padding based on the violator size */
+  position: absolute;
+  top: 0;
+  right: 0;
+  -webkit-clip-path: polygon(50% 0, 100% 0, 100% 50%);
+  z-index: 1; /* this shouldn't need to be higher. Make it the last element in its container */
+  text-align: center;
+}
+
+.violator1 {
+  width: 50px;
+  height: 50px;
+  background: #215175; /* this should be overridden with a color class */
+  color: #fff;
+}
+
+.violatorTxt{
+  /* use on content of a violator to rotate it to match the violator */
+  display: block;
+  transform: rotate(45deg);
+}
+
+.listingTypeDigital:before {
+  color: #EFEF4C;
+  content: "\f137";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypePhysical:before {
+  color: #805C17;
+  content: "\f318";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypeService:before {
+  color: #DEDEDE;
+  content: "\f2ad";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+  /* protect customize controls from custom page styles */
 #ov1 #customizeControls .labelWrap {
   height: 40px;
   border-radius: 0;
@@ -4517,11 +4607,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1 .positionBottom {
   position: absolute;
   bottom: 0;
+  right: 0;
 }
 
 #ov1 .positionTop {
   position: absolute;
   top: 0;
+  left: 0;
 }
 
 #ov1 .positionTopRight {

imgs/helpdesk-icon.png

@@ -15,16 +15,17 @@ module.exports = {
   keyShortcuts: {
     undo:            'z',
     discover:        'd',
-    myPage:          'h',
+    myPage:          't',
     customizePage:   'e',
     create:          'n',
-    purchases:       't',
-    sales:           'y',
+    purchases:       'k',
+    sales:           'm',
     cases:           'j',
     settings:        'g',
     addressBar:      'l',
     save:            's',
-    restart:         'r'
+    refresh:         'r',
+    restart:         'f'
   },
 
   setTestnet: function(testNetBoolean){

js/config.js

@@ -333,6 +333,7 @@
   "Avatar": "Avatar",
   "AdditionalPaymentData": "Additional payment data",
   "AdditionalPaymentDataInfo": "Include name of purchase and order number in payment QR code?",
+  "ShippableHelp": "This product can be shipped to one of your currently saved addresses. Add more addresses in the Settings/Addresses section to be able to purchase more listings.",
   "firewall": {
     "Open": "Open",
     "Restricted": "Restricted",
@@ -496,7 +497,8 @@
     "UpdatingOrder": "Updating your transaction",
     "UpdateComplete": "Your transaction update is complete",
     "UpdateFailed": "Your transaction update did not complete. Open the transaction and try again",
-    "UpdateInvalid": "Your transaction update returned invalid data. Open the transaction and try again"
+    "UpdateInvalid": "Your transaction update returned invalid data. Open the transaction and try again",
+    "ExportCSV": "Export to CSV"
   },
   "errorMessages": {
     "saveError": "Data could not be saved.",
@@ -517,7 +519,8 @@
     "tooManyPhotosBody": "Some or all of your photos were prevented from being uploaded because you would exceeded the maximum allowable amount.",
     "badJSON": "The JSON data returned from the server was malformed",
     "refundAlreadySent": "The refund has already been successfully sent for this order",
-    "serverTimeout": "No response was received from the server. It may be unreachable or taking a very long time to respond."
+    "serverTimeout": "No response was received from the server. It may be unreachable or taking a very long time to respond.",
+    "noData": "No data is available for the options you have selected."
   },
   "pageConnectingMessages": {
     "listingConnect": "Connecting to listing ${listing}",
@@ -564,6 +567,7 @@
     "cases": "Cases",
     "notifications": "Notifications",
     "settings": "Settings",
+    "refresh": "Refresh Page",
     "restart": "Restart Application",
     "about": "About OpenBazaar",
     "support": "Support OpenBazaar",