diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-29 15:34:21 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-29 15:34:21 -0400 |
| commit | 942702ff1a6cc3763742ea9fec6ecc587d998411 (patch) | |
| tree | 1e39df01979b0d3086fc627e55a1de1c17ec7c5d /web/sass-files/sass/partials | |
| parent | 2d5b2841862e3b932881cc6d087f7dbadcc0cfb8 (diff) | |
| parent | 9c3feff5bcf6478eae29f80d407cbcd1da6ec474 (diff) | |
| download | chat-942702ff1a6cc3763742ea9fec6ecc587d998411.tar.gz chat-942702ff1a6cc3763742ea9fec6ecc587d998411.tar.bz2 chat-942702ff1a6cc3763742ea9fec6ecc587d998411.zip | |
Merge release branch 'release-1.0.0'
Diffstat (limited to 'web/sass-files/sass/partials')
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_search.scss | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index d29c653ff..9e8d0dc7d 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -553,13 +553,7 @@ padding: 0 10px 0 31px; background: rgba(black, 0.2); @include border-radius(3px); - color: #fff; - } - input[type=text] { - @include input-placeholder { - color: #fff; - color: rgba(#fff, 0.5); - } + color: inherit; } } } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 9abdd40da..bcb8b5eac 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -32,8 +32,7 @@ top: 15px; margin-left: 10px; font-size: 14px; - color: #fff; - color: rgba(#fff, 0.5); + @include opacity(0.5); display: none; } .search__form { |