diff options
| author | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-04-28 17:31:27 -0400 |
|---|---|---|
| committer | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-04-28 17:31:27 -0400 |
| commit | 813ac366831c95f3fa11e01b9588cf18cbe466bc (patch) | |
| tree | 24a98e427543ff57c9396918ff12ae1cf81a5a92 /src/client/views/nodes/ImageBox.scss | |
| parent | f8503355ff82930e640369637c33d989fd7eaff3 (diff) | |
| parent | 22fe2791b6a6e92cc4d0ad953363120b51bd6e2c (diff) | |
Handle merge conflicts with jenny work
Diffstat (limited to 'src/client/views/nodes/ImageBox.scss')
| -rw-r--r-- | src/client/views/nodes/ImageBox.scss | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/client/views/nodes/ImageBox.scss b/src/client/views/nodes/ImageBox.scss index 4238f6d29..cd2b23f02 100644 --- a/src/client/views/nodes/ImageBox.scss +++ b/src/client/views/nodes/ImageBox.scss @@ -103,7 +103,7 @@ display: flex; height: 100%; - .imageBox-fadeBlocker { + .imageBox-fadeBlocker, .imageBox-fadeBlocker-hover{ width: 100%; height: 100%; position: absolute; @@ -133,12 +133,10 @@ transition: opacity 1s ease-in-out; } -.imageBox:hover { - .imageBox-fadeBlocker { - -webkit-transition: opacity 1s ease-in-out; - -moz-transition: opacity 1s ease-in-out; - -o-transition: opacity 1s ease-in-out; - transition: opacity 1s ease-in-out; - opacity: 0; - } +.imageBox-fadeBlocker-hover { + -webkit-transition: opacity 1s ease-in-out; + -moz-transition: opacity 1s ease-in-out; + -o-transition: opacity 1s ease-in-out; + transition: opacity 1s ease-in-out; + opacity: 0; }
\ No newline at end of file |