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] Token Controlled Access channels #8060

Merged
merged 10 commits into from
Dec 4, 2017
Merged

[NEW] Token Controlled Access channels #8060

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2aa247a
Add token controlled access channels
lindoelio Aug 24, 2017
298e3a6
Merge branch 'develop' into token-controlled-access-channels
sampaiodiego Oct 16, 2017
62c1fff
Merge branch 'develop' into token-controlled-access-channels
lindoelio Oct 23, 2017
45e5c45
Add default-padding CSS variable
sampaiodiego Oct 23, 2017
25c3cf9
Fix channel settings
sampaiodiego Oct 23, 2017
fe2d094
Add tokenpass art in channel title bar
lindoelio Oct 24, 2017
77f9fc0
remove full modal scroll fix
karlprieb Oct 25, 2017
1ce8cac
Merge pull request #8626 from RocketChat/tokenpass-channel-art
lindoelio Nov 20, 2017
d075a02
Merge branch 'develop' into token-controlled-access-channels
sampaiodiego Nov 20, 2017
2ca63d2
Fix underscore and underscore.string imports
sampaiodiego Nov 20, 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
Prev Previous commit
Next Next commit
Add default-padding CSS variable
  • Loading branch information
@sampaiodiego
sampaiodiego authored Oct 23, 2017
commit 45e5c45b20c5a02e28cf5f0ae5cba4ea600fe9a2
1 change: 1 addition & 0 deletions 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 @@ -50,6 +50,7 @@
--status-busy: var(--rc-color-error);
--status-invisible: var(--color-gray-medium);
--status-invisible-sidebar: var(--rc-color-primary-darkest);
--default-padding: 1.5rem;
--default-small-padding: 1rem;

/*
Expand Down