diff options
author | Jack <jackdeng@gmail.com> | 2015-09-28 08:14:57 -0700 |
---|---|---|
committer | Jack <jackdeng@gmail.com> | 2015-09-28 08:14:57 -0700 |
commit | 503501ab3b616fb9fa57b046df850cfc2db734f8 (patch) | |
tree | 43e529250bab982c73816f1ffdf673e8e4b98c13 /web/sass-files/sass/partials/_modal.scss | |
parent | aa6da728baf2f5642293d8b56ebc1ff4e8682bce (diff) | |
parent | a055fd10b83b28bf97877e4e28a2275f74a71a4a (diff) | |
download | chat-503501ab3b616fb9fa57b046df850cfc2db734f8.tar.gz chat-503501ab3b616fb9fa57b046df850cfc2db734f8.tar.bz2 chat-503501ab3b616fb9fa57b046df850cfc2db734f8.zip |
rebase
Diffstat (limited to 'web/sass-files/sass/partials/_modal.scss')
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 38e9b4174..e4e8b20b6 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -3,6 +3,7 @@ } .modal { width: 100%; + color: #333; &.image_modal { .modal-backdrop.in { @include opacity(0.7); @@ -10,12 +11,26 @@ } a, a:focus, a:hover { color: #2389D7; + &.text-danger { + color: #a94442; + } } - .btn.btn-primary { - background: #4285f4; - &:hover, &:focus, &:active { - background: $primary-color--hover; - color: #fff; + .custom-textarea { + color: inherit; + border-color: #ccc; + &:focus { + border-color: #ccc; + box-shadow: none; + } + } + .btn { + font-size: 13px; + &.btn-primary { + background: #4285f4; + &:hover, &:focus, &:active { + background: $primary-color--hover; + color: #fff; + } } } .info__label { @@ -181,16 +196,13 @@ position: relative; max-width: 90%; min-height: 100px; - min-width: 320px; + min-width: 240px; @include border-radius(3px); display: table; margin: 0 auto; &:hover { @include border-radius(3px 3px 0 0); } - &:hover .modal-close { - @include opacity(1); - } &.default { width: 100%; height: 80%; @@ -204,8 +216,15 @@ right: -13px; top: -13px; @include opacity(0); + -webkit-transition: opacity 0.6s; + -moz-transition: opacity 0.6s; + -o-transition: opacity 0.6s; + transition: opacity 0.6s; cursor: pointer; z-index: 9999; + &.modal-close--show { + @include opacity(1); + } } > a { background: #FFF; @@ -217,7 +236,7 @@ max-height: 100%; } } - .image-content { + .modal-content{ box-shadow: none; background: rgba(0, 0, 0, 0); width: 100%; @@ -301,6 +320,7 @@ } } + // Invite New Member .invite { margin-right: 40px; @@ -315,4 +335,4 @@ padding-left: 0; } } -}
\ No newline at end of file +} |