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

Jump to bottom

[NEW] New sidebar layout #9608

Merged
merged 37 commits into from
Feb 21, 2018
Merged

[NEW] New sidebar layout #9608

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d782ce6
new sidebar header
karlprieb Jan 30, 2018
ab5a59b
fix sidebarHeader template
karlprieb Jan 30, 2018
ac43d75
fix set state
karlprieb Jan 30, 2018
b5e9c9c
Fix saveUserPreferences method
karlprieb Jan 31, 2018
b52402d
sort ;ist
ggazzo Feb 1, 2018
07226e2
sidenav viewmode
karlprieb Feb 1, 2018
5d879e5
migration sort sidenav
ggazzo Feb 5, 2018
2be7a45
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
ggazzo Feb 5, 2018
fd36bc1
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new-…
karlprieb Feb 5, 2018
5f605af
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
karlprieb Feb 5, 2018
3680fa8
sidebar views
karlprieb Feb 5, 2018
66790b3
new icons
karlprieb Feb 5, 2018
b3b3ac3
change sidenav preferences to sidebar preferences
karlprieb Feb 6, 2018
0b80897
translations and big emoji
ggazzo Feb 6, 2018
d6c5381
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
ggazzo Feb 6, 2018
831634e
search
karlprieb Feb 6, 2018
92858c9
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
karlprieb Feb 6, 2018
2863e58
star icon
karlprieb Feb 6, 2018
f87af93
fix tests
karlprieb Feb 7, 2018
8239f0c
fix tests
karlprieb Feb 7, 2018
905219c
fix user preferences/admin sidebar item icons
karlprieb Feb 7, 2018
ab11cd2
remove tooltip on click sidebarheader
ggazzo Feb 7, 2018
1b7e3bb
Merge branch 'develop' into new-sidebar
engelgabriel Feb 8, 2018
77698da
Merge branch 'develop' into new-sidebar
karlprieb Feb 16, 2018
1ca598a
new merged icon
karlprieb Feb 16, 2018
a520e90
remove comments and logs
karlprieb Feb 19, 2018
4a69d6e
try to fix isRtl
karlprieb Feb 19, 2018
ea6c7a1
Merge branch 'develop' into new-sidebar
karlprieb Feb 19, 2018
8fdb51e
Merge branch 'develop' into new-sidebar
engelgabriel Feb 20, 2018
6c35a9f
fix icon sizes
engelgabriel Feb 20, 2018
94efe9a
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
engelgabriel Feb 20, 2018
66e5626
Fix typo
engelgabriel Feb 20, 2018
01a9123
reverting @engelgabriel commits
karlprieb Feb 20, 2018
3fa23bb
Merge branch 'develop' into new-sidebar
karlprieb Feb 20, 2018
643ba1d
fix all diego's problems
karlprieb Feb 20, 2018
8de37ff
Fix icon sizes
engelgabriel Feb 20, 2018
7afb66e
update Merge_Channels name
karlprieb Feb 20, 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
2 changes: 1 addition & 1 deletion packages/rocketchat-theme/client/imports/components/header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
cursor: pointer;
transition: all 0.3s;

font-size: 24px;
font-size: 18px;
align-items: center;

&.active,
Expand Down
4 changes: 1 addition & 3 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 @@ -142,7 +142,7 @@
width: var(--sidebar-item-user-status-size);
height: var(--sidebar-item-user-status-size);

margin: 0 7px 0 3px;
margin: 0 7px 0 7px;
Copy link
Member Author

Choose a reason for hiding this comment

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

margin: 0 7px;


border-radius: var(--sidebar-item-user-status-radius);

Expand Down Expand Up @@ -210,8 +210,6 @@

flex: 1;

margin: 0 3px;

white-space: nowrap;
text-overflow: ellipsis;

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -118,7 +118,7 @@ button {
.rc-icon {
overflow: hidden;

width: 1em;
width: 1.25em;
Copy link
Member Author

@ggazzo ggazzo Feb 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

?? width and height should be equal

height: 1em;

vertical-align: -0.15em;
Expand Down