diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-19 11:42:40 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-19 11:42:40 -0700 |
| commit | 36658c13a4c7ebdfff22b8570e0db52bfa4de000 (patch) | |
| tree | dc27373b42b8fe2a5f8ae88191924f27c361afb6 /web/sass-files | |
| parent | 097d17bf2c4e07a153beb80afb15a546f291a418 (diff) | |
| parent | d139c9e825d0149329d90684ebe2d6b31a728b16 (diff) | |
| download | chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.gz chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.bz2 chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.zip | |
Fixing merge conflicts
Diffstat (limited to 'web/sass-files')
| -rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 3146c16d5..c4591d7b6 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -291,3 +291,7 @@ .color-btn { margin:4px; } + +.no-resize { + resize:none; +} |