2.0.4 - fixes

Isleward-Addon-Dev-Group · Aug 1, 2016 · 235b723 · 235b723
1 parent 73b2de2
commit 235b723
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 51 deletions.
diff --git a/Isleward-PixelDoll.user.js b/Isleward-PixelDoll.user.js
@@ -1,20 +1,20 @@
 // ==UserScript==
 // @name         Isleward - PixelDoll
 // @namespace    Isleward.Addon
-// @version      2.0.2
+// @version      2.0.4
 // @description  Add paper-doll ui to inventory
 // @author       Silence.sys
-// @match        *.play.isleward.com/*
+// @match        *default-environment.9ymkeaciiv.eu-west-1.elasticbeanstalk.com/*
 // @grant        GM_getResourceText
 // @grant        GM_addStyle
-// @resource     pixelDoll https://cdn.rawgit.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/2.0.2/pixelDoll.css
+// @resource     pixelDoll https://cdn.rawgit.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/2.0.4/pixelDoll.css
 // ==/UserScript==
 
 (function() {
     var css = GM_getResourceText('pixelDoll');
     GM_addStyle(css);
     var scriptElement = document.createElement( "script" );
     scriptElement.type = "text/javascript";
-    scriptElement.src = "https://cdn.rawgit.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/2.0.2/pixelDoll.js";
+    scriptElement.src = "https://cdn.rawgit.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/2.0.4/pixelDoll.js";
     document.body.appendChild( scriptElement );
 })();
diff --git a/pixelDoll-icons.png b/pixelDoll-icons.png
diff --git a/pixelDoll.css b/pixelDoll.css
@@ -23,11 +23,31 @@
         opacity: 0.35; }
       .uiInventory > .grid .item:nth-child(8n) {
         margin: 0 8px 8px 0 !important; }
+  .uiInventory .tooltip {
+    z-index: 900; }
+    .uiInventory .tooltip[data-quality="1"] {
+      border-color: rgba(63, 167, 221, 0.35) !important; }
+    .uiInventory .tooltip[data-quality="2"] {
+      border-color: rgba(255, 235, 56, 0.35) !important; }
+    .uiInventory .tooltip[data-quality="3"] {
+      border-color: rgba(162, 78, 255, 0.35) !important; }
+    .uiInventory .tooltip[data-quality="4"] {
+      border-color: rgba(255, 105, 66, 0.35) !important; }
   .uiInventory > .stats {
     width: 316px !important;
     height: 557px !important; }
-  .uiInventory .tooltip {
-    z-index: 900; }
+
+.uiTooltipItem .tooltip[data-quality="1"] {
+  border-color: rgba(63, 167, 221, 0.35) !important; }
+
+.uiTooltipItem .tooltip[data-quality="2"] {
+  border-color: rgba(255, 235, 56, 0.35) !important; }
+
+.uiTooltipItem .tooltip[data-quality="3"] {
+  border-color: rgba(162, 78, 255, 0.35) !important; }
+
+.uiTooltipItem .tooltip[data-quality="4"] {
+  border-color: rgba(255, 105, 66, 0.35) !important; }
 
 /**
  * PixelDoll Buttons
@@ -50,14 +70,14 @@
     .pixelDoll-Button.pdActive:hover {
       background-color: #3c3f4c; }
   .pixelDoll-Button.pdCharacter {
-    background-image: url(https://isleward-test.herokuapp.com/images/items.png);
-    background-position: 0px -64px; }
+    background-image: url(http://dev.silencesys.com/isleward/pixelDoll-icons.png?v=2.0.4);
+    background-position: 0px -128px; }
   .pixelDoll-Button.pdStats {
-    background-image: url(https://isleward-test.herokuapp.com/images/items.png);
-    background-position: -512px 0px;
+    background-image: url(http://dev.silencesys.com/isleward/pixelDoll-icons.png?v=2.0.4);
+    background-position: 0px -64px;
     top: 74px; }
   .pixelDoll-Button.pdFilters {
-    background-image: url(http://dev.silencesys.com/isleward/pixelDoll-icons.png?v=1.3);
+    background-image: url(http://dev.silencesys.com/isleward/pixelDoll-icons.png?v=2.0.4);
     background-position: -1px 0px;
     top: 148px; }
 
@@ -277,18 +297,3 @@
 
 .q4 {
   color: #ff6942; }
-
-/**
- * Item quality tooltips
- */
-.tooltip[data-quality="1"] {
-  border-color: rgba(63, 167, 221, 0.35) !important; }
-
-.tooltip[data-quality="2"] {
-  border-color: rgba(255, 235, 56, 0.35) !important; }
-
-.tooltip[data-quality="3"] {
-  border-color: rgba(162, 78, 255, 0.35) !important; }
-
-.tooltip[data-quality="4"] {
-  border-color: rgba(255, 105, 66, 0.35) !important; }
diff --git a/pixelDoll.js b/pixelDoll.js
@@ -160,11 +160,11 @@ addons.register({
     {
         var elOffset = $(element).offset();
         var uiOffset = this.uiInventory.offset();
-        var tooltip  = $('.tooltip');
+        var tooltip  = $('.uiTooltipItem .tooltip');
         tooltip.show();
         tooltip.css({
-            left: ~~(elOffset.left - uiOffset.left + 74),
-            top:  ~~(elOffset.top - uiOffset.top + 4)
+            left: ~~(elOffset.left + 74),
+            top:  ~~(elOffset.top + 4)
         })
         tooltip.attr('data-quality', item.quality);
 
@@ -180,7 +180,7 @@ addons.register({
     },
     hideEqTooltip: function()
     {
-        $('.tooltip').hide();
+        $('.uiTooltipItem .tooltip').hide();
     },
     addQualityBorders: function()
     {
@@ -219,7 +219,7 @@ addons.register({
     },
     buildCompareTooltip: function(el, item, e)
     {
-        var tooltip = $('.uiInventory .tooltip');
+        var tooltip = $('.uiTooltipItem .tooltip');
         tooltip.attr('data-quality', item.quality);
 
         if(item.material == undefined)

diff --git a/pixelDoll.scss b/pixelDoll.scss
@@ -82,13 +82,29 @@ $red400: rgb(128, 35, 67);
         }
     }
 
+    // Item quality tooltips
+
+    .tooltip
+    {
+        z-index: 900;
+        &[data-quality="1"]{border-color: $q1border !important;}
+        &[data-quality="2"]{border-color: $q2border !important;}
+        &[data-quality="3"]{border-color: $q3border !important;}
+        &[data-quality="4"]{border-color: $q4border !important;}
+    }
+
     >.stats
     {
         width : 316px !important;
         height: 557px !important;
     }
-
-    .tooltip {z-index: 900;}
+}
+.uiTooltipItem .tooltip
+{
+    &[data-quality="1"]{border-color: $q1border !important;}
+    &[data-quality="2"]{border-color: $q2border !important;}
+    &[data-quality="3"]{border-color: $q3border !important;}
+    &[data-quality="4"]{border-color: $q4border !important;}
 }
 /**
  * PixelDoll Buttons
@@ -116,18 +132,18 @@ $red400: rgb(128, 35, 67);
 
     &.pdCharacter
     {
-        background-image: url(https://isleward-test.herokuapp.com/images/items.png);
-        background-position: 0px -64px;
+        background-image: url(https://raw.githubusercontent.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/master/pixelDoll-icons.png?v=2.0.4);
+        background-position: 0px -128px;
     }
     &.pdStats
     {
-        background-image: url(https://isleward-test.herokuapp.com/images/items.png);
-        background-position: -512px 0px;
+        background-image: url(https://raw.githubusercontent.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/master/pixelDoll-icons.png?v=2.0.4);
+        background-position: 0px -64px;
         top: 74px;
     }
     &.pdFilters
     {
-        background-image: url(http://dev.silencesys.com/isleward/pixelDoll-icons.png?v=1.3);
+        background-image: url(https://raw.githubusercontent.com/Isleward-Addon-Dev-Group/Pixel-doll-ui/master/pixelDoll-icons.png?v=2.0.4);
         background-position: -1px 0px;
         top: 148px;
     }
@@ -325,16 +341,4 @@ $red400: rgb(128, 35, 67);
 .q1 {color: $q1;}
 .q2 {color: $q2;}
 .q3 {color: $q3;}
-.q4 {color: $q4;}
-
-/**
- * Item quality tooltips
- */
-
-.tooltip
-{
-    &[data-quality="1"]{border-color: $q1border !important;}
-    &[data-quality="2"]{border-color: $q2border !important;}
-    &[data-quality="3"]{border-color: $q3border !important;}
-    &[data-quality="4"]{border-color: $q4border !important;}
-}
+.q4 {color: $q4;}