From 36b97fc6a2a6e8ce3293137e99cb26f4c10fb82d Mon Sep 17 00:00:00 2001
From: gregueiras <gregueiras@gmail.com>
Date: Thu, 29 Nov 2018 11:58:36 +0000
Subject: [PATCH] Interface Improved

---
 .../modals/PreferencesModal/ConfigTab.styl    | 53 +++++++++++++++----
 browser/main/modals/PreferencesModal/UiTab.js | 15 ++++--
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl
index dbe6535e..67587d94 100644
--- a/browser/main/modals/PreferencesModal/ConfigTab.styl
+++ b/browser/main/modals/PreferencesModal/ConfigTab.styl
@@ -7,9 +7,11 @@
   justify-content: center
   position relative
   margin-bottom: 2em
+  margin-left 2em
 
 .box-minmax
   width 608px
+  height 45px
   display flex
   justify-content space-between
   font-size $tab--button-font-size
@@ -18,6 +20,7 @@
   margin-top 18px
   padding-right 10px
   padding-left  10px
+  padding-top 8px
   position relative
   border $ui-borderColor
   border-radius 5px
@@ -29,6 +32,8 @@ div[id^="secondRow"]
   left 0;
   top 0;
   margin-bottom -42px;
+  .rs-label
+    margin-left -20px
   
 div[id^="firstRow"]
   position absolute;
@@ -36,6 +41,14 @@ div[id^="firstRow"]
   left 0;
   top 0;
   margin-bottom -25px;
+  .rs-range
+      &::-webkit-slider-thumb
+        margin-top: 0px
+        transform: rotate(180deg)
+  .rs-label
+    margin-bottom -85px
+    margin-top 85px
+  
 
 .rs-range
   margin-top: 29px
@@ -51,18 +64,23 @@ div[id^="firstRow"]
     background: $ui-backgroundColor
     border-radius: 0px
     border: 0px solid #010101
+    cursor none
     
   &::-webkit-slider-thumb
     box-shadow: none
-    border: 0px solid $ui-borderColor
+    border: 1px solid $ui-borderColor
     box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.25)
-    height: 42px
-    width: 22px
+    height: 32px
+    width: 32px
     border-radius: 22px
-    background: $ui-backgroundColor
+    background: $ui-text-color
     cursor: pointer
     -webkit-appearance: none
     margin-top: -20px
+    border-color: $ui-text-color
+    height 32px
+    border-top-left-radius: 10%
+    border-top-right-radius: 10%
 
 .rs-label
   position: relative
@@ -76,8 +94,10 @@ div[id^="firstRow"]
   border: none
   margin-bottom: -5px
   margin-top: -10px
-  width: 0px
-  margin-left: 0px
+  clear:both;
+  float:left;
+  height 17px
+  margin-left: -25px
   left: attr(value)
   color: $ui-text-color
   font-style: normal
@@ -256,7 +276,10 @@ body[data-theme="dark"]
 
   .box-minmax, .rs-range, .rs-label
     colorDarkControl()
-
+  .rs-range
+    &::-webkit-slider-thumb
+      colorDarkControl()
+      background $ui-dark-text-color
 
 body[data-theme="solarized-dark"]
   .root
@@ -286,6 +309,10 @@ body[data-theme="solarized-dark"]
       colorSolarizedDarkControl()
   .box-minmax, .rs-range, .rs-label
       colorSolarizedDarkControl()
+  .rs-range
+    &::-webkit-slider-thumb
+      colorSolarizedDarkControl()
+      background $ui-solarized-dark-text-color
 
 body[data-theme="monokai"]
   .root
@@ -315,7 +342,11 @@ body[data-theme="monokai"]
       colorMonokaiControl()
   .box-minmax, .rs-range, .rs-label
       colorMonokaiControl()
-
+  .rs-range
+    &::-webkit-slider-thumb
+      colorMonokaiControl()
+      background $ui-monokai-text-color
+      
 body[data-theme="dracula"]
   .root
     color $ui-dracula-text-color
@@ -343,4 +374,8 @@ body[data-theme="dracula"]
     select, .group-section-control-input
       colorDraculaControl()
   .box-minmax, .rs-range, .rs-label
-    colorDraculaControl()
\ No newline at end of file
+    colorDraculaControl()
+  .rs-range
+    &::-webkit-slider-thumb
+      colorDraculaControl()
+      background $ui-dracula-text-color
\ No newline at end of file
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 463788c7..f0387130 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -196,10 +196,17 @@ class UiTab extends React.Component {
     const rangeSlider = document.getElementById(sliderID)
     const rangeBullet = document.getElementById(bulletID)
 
+    let order
+    if (number === 1) {
+      order = 'Start:'
+    } else {
+      order = 'End:'
+    }
+
     if (rangeSlider && rangeBullet) {
-      rangeBullet.innerHTML = this.formatTime(rangeSlider.value)
+      rangeBullet.innerHTML = `${order}${this.formatTime(rangeSlider.value)}`
       const bulletPosition = (rangeSlider.value / rangeSlider.max)
-      rangeBullet.style.left = (bulletPosition * 578) + 'px'
+      rangeBullet.style.left = (bulletPosition * 574) + 6 * (1 - bulletPosition) + 'px'
     }
 
     if (e) {
@@ -277,12 +284,12 @@ class UiTab extends React.Component {
           <div styleName='group-section'>
             <div styleName='container'>
               <div styleName='range-slider' id='firstRow'>
-                <span id='rs-bullet-1' styleName='rs-label'>{this.formatTime(config.ui.scheduleStart)}</span>
+                <span id='rs-bullet-1' styleName='rs-label'>{`Start: ${this.formatTime(config.ui.scheduleStart)}`}</span>
                 <input id='rs-range-line-1' styleName='rs-range' type='range' value={config.ui.scheduleStart} min='0' max='1440' step='5' ref='scheduleStart'
                   onChange={(e) => this.handleSlider(e, 1)} />
               </div>
               <div styleName='range-slider' id='secondRow'>
-                <span id='rs-bullet-2' styleName='rs-label'>{this.formatTime(config.ui.scheduleEnd)}</span>
+                <span id='rs-bullet-2' styleName='rs-label'>{`End: ${this.formatTime(config.ui.scheduleEnd)}`}</span>
                 <input id='rs-range-line-2' styleName='rs-range' type='range' value={config.ui.scheduleEnd} min='0' max='1440' step='5' ref='scheduleEnd'
                   onChange={(e) => this.handleSlider(e, 2)} />
               </div>