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

Regression: Remove safe area margins from logos #11508

Merged
merged 3 commits into from
Jul 19, 2018
Merged

Regression: Remove safe area margins from logos #11508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4c021
[FIX] Logs safe area
brunosquadros Jul 19, 2018
5b9fbc6
Remove Copy title
sampaiodiego Jul 19, 2018
9910904
Fix logo spaces and sizes
sampaiodiego Jul 19, 2018
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
4 changes: 1 addition & 3 deletions packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,11 @@
-webkit-user-drag: none;
}

&__footer {
&__footer:not(:empty) {
width: auto;
height: var(--sidebar-footer-height);
padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding);

text-align: center;

& img {
max-width: 100%;
height: 100%;
Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4634,7 +4634,6 @@ body:not(.is-cordova) {

max-width: 100%;
max-height: 150px;
padding: 10px;
}
}

Expand All @@ -4652,6 +4651,9 @@ body:not(.is-cordova) {
& header {
position: relative;
z-index: 1;
width: 520px;
padding: 0 20px;
margin: auto;

display: block;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-theme/client/imports/general/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
--sidebar-default-padding: 24px;
--sidebar-small-default-padding: 16px;
--sidebar-extra-small-default-padding: 12px;
--sidebar-footer-height: 70px;
--sidebar-footer-height: 48px;
--sidebar-small-header-padding: var(--sidebar-small-default-padding);

/*
Expand Down
4 changes: 1 addition & 3 deletions packages/rocketchat-ui-sidenav/client/sideNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
</div>
{{/if}}

<footer class="sidebar__footer">
{{{footer}}}
</footer>
<footer class="sidebar__footer">{{{footer}}}</footer>
</aside>
<div class="sidebar-wrap"></div>
</template>
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-sidenav/client/sideNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Template.sideNav.helpers({
},

footer() {
return RocketChat.settings.get('Layout_Sidenav_Footer');
return String(RocketChat.settings.get('Layout_Sidenav_Footer')).trim();
},

roomType() {
Expand Down
Binary file modified public/images/logo/512x512.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/logo/512x512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 7 additions & 9 deletions public/images/logo/icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading