diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-16 09:48:20 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-16 09:48:20 -0400 |
commit | b236079d936e7f7af648b362d11b491fc0a2c428 (patch) | |
tree | c82021843497aa025414960dccc03c6a41fc4327 /web/sass-files | |
parent | 3e31a9383d46b2c18efec893f779e8046ad1d828 (diff) | |
parent | 6e5126ba1d273e9576923a65d5b614314970f99f (diff) | |
download | chat-b236079d936e7f7af648b362d11b491fc0a2c428.tar.gz chat-b236079d936e7f7af648b362d11b491fc0a2c428.tar.bz2 chat-b236079d936e7f7af648b362d11b491fc0a2c428.zip |
Merge pull request #175 from ralder/fix-dispatchError
[webui] fix incorrect call for AsyncClient.dispatchError
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_variables.scss | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index fd6225bdd..8f4ff7b60 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -126,6 +126,10 @@ div.theme { to { transform: scale(1) rotate(360deg);} } +.glyphicon-refresh-animate { + @include animation(spin .7s infinite linear); +} + .black-bg { background-color: black !important; } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 9c0c09ee3..e01739240 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -436,10 +436,9 @@ .form-control { background: none; color: #fff; - border-bottom: 1px solid #fff; border-bottom: 1px solid rgba(#fff, 0.7); border-radius: 0; - padding: 0 0 0 23px; + padding: 0 10px 0 23px; } ::-webkit-input-placeholder { color: #fff; @@ -534,6 +533,11 @@ .sidebar--right__close { display: none; } + .search__form { + .glyphicon { + color: #fff; + } + } } .inner__wrap { &.move--right { diff --git a/web/sass-files/sass/partials/_variables.scss b/web/sass-files/sass/partials/_variables.scss index eb1f3eef3..5d883ab44 100644 --- a/web/sass-files/sass/partials/_variables.scss +++ b/web/sass-files/sass/partials/_variables.scss @@ -7,10 +7,4 @@ $primary-color: #2389D7; $primary-color--hover: darken(#2389D7, 5%); $body-bg: #e9e9e9; $header-bg: #f9f9f9; -$border-gray: 1px solid #ddd; - -// Animation -.glyphicon-refresh-animate { - -animation: spin .7s infinite linear; - -webkit-animation: spin2 .7s infinite linear; -}
\ No newline at end of file +$border-gray: 1px solid #ddd;
\ No newline at end of file |