Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meenu/[QUILL-1777] bottom tab draft #661

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
57c3c09
chore: implemented quill in bottom tabs
prince-deriv Jun 20, 2024
14d2b75
chore: undo render.js changes
prince-deriv Jun 20, 2024
5783d29
chore: add event triggers
prince-deriv Jun 21, 2024
e00ce6a
fix: initial object data
meenakshi-deriv Jun 21, 2024
3e88740
fix: extracted data for tabs
meenakshi-deriv Jun 24, 2024
4700a22
fix: added localize in tabs
meenakshi-deriv Jun 24, 2024
6be3ba5
fix: removed object key mapping
meenakshi-deriv Jun 24, 2024
80934cf
fix: added parse for localized
meenakshi-deriv Jun 24, 2024
375364d
fix: removed invisible class for image
meenakshi-deriv Jun 24, 2024
00798d8
fix: fixed eslint errors
meenakshi-deriv Jun 25, 2024
3aece32
fix: added escape character for using double quotes
meenakshi-deriv Jun 25, 2024
ee8945b
fix: moved localize to data file
meenakshi-deriv Jun 25, 2024
25ef83f
chore: fix translation issues
prince-deriv Jun 25, 2024
118b324
fix: removed backslash and added localize fot titles under explain
meenakshi-deriv Jun 25, 2024
d2fb0f4
fix: removed extra spaces
meenakshi-deriv Jun 25, 2024
e972f36
fix: add eslint comment for unused var
meenakshi-deriv Jun 25, 2024
663dcb5
fix: test issues
prince-deriv Jun 25, 2024
0804ecd
fix: fixed conflicts
meenakshi-deriv Jun 25, 2024
2a02f70
fix: fixed conflict
meenakshi-deriv Jun 25, 2024
e7525d8
fix: tab change reload chart
prince-deriv Jun 26, 2024
2c53b7c
Merge remote-tracking branch 'refs/remotes/meenu/meenu-bottom-tab-dra…
prince-deriv Jun 26, 2024
2b6bee4
chore: refactor handling selected contract
prince-deriv Jun 26, 2024
576f445
fix: added selected tab in session storage and refactored code
meenakshi-deriv Jun 26, 2024
da04a04
fix: added market change for explanation
meenakshi-deriv Jun 26, 2024
62fff52
chore: variable improvement
prince-deriv Jun 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/cssmin.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ module.exports = {
files: [
{
src: [
`${global.node_modules_paths.quill}/dist/assets/style.css`,
`${global.dist}/css/common.css`,
`${global.node_modules_paths.binary_style}/binary.css`,
`${global.node_modules_paths.binary_style}/binary.more.css`,
],
dest: `${global.dist}/css/common.min.css`,
},
{ src: `${global.dist}/css/reset.css`, dest: `${global.dist}/css/reset.min.css` },
{ src: `${global.dist}/css/app.css`, dest: `${global.dist}/css/app.min.css` },
{ src: `${global.dist}/css/static.css`, dest: `${global.dist}/css/static.min.css` },
],
Expand Down
2 changes: 1 addition & 1 deletion build/postcss.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function (grunt) {
],
},
dist: {
src: `${global.dist}/css/{app,common,static}.css`,
src: `${global.dist}/css/{app,common,static,reset}.css`,
},
};
};
79 changes: 74 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"davidshimjs-qrcodejs": "0.0.2",
"event-source-polyfill": "0.0.9",
"highstock-release": "5.0.14",
"html-react-parser": "^5.1.10",
"jquery": "3.5.1",
"jquery.scrollto": "2.1.2",
"js-cookie": "2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports.sections_config = {
'': { // '' is the default section when no 'section' specified in pages.js (to avoid adding 'app' as section for all)
path : '',
js_files : ['vendor', 'binary'],
css_files: ['common.min', 'app.min', 'static.min'],
css_files: ['common.min', 'app.min', 'static.min','reset.min'],
has_pjax : true,
},
};
Expand Down
Loading
Loading