11 files changed, 123 insertions, 25 deletions
diff --git a/src/components/fun_text.style.js b/src/components/fun_text.style.js
new file mode 100644
index 00000000..2d3ac154
--- /dev/null
+++ b/src/components/fun_text.style.js
@@ -0,0 +1,40 @@
+export default {
+  name: 'FunText',
+  selector: '/*fun-text*/',
+  virtual: true,
+  variants: {
+    greentext: '.greentext',
+    cyantext: '.cyantext'
+  },
+  states: {
+    faint: '.faint'
+  },
+  defaultRules: [
+    {
+      directives: {
+        textColor: '--text',
+        textAuto: 'preserve'
+      }
+    },
+    {
+      state: ['faint'],
+      directives: {
+        textOpacity: 0.5
+      }
+    },
+    {
+      variant: 'greentext',
+      directives: {
+        textColor: '--cGreen',
+        textAuto: 'preserve'
+      }
+    },
+    {
+      variant: 'cyantext',
+      directives: {
+        textColor: '--cBlue',
+        textAuto: 'preserve'
+      }
+    }
+  ]
+}
diff --git a/src/components/notification.style.js b/src/components/notification.style.js
new file mode 100644
index 00000000..057b1c7a
--- /dev/null
+++ b/src/components/notification.style.js
@@ -0,0 +1,21 @@
+export default {
+  name: 'Notification',
+  selector: '.Notification',
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Border',
+    'Button',
+    'ButtonUnstyled',
+    'RichContent',
+    'Input'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        background: '--bg'
+      }
+    }
+  ]
+}
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index 654aca3c..86d3e31d 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -3,8 +3,7 @@
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
   border-bottom: 1px solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
+  border-color: var(--border);
   word-wrap: break-word;
   word-break: break-word;
 
diff --git a/src/components/panel.style.js b/src/components/panel.style.js
index ce9812a6..1e8039c6 100644
--- a/src/components/panel.style.js
+++ b/src/components/panel.style.js
@@ -9,7 +9,9 @@ export default {
     'ButtonUnstyled',
     'Input',
     'PanelHeader',
-    'MenuItem'
+    'MenuItem',
+    'Post',
+    'Notification'
   ],
   defaultRules: [
     {
diff --git a/src/components/popover.style.js b/src/components/popover.style.js
index a3a554fd..6a121cae 100644
--- a/src/components/popover.style.js
+++ b/src/components/popover.style.js
@@ -13,7 +13,8 @@ export default {
     'ButtonUnstyled',
     'Input',
     'PanelHeader',
-    'MenuItem'
+    'MenuItem',
+    'Post'
   ],
   defaultRules: [
     {
diff --git a/src/components/post.style.js b/src/components/post.style.js
new file mode 100644
index 00000000..92ec230a
--- /dev/null
+++ b/src/components/post.style.js
@@ -0,0 +1,21 @@
+export default {
+  name: 'Post',
+  selector: '.Status',
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Border',
+    'Button',
+    'ButtonUnstyled',
+    'RichContent',
+    'Input'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        background: '--bg'
+      }
+    }
+  ]
+}
diff --git a/src/components/rich_content.style.js b/src/components/rich_content.style.js
new file mode 100644
index 00000000..aaf126a5
--- /dev/null
+++ b/src/components/rich_content.style.js
@@ -0,0 +1,17 @@
+export default {
+  name: 'RichContent',
+  selector: '.RichContent',
+  validInnerComponents: [
+    'Text',
+    'FunText',
+    'Link'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        background: '--bg',
+        textNoCssColor: 'yes'
+      }
+    }
+  ]
+}
diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index e5d353ac..3bb5b16b 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -65,4 +65,12 @@
     vertical-align: middle;
     object-fit: contain;
   }
+
+  .greentext {
+    color: var(--funtextGreentext);
+  }
+
+  .cyantext {
+    color: var(--funtextCyantext);
+  }
 }
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index a8878745..930ed803 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -112,14 +112,6 @@
     }
   }
 
-  .greentext {
-    color: var(--textGreentext);
-  }
-
-  .cyantext {
-    color: var(--textCyantext);
-  }
-
   &.-compact {
     align-items: top;
     flex-direction: row;
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index e977d489..a9db6b12 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -62,5 +62,15 @@
 .StatusContent {
   flex: 1;
   min-width: 0;
+
+  &.faint {
+    .greentext {
+      color: var(--funtextGreentextFaint);
+    }
+
+    .cyantext {
+      color: var(--funtextCyantextFaint);
+    }
+  }
 }
 </style>
diff --git a/src/components/text.style.js b/src/components/text.style.js
index 905dbbee..a254ceb4 100644
--- a/src/components/text.style.js
+++ b/src/components/text.style.js
@@ -2,34 +2,21 @@ export default {
   name: 'Text',
   selector: '/*text*/',
   virtual: true,
-  variants: {
-    greentext: '.greentext'
-  },
   states: {
     faint: '.faint'
   },
   defaultRules: [
     {
-      component: 'Text',
       directives: {
         textColor: '--text',
         textAuto: 'no-preserve'
       }
     },
     {
-      component: 'Text',
       state: ['faint'],
       directives: {
         textOpacity: 0.5
       }
-    },
-    {
-      component: 'Text',
-      variant: 'greentext',
-      directives: {
-        textColor: '--cGreen',
-        textAuto: 'preserve'
-      }
     }
   ]
 }