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

[NEW] Create a standard for our svg icons #7853

Merged
merged 6 commits into from
Aug 24, 2017
+103 −275
Merged

[NEW] Create a standard for our svg icons #7853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56a3c77
added new svg sprite
karlprieb Aug 23, 2017
eaa46de
fix svg icons
karlprieb Aug 23, 2017
b1388cf
fix white bar on top
karlprieb Aug 23, 2017
4586327
normalize sprite
karlprieb Aug 23, 2017
6931e7d
Merge branch 'develop' into fix-svg-sprite
karlprieb Aug 23, 2017
4a12a34
fix keyboard icon
karlprieb Aug 24, 2017
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 packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<header class="sidebar__header">
{{> accountBox lighten=true modifier="--livechat"}}
<button class="sidebar-flex__back-button" data-action="back">
{{> icon block="sidebar-flex__back-icon" icon="arrow-back"}}
{{> icon block="sidebar-flex__back-icon" icon="back"}}
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
Expand Down
37 changes: 5 additions & 32 deletions packages/rocketchat-theme/client/imports/components/message-box.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,39 +42,8 @@
}

&-icon {
width: 12px;
height: 12px;

font-size: 1rem;
fill: currentColor;
stroke: currentColor;

&--bold {
width: 8px;
height: 10px;
stroke: none;
}

&--italic {
width: 2px;
height: 10px;
stroke: none;
}

&--code {
width: 16px;
height: 12px;
}

&--strike {
width: 12px;
height: 11px;
stroke: none;
}

&--multi-line {
width: 13px;
height: 11px;
}
}
}

Expand Down Expand Up @@ -151,6 +120,10 @@
align-items: center;
justify-content: center;

& .rc-input__icon-svg {
font-size: 1.4rem;
}

& .rc-input__icon-svg--plus {
transition: transform 0.2s linear;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-theme/client/imports/components/modal/create-channel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
& .rc-switch {
width: 50%;
}

& .rc-input__icon-svg {
font-size: 1.2rem;
}
}

@keyframes fadeIn {
Expand Down
51 changes: 3 additions & 48 deletions packages/rocketchat-theme/client/imports/components/popover.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,59 +88,14 @@
&__icon {
display: flex;

width: 16px;
margin: 0.25rem 0.25rem 0.25rem 0;
width: 20px;
margin: 0.25rem 0 0.25rem;
align-items: center;
justify-content: center;
}

&__icon-element {
stroke: currentColor;

&--customize {
width: 14px;
height: 14px;
}

&--comment-alt {
width: 16px;
height: 14px;
}

&--user {
width: 18px;
height: 17px;
}

&--sign-out {
width: 14px;
height: 14px;
}

&--video {
width: 17px;
height: 13px;
}

&--audio {
width: 16px;
height: 14px;
}

&--computer {
width: 16px;
height: 14px;
}

&--map-pin {
width: 12px;
height: 16px;
}

&--livechat {
width: 15px;
height: 15px;
}
font-size: 18px;
}

&__item-text {
Expand Down
5 changes: 2 additions & 3 deletions packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
}

&-label {
padding: 10px;
padding: 5px 0;

cursor: pointer;

Expand All @@ -104,8 +104,7 @@
}

&-menu {
width: 3px;
height: 16px;
font-size: 1.375rem;

fill: var(--sidebar-account-username-color);

Expand Down
4 changes: 1 addition & 3 deletions packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
}

&__back-icon {
width: 18px;
height: 14px;
stroke: currentColor;
font-size: 1.25rem;
}

&__search {
Expand Down
46 changes: 2 additions & 44 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 @@ -53,50 +53,8 @@

&__icon {
margin: 0 auto;
stroke: currentColor;

&--hashtag {
width: 14px;
height: 14px;
}

&--lock {
width: 12px;
height: 18px;
}

&--customize {
width: 14px;
height: 14px;
}

&--user {
width: 18px;
height: 17px;
}

&--user-rounded {
width: 18px;
height: 18px;
}

&--comment-alt {
width: 16px;
height: 14px;
fill: currentColor;
}

&--livechat {
width: 15px;
height: 15px;
fill: currentColor;
}

&--queue {
width: 15px;
height: 15px;
fill: currentColor;
}
font-size: 1.25rem;
fill: currentColor;
}

&__user-thumb {
Expand Down
15 changes: 10 additions & 5 deletions packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
}

&__icon {
width: 13px;
height: 13px;
stroke: currentColor;
&--plus {
font-size: 1.25rem;
}
}

& .rc-input {
Expand Down Expand Up @@ -67,6 +67,11 @@
& + .rc-input__element {
padding: 0.5rem 1rem 0.5rem 2.25rem;
}

&-svg--plus {
font-size: 1rem;
transform: rotate(45deg);
}
}
}

Expand All @@ -78,7 +83,7 @@
background-color: var(--color-darkest);
}

& .rc-button--square {
padding: 10px;
& .rc-input__icon-svg--magnifier {
font-size: 1rem;
}
}
41 changes: 0 additions & 41 deletions packages/rocketchat-theme/client/imports/forms/input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,47 +47,6 @@
}
}

&__icon-svg {
stroke: currentColor;

&--at,
&--plus,
&--hashtag {
width: 14px;
height: 14px;
}

&--smile {
width: 18px;
height: 18px;
}

&--send {
width: 18px;
height: 18px;
}

&--lock {
width: 12px;
height: 18px;
}

&--user {
width: 12px;
height: 13px;
}

&--magnifier {
width: 13px;
height: 13px;
}

&--cross {
width: 10px;
height: 10px;
}
}

&__element {
width: 100%;
padding: 0.75rem 1rem;
Expand Down
56 changes: 12 additions & 44 deletions packages/rocketchat-theme/client/imports/general/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,49 +88,17 @@ button {
}

& .tab-button-icon {
width: 14px;
height: 14px;
stroke: currentColor;

&--info-circled {
fill: currentColor;
stroke: none;
}

&--bell {
width: 16px;
height: 14px;

fill: currentColor;
stroke: none;
}

&--team {
width: 16px;
height: 16px;
}

&--clip {
width: 16px;
height: 16px;
}

&--star {
width: 17px;
height: 16px;
}

&--language {
width: 16px;
height: 16px;

fill: currentColor;
stroke: none;
}

&--hubot {
width: 14px;
height: 16px;
}
font-size: 1.125rem;
color: var(--color-dark-medium);
fill: var(--color-dark-medium);
}
}

.rc-icon {
width: 1em;
height: 1em;

vertical-align: -0.15em;

overflow: hidden;
}
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-account/client/accountFlex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<header class="sidebar__header">
{{> accountBox lighten=true modifier="--account" }}
<button class="sidebar-flex__back-button" data-action="back">
{{> icon block="sidebar-flex__back-icon" icon="arrow-back"}}
{{> icon block="sidebar-flex__back-icon" icon="back"}}
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-admin/client/adminFlex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<header class="sidebar__header">
{{> accountBox lighten=true modifier="--admin"}}
<button class="sidebar-flex__back-button" data-action="back">
{{> icon block="sidebar-flex__back-icon" icon="arrow-back"}}
{{> icon block="sidebar-flex__back-icon" icon="back"}}
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
Expand Down
Loading