diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
tree | 44962a914b86cf66a1da49300f12986db49f010e /web/sass-files/sass/styles.scss | |
parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip |
Fixing merge
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 de1db57e8..e704536a8 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -10,6 +10,7 @@ @import "partials/perfect-scrollbar"; @import "partials/font-awesome"; @import "partials/base"; +@import "partials/colorpicker"; // Channel Css @import "partials/headers"; @@ -36,6 +37,7 @@ @import "partials/error-bar"; @import "partials/loading"; @import "partials/get-link"; +@import "partials/markdown"; // Responsive Css @import "partials/responsive"; |