Merge remote-tracking branch 'origin/master' into v0.12.0.x

+Fix Makefile.qt.include

src/Makefile.qt.include

@@ -275,7 +275,19 @@ endif
 RES_IMAGES = \
   qt/res/images/about.png \
   qt/res/images/splash.png \
-  qt/res/images/splash_testnet.png
+  qt/res/images/splash_testnet.png \
+  qt/res/images/dash_logo_horizontal.png \
+  qt/res/images/drkblue_downArrow.png \
+  qt/res/images/drkblue_downArrow_small.png \
+  qt/res/images/drkblue_upArrow_small.png \
+  qt/res/images/drkblue_leftArrow_small.png \
+  qt/res/images/drkblue_rightArrow_small.png \
+  qt/res/images/drkblue_qtreeview_selected.png \
+  qt/res/images/drkblue_walletFrame_bg.png \
+  qt/res/images/drkblue_walletFrame.png
+
+RES_CSS = \
+  qt/res/css/drkblue.css
 
 RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)
 

src/qt/dash.qrc

@@ -61,6 +61,8 @@
         <file alias="drkblue_downArrow">res/images/drkblue_downArrow.png</file>
         <file alias="drkblue_downArrow_small">res/images/drkblue_downArrow_small.png</file>
         <file alias="drkblue_upArrow_small">res/images/drkblue_upArrow_small.png</file>
+        <file alias="drkblue_leftArrow_small">res/images/drkblue_leftArrow_small.png</file>
+        <file alias="drkblue_rightArrow_small">res/images/drkblue_rightArrow_small.png</file>
         <file alias="drkblue_qtreeview_selected">res/images/drkblue_qtreeview_selected.png</file>
         <file alias="drkblue_walletFrame_bg">res/images/drkblue_walletFrame_bg.png</file>
         <file alias="drkblue_walletFrame">res/images/drkblue_walletFrame.png</file>

src/qt/res/css/drkblue.css

@@ -273,23 +273,21 @@ color:#333;
 }
 
 QScrollBar { /* Scroll Bar */
-background-color:#ffffff;
+
 }
 
 QScrollBar:vertical { /* Vertical Scroll Bar Attributes */
-border:1px solid #818181;
+border:0;
-border-left:0px;
+background:#ffffff;
-background:#333;
+width:18px;
-width:17px;
+margin: 18px 0px 18px 0px;
-margin: 0px 0px 0px 0px;
 }
 
 QScrollBar:horizontal { /* Horizontal Scroll Bar Attributes */
-border:1px solid #818181;
+border:0;
-border-top:0px;
+background:#ffffff;
-background:#333;
+height:18px;
-height:17px;
+margin: 0px 18px 0px 18px;
-margin: 0px 0px 0px 0px;
 }
 
 
@@ -303,18 +301,63 @@ background:#e0e0e0;
 min-width:10px;
 }
 
-
 QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */
 background:#F8F6F6;
 }
 
-QScrollBar:up-arrow, QScrollBar:down-arrow { /* Up and Down Arrows */
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */
-border:2px solid #333;
+background-color:#F8F6F6;
-width:3px;
+border: 1px solid #f2f0f0;
-height:3px;
+width:16px;
-background:#fff;
+height:16px;
 }
 
+QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed {
+background-color:#e0e0e0;
+}
+
+QScrollBar::sub-line:vertical { /* Vertical - top button position */
+subcontrol-position:top;
+subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical { /* Vertical - bottom button position */
+subcontrol-position:bottom;
+subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal { /* Vertical - left button position */
+subcontrol-position:left;
+subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:horizontal { /* Vertical - right button position */
+subcontrol-position:right;
+subcontrol-origin: margin;
+}
+
+QScrollBar:up-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow, QScrollBar:right-arrow { /* Arrows Icon */
+width:10px;
+height:10px;
+}
+
+QScrollBar:up-arrow {
+background-image: url(':/images/drkblue_upArrow_small');
+}
+
+QScrollBar:down-arrow {
+background-image: url(':/images/drkblue_downArrow_small');
+}
+
+QScrollBar:left-arrow {
+background-image: url(':/images/drkblue_leftArrow_small');
+}
+
+QScrollBar:right-arrow {
+background-image: url(':/images/drkblue_rightArrow_small');
+}
+
+
 /*******************************************************/
 
 /* DIALOG BOXES */