diff options
| author | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2024-06-27 09:47:41 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2024-06-27 09:47:41 +0200 |
| commit | f9a54c5e4098ca70c0026f00b1b047d61b5e94ec (patch) | |
| tree | 99259b2c66f168b3a77ebb51fd923fcc320a9fe0 | |
| parent | 39f9804202fc9c0ccd718a934701957706ddc955 (diff) | |
fix broken merge of 39f9804202fc9c0ccd718a934701957706ddc955
| -rw-r--r-- | resources/assets/stylesheets/scss/tooltip.scss | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/resources/assets/stylesheets/scss/tooltip.scss b/resources/assets/stylesheets/scss/tooltip.scss index 0e66a14..42e9f7a 100644 --- a/resources/assets/stylesheets/scss/tooltip.scss +++ b/resources/assets/stylesheets/scss/tooltip.scss @@ -39,7 +39,6 @@ @extend %tooltip; display: none; } -<<<<<<< HEAD &:hover .tooltip-content, &:focus .tooltip-content { @@ -48,16 +47,5 @@ left: 50%; margin-left: -145px; width: 270px; -======= - &:hover, - &:focus { - .tooltip-content { - bottom: 100%; - display: inline-block; - left: 50%; - margin-left: -129px; - width: 230px; - } ->>>>>>> 50371cbb7 (add aria-label to all tooltips and align usage in vue as well, fixes #4330) } } |