Merge branch 'master' of https://github.com/Dash-Diamond/DASHD_2_0

decenomy · Mar 3, 2021 · 1253c6c · 1253c6c
2 parents ea0f825 + fef4f0f
commit 1253c6c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -330,7 +330,7 @@ RES_ICONS = \
   qt/pivx/res/img/img-dashboard-banner.jpg \
   qt/pivx/res/img/btn-radio-active.svg \
   qt/pivx/res/img/ic-check-mn-conf.svg \
-  qt/pivx/res/img/ic-check-dashd-conf.svg \
+  qt/pivx/res/img/ic-check-coin-conf.svg \
   qt/pivx/res/img/ic-check-sync-off.svg \
   qt/pivx/res/img/ic-nav-privacy-active.svg \
   qt/pivx/res/img/img-empty-contacts.svg \

diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc
@@ -111,7 +111,7 @@
         <file alias="ic-check-peers-off">pivx/res/img/ic-check-peers-off.svg</file>
         <file alias="ic-check-peers">pivx/res/img/ic-check-peers.svg</file>
         <file alias="ic-check-mn-conf">pivx/res/img/ic-check-mn-conf.svg</file>
-        <file alias="ic-check-dashd-conf">pivx/res/img/ic-check-dashd-conf.svg</file>
+        <file alias="ic-check-coin-conf">pivx/res/img/ic-check-coin-conf.svg</file>
         <file alias="ic-check-staking-off">pivx/res/img/ic-check-staking-off.svg</file>
         <file alias="ic-check-staking">pivx/res/img/ic-check-staking.svg</file>
         <file alias="ic-check-sync-off">pivx/res/img/ic-check-sync-off.svg</file>

diff --git a/src/qt/pivx/res/css/style_dark.css b/src/qt/pivx/res/css/style_dark.css
@@ -136,11 +136,11 @@ QPushButton[cssClass="img-nav-logo"] {
 !#############
  ################################*/
 /*****
-*masternode conf & dashd conf file edit topbar buttons.
+*masternode conf & coin conf file edit topbar buttons.
 *****/
 
 QPushButton[cssClass="btn-check-conf"] {
-    qproperty-icon: url("://ic-check-dashd-conf") ;
+    qproperty-icon: url("://ic-check-coin-conf") ;
     qproperty-iconSize: 24px 24px;
     color:#ffffff;
     background-color:#0b2c42;

diff --git a/src/qt/pivx/res/css/style_light.css b/src/qt/pivx/res/css/style_light.css
@@ -101,11 +101,11 @@ QPushButton[cssClass="img-nav-logo"] {
 }
 
 /*****
-*masternode conf & dashd conf file edit topbar buttons.
+*masternode conf & coin conf file edit topbar buttons.
 *****/
 
 QPushButton[cssClass="btn-check-conf"] {
-  qproperty-icon: url("://ic-check-dashd-conf") ;
+  qproperty-icon: url("://ic-check-coin-conf") ;
   qproperty-iconSize: 24px 24px;
   color: #262626;
   background-color:#d1d3d4;

diff --git a/src/qt/pivx/res/img/ic-check-dashd-conf.svg → src/qt/pivx/res/img/ic-check-coin-conf.svg b/src/qt/pivx/res/img/ic-check-dashd-conf.svg → src/qt/pivx/res/img/ic-check-coin-conf.svg