From 0050bbc93c118476ce799d3da9bb48a6ce4abfd7 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 4 Nov 2016 09:09:41 +1300
Subject: Change theme to triton

---
 web/app.css             | 12 ++----------
 web/app/view/BaseMap.js |  1 -
 web/app/view/Devices.js |  1 +
 web/app/view/Map.js     |  1 +
 web/app/view/State.js   |  1 +
 web/load.js             |  9 ++-------
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/web/app.css b/web/app.css
index d99324a9..cb9d2bc2 100644
--- a/web/app.css
+++ b/web/app.css
@@ -8,22 +8,14 @@
     background-color: rgba(255, 84, 104, 0.3);
 }
 
-.panel-top-border {
-    border-top: 1px solid #cfcfcf !important;
+.toolbar-header-style {
+    background-color: #5fa2dd !important;
 }
 
 body.x-border-layout-ct, div.x-border-layout-ct {
     background-color: #bbbbbb !important;
 }
 
-.x-toolbar-default {
-    background-color: #f5f5f5 !important;
-}
-
-.x-tree-icon {
-    display: none !important;
-}
-
 #attribution {
     position: absolute;
     bottom: 10px;
diff --git a/web/app/view/BaseMap.js b/web/app/view/BaseMap.js
index 17d6a490..2e981f08 100644
--- a/web/app/view/BaseMap.js
+++ b/web/app/view/BaseMap.js
@@ -20,7 +20,6 @@ Ext.define('Traccar.view.BaseMap', {
     xtype: 'baseMapView',
 
     layout: 'fit',
-    bodyCls: 'panel-top-border',
 
     getMap: function () {
         return this.map;
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 3cfd5542..19739768 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -39,6 +39,7 @@ Ext.define('Traccar.view.Devices', {
     selType: 'rowmodel',
 
     tbar: {
+        componentCls: 'toolbar-header-style',
         items: [{
             xtype: 'tbtext',
             html: Strings.deviceTitle,
diff --git a/web/app/view/Map.js b/web/app/view/Map.js
index c5b6210c..b9f3498a 100644
--- a/web/app/view/Map.js
+++ b/web/app/view/Map.js
@@ -27,6 +27,7 @@ Ext.define('Traccar.view.Map', {
 
     title: Strings.mapTitle,
     tbar: {
+        componentCls: 'toolbar-header-style',
         items: [{
             xtype: 'tbtext',
             html: Strings.mapTitle,
diff --git a/web/app/view/State.js b/web/app/view/State.js
index 593c5e6b..8f029035 100644
--- a/web/app/view/State.js
+++ b/web/app/view/State.js
@@ -27,6 +27,7 @@ Ext.define('Traccar.view.State', {
     store: 'Attributes',
 
     tbar: {
+        componentCls: 'toolbar-header-style',
         items: [{
             xtype: 'tbtext',
             html: Strings.stateTitle,
diff --git a/web/load.js b/web/load.js
index 0e29fc3e..f4987acd 100644
--- a/web/load.js
+++ b/web/load.js
@@ -110,13 +110,8 @@
     }
     addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/locale/locale-' + locale.languages[locale.language].code + '.js');
 
-    if (touchMode) {
-        addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-crisp-touch/resources/theme-crisp-touch-all.css');
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-crisp-touch/theme-crisp-touch.js');
-    } else {
-        addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-crisp/resources/theme-crisp-all.css');
-        addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-crisp/theme-crisp.js');
-    }
+    addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-triton/resources/theme-triton-all.css');
+    addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/classic/theme-triton/theme-triton.js');
 
     addStyleFile('//cdnjs.cloudflare.com/ajax/libs/font-awesome/' + fontAwesomeVersion + '/css/font-awesome.min.css');
 
-- 
cgit v1.2.3