diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
| commit | 8d9449c068902f51a97e7a6605cd226bf4a26f2e (patch) | |
| tree | eade41f7f9138de4f156016af9476486c227abec /web/sass-files/sass/styles.scss | |
| parent | c277a98b5d88c81df39f8e33ef1286f72ac04014 (diff) | |
| parent | a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2 (diff) | |
| download | chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.gz chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.bz2 chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.zip | |
Merge branch 'master' into mm-1420
Diffstat (limited to 'web/sass-files/sass/styles.scss')
| -rw-r--r-- | web/sass-files/sass/styles.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index 294f6122a..ffd1f42b8 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -29,7 +29,9 @@ @import "partials/settings"; @import "partials/modal"; @import "partials/mentions"; +@import "partials/command-box"; @import "partials/error"; +@import "partials/error-bar"; @import "partials/loading"; // Responsive Css |