Merge branch 'master' into styling-fixes

2017-03-20 11:32:17 -07:00
parent b6a3310ffc 2aa4aa0dd6
commit 69a0efa0df
19 changed files with 115 additions and 113 deletions
--- a/src/style/_layout.scss
+++ b/src/style/_layout.scss
@@ -286,6 +286,21 @@ body
        @include method($_color-get);
    }

+    &.opblock-patch
+    {
+        @include method($_color-patch);
+    }
+
+    &.opblock-head
+    {
+        @include method($_color-head);
+    }
+
+    &.opblock-options
+    {
+        @include method($_color-options);
+    }
+
    &.opblock-deprecated
    {
        opacity: .6;