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.

Sign up for GitHub

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

[IMPROVE] new icons #13289

Merged
merged 39 commits into from
Feb 5, 2019
Merged

[IMPROVE] new icons #13289

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7a8f565
fix temporary my_message extra data
ggazzo Dec 11, 2018
bca9775
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Dec 19, 2018
f134a12
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Jan 3, 2019
587a3c5
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Jan 24, 2019
ef2285a
fix part 1
ggazzo Jan 25, 2019
458fdeb
icons.svg to files
ggazzo Jan 28, 2019
5aaa62e
new icons
ggazzo Jan 28, 2019
ab79848
added script
ggazzo Jan 28, 2019
b5f5ac3
modal-success -> checkmark-circled
ggazzo Jan 29, 2019
08d9147
angle-down -> arrow-down
ggazzo Jan 29, 2019
4440a83
modal-error -> circle-cross
ggazzo Jan 29, 2019
86dec31
modal-info -> info-circled
ggazzo Jan 29, 2019
0b7f5e0
globe -> discover
ggazzo Jan 29, 2019
7c2608f
cross-circle -> dcircle-cross
ggazzo Jan 29, 2019
775e0b9
circle-check -> checkmark-circled
ggazzo Jan 29, 2019
de24583
go-back -> back
ggazzo Jan 29, 2019
134cc8a
multi-line -> multiline
ggazzo Jan 29, 2019
e51bdec
new icons
ggazzo Jan 30, 2019
b3773c4
readme explaining how to create new icons
ggazzo Jan 30, 2019
7e64853
updated scripts
ggazzo Jan 30, 2019
4f69c76
few ajusts to apply new icons
ggazzo Jan 30, 2019
ea5fac8
Merge branch 'develop' into new-icons
ggazzo Jan 30, 2019
d76e4d8
fix test
ggazzo Jan 30, 2019
f1a00a5
Merge remote-tracking branch 'origin/develop' into new-icons
ggazzo Jan 30, 2019
4d8dea4
Merge branch 'new-icons' of github.com:RocketChat/Rocket.Chat into ne…
ggazzo Jan 30, 2019
7dae9cf
new icons
ggazzo Jan 30, 2019
ad81753
removed useless icons used on marketplace
ggazzo Jan 30, 2019
19aafcf
Merge branch 'develop' into new-icons
ggazzo Jan 30, 2019
0c55908
changed install apps icons
ggazzo Jan 30, 2019
6514c6d
new icons
ggazzo Jan 30, 2019
d5f18a2
Merge branch 'new-icons' of github.com:RocketChat/Rocket.Chat into ne…
ggazzo Jan 30, 2019
c06b700
css fixes
ggazzo Jan 31, 2019
72e628a
v1 icons done
ggazzo Jan 31, 2019
a0723a8
prune message icon
ggazzo Jan 31, 2019
ce614d0
removed invalid icon
ggazzo Feb 1, 2019
b47aed7
Merge branch 'develop' into new-icons
engelgabriel Feb 3, 2019
691b634
fix sidebar
ggazzo Feb 4, 2019
4049b51
Merge branch 'new-icons' of github.com:RocketChat/Rocket.Chat into ne…
ggazzo Feb 4, 2019
ae7700e
fix font size
ggazzo Feb 4, 2019
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
11 changes: 1 addition & 10 deletions packages/rocketchat-apps/assets/stylesheets/apps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,6 @@
margin: 0 7px;
}

.installer {
position: relative;

overflow: hidden;

width: 20px;
height: 20px;
}

&__wrap-actions {
& > .rc-icon--loading {
display: none;
Expand All @@ -167,7 +158,7 @@
animation: spin 1s linear infinite;
}

& > .installer {
& > .apps-installer {
display: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-apps/client/admin/apps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{{#if renderDownloadButton latest}}
<div class="rc-apps-marketplace__wrap-actions">
{{> icon block="rc-icon--default-size rc-icon" icon="loading"}}
<button class="js-install installer" data-app="{{appId}}">
<button class="js-install apps-installer" data-app="{{appId}}">
{{> icon block="installer rc-icon--default-size" icon="circled-arrow-down"}}
</button>
</div>
Expand Down
9 changes: 1 addition & 8 deletions packages/rocketchat_theme/client/imports/components/sidebar/sidebar-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

display: flex;

margin: 0 0.15em;
width: 20px;

font-size: 1rem;

Expand Down Expand Up @@ -155,13 +155,6 @@
font-size: 1rem;
}

&__room-type {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove sidebar-item__room-type from templates too.

display: flex;

font-size: 0.6rem;
fill: currentColor;
}

&__user-thumb {
width: var(--sidebar-item-thumb-size);
height: var(--sidebar-item-thumb-size);
Expand Down