diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
| commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
| tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /web/sass-files | |
| parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
| parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
| download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip | |
fix conflict
Diffstat (limited to 'web/sass-files')
| -rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 6 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index 268576a98..c8b08f44d 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -5,9 +5,10 @@ .form__label { text-align: left; padding-right: 3px; - font-weight: bold; + font-weight: 600; font-size: 1.1em; &.light { + font-weight: normal; color: #999; font-size: 1.05em; font-style: italic; @@ -17,6 +18,9 @@ .input__help { color: #777; margin: 10px 0 0 10px; + &.dark { + color: #222; + } &.error { color: #a94442; } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index f714a23f8..94583b153 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -11,7 +11,7 @@ padding-top: 44px; } .dropdown-menu { - max-height: 300px; + max-height: 400px; overflow-x: hidden; overflow-y: auto; max-width: 200px; |