Skip to content

Commit 57c3c09

Browse files
committed
chore: implemented quill in bottom tabs
1 parent 76acf5e commit 57c3c09

13 files changed

Lines changed: 423 additions & 49 deletions

File tree

build/cssmin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ module.exports = {
66
files: [
77
{
88
src: [
9-
`${global.node_modules_paths.quill}/dist/assets/style.css`,
109
`${global.dist}/css/common.css`,
1110
`${global.node_modules_paths.binary_style}/binary.css`,
1211
`${global.node_modules_paths.binary_style}/binary.more.css`,
1312
],
1413
dest: `${global.dist}/css/common.min.css`,
1514
},
15+
{ src: `${global.dist}/css/reset.css`, dest: `${global.dist}/css/reset.min.css` },
1616
{ src: `${global.dist}/css/app.css`, dest: `${global.dist}/css/app.min.css` },
1717
{ src: `${global.dist}/css/static.css`, dest: `${global.dist}/css/static.min.css` },
1818
],

build/postcss.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
1212
],
1313
},
1414
dist: {
15-
src: `${global.dist}/css/{app,common,static}.css`,
15+
src: `${global.dist}/css/{app,common,static,reset}.css`,
1616
},
1717
};
1818
};

scripts/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exports.sections_config = {
2121
'': { // '' is the default section when no 'section' specified in pages.js (to avoid adding 'app' as section for all)
2222
path : '',
2323
js_files : ['vendor', 'binary'],
24-
css_files: ['common.min', 'app.min', 'static.min'],
24+
css_files: ['common.min', 'app.min', 'static.min','reset.min'],
2525
has_pjax : true,
2626
},
2727
};

scripts/render.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ const Crypto = require('crypto');
3232
const fs = require('fs');
3333
const Path = require('path');
3434
const Url = require('url');
35-
const common = require('./common');
36-
const js_translation = require('./js_translation');
35+
const { Console } = require('console');
3736
const Gettext = require('./gettext');
37+
const js_translation = require('./js_translation');
38+
const common = require('./common');
3839

3940
program
4041
.version('0.2.2')
@@ -336,6 +337,9 @@ const getFilteredPages = () => {
336337
});
337338
}
338339

340+
console.log('Section');
341+
console.log(sections);
342+
339343
context_builder = await createContextBuilder(sections);
340344

341345
await Promise.all(

src/javascript/app/pages/bottom/tabs.jsx

Lines changed: 380 additions & 0 deletions
Large diffs are not rendered by default.

src/javascript/app/pages/trade/analysis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const TradingAnalysis = (() => {
105105

106106
TabSelector.slideSelector(tab_selector_id, el_to_show);
107107
if (el_mobile_tab_header) {
108-
el_mobile_tab_header.innerHTML = el_to_show.firstChild.innerHTML;
108+
// el_mobile_tab_header.innerHTML = el_to_show.firstChild.innerHTML;
109109
}
110110
}
111111

src/javascript/app/pages/trade/charts/webtrader_chart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const WebtraderChart = (() => {
3030

3131
const setChart = () => {
3232
const new_underlying = getElementById('underlying').value;
33-
if ($('#tab_graph').hasClass('active') &&
33+
if (
3434
(!chart || chart.data().instrumentCode !== new_underlying)
3535
) {
3636
cleanupChart();

src/javascript/app/pages/trade/common.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const Symbols = require('./symbols');
33
const Tick = require('./tick');
44
const contractsElement = require('./contracts.jsx');
55
const marketsElement = require('./markets.jsx');
6+
const TabsElement = require('../bottom/tabs.jsx');
67
const formatMoney = require('../../common/currency').formatMoney;
78
const ActiveSymbols = require('../../common/active_symbols');
89
const elementInnerHtml = require('../../../_common/common_functions').elementInnerHtml;
@@ -58,6 +59,9 @@ const commonTrading = (() => {
5859

5960
const displayMarkets = () => {
6061
marketsElement.init();
62+
63+
// All other Quill refactored components
64+
TabsElement.init();
6165
};
6266

6367
/*

src/sass/_common/common.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ button {
194194
vertical-align: top;
195195
}
196196

197-
button:focus, input[type='submit']:focus {
198-
background: $COLOR_GREEN;
199-
outline: none;
200-
}
201-
202197
button::-moz-focus-inner, input[type='submit']::-moz-focus-inner {
203198
border: 0;
204199
}
@@ -1119,3 +1114,5 @@ label + input {
11191114
font-weight: bold !important;
11201115
}
11211116
}
1117+
1118+

src/sass/_common/reskin.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.quill {
2+
&-container {
3+
&-centered {
4+
width: 100%;
5+
display: flex;
6+
justify-content: center;
7+
}
8+
}
9+
}
10+
11+
.tab-explanation {
12+
h3 {
13+
font-weight: 700;
14+
}
15+
}
16+
17+
.explanation-container {
18+
margin-block-end: 50px;
19+
}

0 commit comments

Comments
 (0)