Skip to content

Commit

Permalink
Merge pull request #128 from bitholla/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
abeikverdi authored May 7, 2020
2 parents e6ef7f4 + 8861c02 commit d537126
Show file tree
Hide file tree
Showing 39 changed files with 119 additions and 258 deletions.
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ steps:
when:
branch: testnet

- name: create_github_release_test
image: ubuntu:19.04
- name: create_github_release
image: bitholla/devops-tools:drone_github_hub-2004241546
environment:
GITHUB_TOKEN:
from_secret: github_oauth2_token_for_releases
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.4.1
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hollaex-kit",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"dependencies": {
"@material/button": "^0.7.0",
Expand Down
21 changes: 0 additions & 21 deletions web/public/assets/icons/HEX-logo-dark.svg

This file was deleted.

18 changes: 0 additions & 18 deletions web/public/assets/icons/HEX-logo-light.svg

This file was deleted.

13 changes: 0 additions & 13 deletions web/public/assets/icons/facebook-inactive.svg

This file was deleted.

1 change: 1 addition & 0 deletions web/public/assets/icons/facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions web/public/assets/icons/insta-inactive.svg

This file was deleted.

1 change: 1 addition & 0 deletions web/public/assets/icons/instagram.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 web/public/assets/icons/linkedin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions web/public/assets/icons/social-grey-icons.svg

This file was deleted.

9 changes: 0 additions & 9 deletions web/public/assets/icons/social-grey-icons02.svg

This file was deleted.

16 changes: 0 additions & 16 deletions web/public/assets/icons/social-grey-icons03.svg

This file was deleted.

14 changes: 0 additions & 14 deletions web/public/assets/icons/social-grey-icons04.svg

This file was deleted.

15 changes: 0 additions & 15 deletions web/public/assets/icons/telegram-inactive.svg

This file was deleted.

Binary file added web/public/assets/icons/telegram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion web/public/assets/icons/telegram.svg

This file was deleted.

11 changes: 0 additions & 11 deletions web/public/assets/icons/twitter-dark.svg

This file was deleted.

12 changes: 0 additions & 12 deletions web/public/assets/icons/twitter-inactive.svg

This file was deleted.

Binary file added web/public/assets/icons/twitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/src/components/AppBar/_AppBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ $app-bar-add-tab-red: #ff0000;
}

.app_bar-icon-logo {
height: 3rem;
height: 4rem;
width: 5rem;
background-size: contain;
background-position: center;
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/AppFooter/_AppFooter.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $footer-logo-color: $trade-tabs-inactive-color;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
height: 4rem;
height: 6rem;
margin-left: 1rem;
width: 7rem;
}
Expand Down
6 changes: 2 additions & 4 deletions web/src/components/AppFooter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const generateSectionsText = (strings, theme, links = {}) => {
},
website && {
text: SECTIONS.SECTION_6_LINK_6,
icon: SOCIAL_ICONS.GOOGLE,
link: website
},
]
Expand All @@ -52,7 +51,6 @@ const generateSectionsText = (strings, theme, links = {}) => {
},
information && {
text: SECTIONS.SECTION_6_LINK_8,
icon: SOCIAL_ICONS.GOOGLE,
link: information
},
// {
Expand Down Expand Up @@ -87,7 +85,7 @@ const generateSectionsText = (strings, theme, links = {}) => {
LINKS: [
twitter && {
text: SECTIONS.SECTION_6_LINK_1,
icon: SOCIAL_ICONS.TWITTER_DARK,
icon: SOCIAL_ICONS.TWITTER,
link: twitter
},
telegram && {
Expand All @@ -107,7 +105,7 @@ const generateSectionsText = (strings, theme, links = {}) => {
},
linkedin && {
text: SECTIONS.SECTION_6_LINK_5,
icon: SOCIAL_ICONS.TWITTER_DARK,
icon: SOCIAL_ICONS.LINKEDIN,
link: linkedin
}
]
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Chat/ChatFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const ChatFooter = ({
}) => {
return (
<div
className={set_username ? classnames('d-flex', 'justify-content-center', 'flex-column', 'chat-footer') :
className={set_username ? classnames('d-flex', 'apply_rtl', 'justify-content-center', 'flex-column', 'chat-footer') :
classnames('d-flex', 'justify-content-center', 'flex-column', 'chat-footer', 'chat-username-footer')
}
>
Expand Down
1 change: 1 addition & 0 deletions web/src/components/Chat/ChatHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const ChatHeader = ({
<div
className={classnames(
'd-flex',
'apply_rtl',
'justify-content-between',
'align-items-center',
'chat-header'
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Chat/ChatMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class ChatMessageWithText extends Component {

) : (
<div className="mr-1 my-1 username">
<span className="mr-1">
<span className="mr-1 apply_rtl">
{`${username}:`}
</span>
{to && <span className="mr-1">{`${to}:`}</span>}
Expand Down
Loading

0 comments on commit d537126

Please sign in to comment.