From 38c20289a4c8a6f90fec50399d20e0e0be6711eb Mon Sep 17 00:00:00 2001 From: NickMcSweeney Date: Sat, 27 Jan 2018 15:54:01 -0800 Subject: [PATCH] style clean up. search bar update. --- app.json | 2 +- app/view/main/Main.js | 2 +- app/view/main/MainController.js | 3 + package.json | 1 + .../sass/src/button/Button.scss | 16 +- .../sass/src/form/field/Text.scss | 16 +- .../sass/src/window/MessageBox.scss | 2 +- .../sass/src/window/Window.scss | 13 +- resources/earth.png | Bin 1101 -> 0 bytes sencha-error-20180125-1.log | 596 ------------------ sencha-error-20180125-2.log | 596 ------------------ sencha-error-20180125-3.log | 596 ------------------ sencha-error-20180125-4.log | 596 ------------------ sencha-error-20180125-5.log | 596 ------------------ sencha-error-20180125.log | 596 ------------------ 15 files changed, 35 insertions(+), 3596 deletions(-) delete mode 100644 resources/earth.png delete mode 100644 sencha-error-20180125-1.log delete mode 100644 sencha-error-20180125-2.log delete mode 100644 sencha-error-20180125-3.log delete mode 100644 sencha-error-20180125-4.log delete mode 100644 sencha-error-20180125-5.log delete mode 100644 sencha-error-20180125.log diff --git a/app.json b/app.json index 4909209a..5609e0cd 100644 --- a/app.json +++ b/app.json @@ -28,7 +28,7 @@ * The name of the theme for this application. */ - "theme": "rambox-default-theme", + "theme": "rambox-dark-theme", /** * The list of required packages (with optional versions; default is "latest"). diff --git a/app/view/main/Main.js b/app/view/main/Main.js index 9231b9a8..1b0f1e34 100644 --- a/app/view/main/Main.js +++ b/app/view/main/Main.js @@ -341,7 +341,7 @@ Ext.define('Rambox.view.main.Main', { ,'->' ,{ xtype: 'label' - ,html: ' '+locale['app.main[26]']+' '+locale['app.main[27]'].replace('Argentina', 'Earth') + ,html: ' '+locale['app.main[26]']+' '+locale['app.main[27]'].replace('Argentina', 'Argentina') } ,'->' ,{ diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index 091359a0..a716667e 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -235,6 +235,7 @@ Ext.define('Rambox.view.main.MainController', { var cg = field.up().down('checkboxgroup'); if ( !Ext.isEmpty(newValue) && newValue.length > 0 ) { + field.getTrigger('search').hide(); field.getTrigger('clear').show(); Ext.getStore('ServicesList').getFilters().replaceAll({ @@ -246,6 +247,7 @@ Ext.define('Rambox.view.main.MainController', { }); } else { field.getTrigger('clear').hide(); + field.getTrigger('search').show(); Ext.getStore('ServicesList').getFilters().removeAll(); me.doTypeFilter(cg); } @@ -259,6 +261,7 @@ Ext.define('Rambox.view.main.MainController', { field.reset(); field.getTrigger('clear').hide(); + field.getTrigger('search').show(); field.updateLayout(); Ext.getStore('ServicesList').getFilters().removeAll(); diff --git a/package.json b/package.json index 93eac394..634b38aa 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "test": "./node_modules/.bin/mocha test/tests/**/*.spec.js", "sencha:clean": "rm -rf ./build/production", "sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/", + "sencha:watch": "sencha app watch && cp app/package.json build/production/Rambox/ -w && npm --prefix -w ./build/production/Rambox/ install ./build/production/Rambox/", "sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build", "clean": "rm -rf ./dist", "clean:osx": "rm -rf ./dist/Rambox-darwin-*", diff --git a/packages/local/rambox-dark-theme/sass/src/button/Button.scss b/packages/local/rambox-dark-theme/sass/src/button/Button.scss index 62fde0b4..707d8abd 100644 --- a/packages/local/rambox-dark-theme/sass/src/button/Button.scss +++ b/packages/local/rambox-dark-theme/sass/src/button/Button.scss @@ -11,6 +11,20 @@ .x-btn-inner-decline-small:hover{ text-decoration: underline; } +.x-btn-decline-small { + border-color: $body-light-color; + .x-btn-inner-decline-small { + color: $base-dark-text; + } + &.x-btn-over { + border-color: $base-gray; + background-color: rgba($base-gray, 0.1); + .x-btn-inner-decline-small { + color: $base-light-text; + text-decoration: none; + } + } +} .x-btn-default-toolbar-small { border-radius: $border-radius-lg; @@ -35,4 +49,4 @@ background-color: $base-dark-color; } } -} \ No newline at end of file +} diff --git a/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss b/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss index ebf5411b..7287c66d 100644 --- a/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss +++ b/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss @@ -1,18 +1,16 @@ .x-form-trigger-wrap { - // border-radius: $border-radius-md; - // border-width: 2px; - // border-color: $base-gray; - // background-color: transparent; + padding: 1px 2px 2px 0px; border-width: 1px; - border-radius: 0; - border-style: solid; - border-color: $base-color; - background-color: $base-dark-color; + border-radius: 0; + border-style: solid; + border-color: $base-color; + background-color: $base-dark-color; color: $base-light-text; .x-form-text, .x-form-trigger-default { border-radius: $border-radius-md; background-color: transparent; color: $base-light-text; + height: auto; .x-form-spinner-default { border-radius: $border-radius-md; background-color: $body-color; @@ -22,4 +20,4 @@ } .x-form-item-label-default { color: $base-light-text; -} \ No newline at end of file +} diff --git a/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss b/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss index 5155d8ae..3f5a3d17 100644 --- a/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss +++ b/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss @@ -10,4 +10,4 @@ } .x-toolbar-footer { background: $base-color; -} \ No newline at end of file +} diff --git a/packages/local/rambox-dark-theme/sass/src/window/Window.scss b/packages/local/rambox-dark-theme/sass/src/window/Window.scss index f7fc603b..316988cc 100644 --- a/packages/local/rambox-dark-theme/sass/src/window/Window.scss +++ b/packages/local/rambox-dark-theme/sass/src/window/Window.scss @@ -1,7 +1,4 @@ .x-window-default { - // .x-window-header-default { - - // } .x-window-body-default { background: $body-color; color: $base-light-text; @@ -14,9 +11,11 @@ .fieldset-body-default { padding: 0 .1rem .25rem } + .x-box-layout-ct { + .x-btn-default-small { + padding: 4.5px; + } + } } } - // .x-window-footer-default { - - // } -} \ No newline at end of file +} diff --git a/resources/earth.png b/resources/earth.png deleted file mode 100644 index cbaa46c0d30bd82a4948014ec6113f8d666d270a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1101 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f>5jgR3=A9lx&I`x0{IHb9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDSxV%QuQiw3xKK_7;Gx6fXv*~l0=1y+?>2(s|s5sunH?6 z8zii+qySb@l5MLL;TxdfoL`ixV5(=LXP{)qrJ$f-QP|K%!RuMVYBUn?dH= z8QOqVqKHB5vC#)vj^r4KPr;%RZP3~5%LNj3 zlj1im^S!LPth;sUt=x_>xm~5jRxSb}SGpfL6te%7{=#4I=E2$78@km$Dm2Ts{$#XD z+|YbI&nI=$+AUkNXK#DyK5I#4-Lkx2hkk$Bv*-NhL%$CuNUnJ=S5v*EDdhIPFFVri z>{w*S32u<9r^LV*kQWyZxV3rtK&z&e73b(RHGj$z5XJ^XA4m4-D^5ij4~7 zIU~L&sct@V9y^Qa=YR=Mv{$+aa8BJ38m!7IE?}+a6aA{V>CDf&&y{Z-Oya%q$<>&X zCpFF4S=BSmE~wRaqu9(8jnW6-sxnO7JyzTJ?(Gv4YB|J{W_ZxC+g&$$io|NJz57@y z9{a4`-mx%DDz{eR=$wXE-&kDMbw7CV+@oZb+|wVytjj~XcKu9bRjQt!xjOqwN!Y^w zuNG`EZ%KN zIK({SWz}@8;KrIC=Z@B{3;40l{n*^E%9CRrI0}9BVtbplXaE1pX*R2!=HAs(dhFPs z(yef-{p*L*llF5o7_NT*+f47Zfw=TSlZ(YR8Ed)pE-;F7AK?D9B~;K{)%IK7f&bO& zzrVLV+{N|yzLn3N2AyuR(8tS`&-tiR;Iue()9kY`>05W~+VV603A5PUyGEtWmYS!g zwLgBlY0iT7hdXvZj`$K>o1E{PwdY>Zw8X!^7c~C3p&=pvgV{kk)