From d6715f80a1776b0e2822c400d962fe6f4782e3c6 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 15 Dec 2015 21:53:06 +0000
Subject: [PATCH] Revert fix for Hallo toolbar button hover state from #1746 -
fixes #2040
---
CHANGELOG.txt | 1 +
docs/releases/1.3.rst | 1 +
.../wagtailadmin/scss/panels/rich-text.scss | 14 --------------
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 89c08c411f..e15d4a534e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -35,6 +35,7 @@ Changelog
* Fix: Changed verbose names to start with lower case where necessary (Maris Serzans)
* Fix: Invalid images no longer crash the image listing (Maris Serzans)
* Fix: `MenuItem` `url` parameter can now take a lazy URL (Adon Metcalfe, rayrayndwiga)
+ * Fix: Restored correct highlighting behaviour of rich text toolbar buttons
1.2 (12.11.2015)
~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.3.rst b/docs/releases/1.3.rst
index b181af5684..022d25ac0c 100644
--- a/docs/releases/1.3.rst
+++ b/docs/releases/1.3.rst
@@ -86,6 +86,7 @@ Bug fixes
* Invalid images no longer crash the image listing (Maris Serzans)
* ``MenuItem`` ``url`` parameter can now take a lazy URL (Adon Metcalfe, rayrayndwiga)
* Added missing translation tag to InlinePanel 'Add' button (jnns)
+ * Restored correct highlighting behaviour of rich text toolbar buttons
Upgrade considerations
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss
index 06b357af6c..89b445c091 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss
@@ -30,22 +30,8 @@
}
.hallotoolbar button {
- // Some of this is copied from the jQuery UI style, forcing those styles to apply to
- // this selector. Without it, if your cursor is placed above a button while it's
- // appearing, the CSS from jQuery UI won't immediately be applied.
border-radius: 0;
height: 2.4em;
- border: 1px solid $color-grey-3;
- background: $color-white;
- font-weight: normal;
- color: $color-grey-1-1;
-
- &:hover {
- border: 1px solid $color-teal;
- background: $color-teal;
- font-weight: normal;
- color: $color-white;
- }
}
.richtext {