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

[BOT] maryia/feat: add icons for flyout & toolbar, change styles for searchbox #20

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions public/assets/icons/IcArrowLeft.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcChartsTabDbot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcFolderOpen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcRedo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcReset.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcSearch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcSort.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcTradingViewChart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcUndo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcZoomIn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/IcZoomOut.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/components/run-panel/run-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@ const DrawerFooter = ({ is_clear_stat_disabled, onClearStatClick }: TDrawerFoote
id='db-run-panel__clear-button'
className='run-panel__footer-button'
disabled={is_clear_stat_disabled}
label={localize('Reset')}
onClick={onClearStatClick}
has_effect
variant='outlined'
/>
>
<span>{localize('Reset')}</span>
</Button>
</div>
);

Expand Down
9 changes: 9 additions & 0 deletions src/pages/bot-builder/toolbox/toolbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
padding: 0.8rem;
background: var(--general-main-1);
z-index: 1;

$toolbox: &;
$category-text-spacing: 10px;

Expand All @@ -33,8 +34,15 @@
padding: 1.3rem 0.8rem;
height: 6rem;

& .deriv-input__container {
width: 100%;
}

&-field {
margin-bottom: 0 !important;
border-radius: 8px;
height: 3.2rem;
padding: 0.6rem 0.8rem;

input::-ms-clear {
display: none;
Expand Down Expand Up @@ -180,6 +188,7 @@
&:hover {
background-color: var(--general-hover);
}

&--active {
background-color: var(--general-hover);
}
Expand Down
64 changes: 64 additions & 0 deletions src/styles/icon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/* stylelint-disable color-no-hex */

/* COLOR PALETTE */

/* colors */
$color-black-1: #333;
$color-grey-1: #999;
$color-black-3: #151717;

:root {
// Icons and Texts
--text-general: #{$color-black-1};
--text-less-prominent: #{$color-grey-1};
--general-section-1: #{$color-black-3};
--icon-grey-background: #{$color-black-1};
--text-prominent: #{$color-black-1};
--fill-color1: var(--text-general);
--fill-color2: var(--text-less-prominent);
--fill-color3: var(--general-section-1);
--fill-color4: var(--icon-grey-background);
--fill-color5: var(--text-prominent);

&--disabled {
--fill-color1: var(--text-disabled);
--fill-color2: var(--text-disabled);
}

&--active {
--fill-color1: #{$color-white};
--fill-color2: #{$color-white};
}

&--green {
--fill-color1: var(--text-profit-success);
--fill-color2: var(--text-profit-success);
--fill-color3: #{$color-white};
}

&--red {
--fill-color1: var(--text-loss-danger);
--fill-color2: var(--text-loss-danger);
--fill-color3: #{$color-white};
}

&--secondary {
--fill-color1: var(--text-less-prominent);
--fill-color2: var(--text-less-prominent);
--fill-color3: #{$color-white};
}

&--brand {
--fill-color1: var(--brand-red-coral);
--fill-color2: var(--brand-secondary);
--fill-color3: #{$color-white};
}

&--black {
--fill-color1: var(--icon-black-plus);
}

&--orange {
--fill-color1: var(--status-warning);
}
}
1 change: 1 addition & 0 deletions src/styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import 'https://fonts.googleapis.com/css?family=IBM+Plex+Sans:300,400,500,700&display=swap&subset=cyrillic,cyrillic-ext,latin-ext,vietnamese';
@import './icon';

body {
font-family: 'IBM Plex Sans', sans-serif;
Expand Down
Loading