Merge branch 'develop' into 'scrobbles-age'

# Conflicts:
#   src/i18n/en.json

1 files changed, 24 insertions, 0 deletions

diff --git a/src/components/panel_header.style.js b/src/components/panel_header.style.js
new file mode 100644
index 00000000..32464bc5
--- /dev/null
+++ b/src/components/panel_header.style.js
@@ -0,0 +1,24 @@
+export default {
+  name: 'PanelHeader',
+  selector: '.panel-heading',
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Button',
+    'ButtonUnstyled',
+    'Badge',
+    'Alert',
+    'Avatar'
+  ],
+  defaultRules: [
+    {
+      component: 'PanelHeader',
+      directives: {
+        backgroundNoCssColor: 'yes',
+        background: '--fg',
+        shadow: []
+      }
+    }
+  ]
+}