diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
| commit | 299bf056a584dd71cf0285b6ef1bbd596c07c0fe (patch) | |
| tree | c1f32092efa1294c0a75d1e2f23154605ec8d001 /web/sass-files/sass/partials/_sidebar--left.scss | |
| parent | afb09a1b9dd83e480a8c4f5744bd79cafb88a682 (diff) | |
| parent | 4a022752faf9a2b6c4de5cfa65f23adb578a96a5 (diff) | |
| download | chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.gz chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.bz2 chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1696
Conflicts:
web/react/components/setting_upload.jsx
web/react/components/team_import_tab.jsx
Diffstat (limited to 'web/sass-files/sass/partials/_sidebar--left.scss')
| -rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 6d9f2ad8b..7bbaa21cb 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -124,7 +124,15 @@ } .channel-loading-gif { - height:15px; - width:15px; - margin-top:2px; + height: 15px; + width: 15px; + margin-top: 2px; +} + +.join-channel-loading-gif { + margin-top: 5px; + margin-left: 10px; + height: 25px; + width: 25px; + } |