Merge branch 'develop' into bwindels/stylepreviewbar

res/css/_common.scss

@@ -36,6 +36,12 @@ body {
     color: $warning-color;
 }
 
+b {
+    // On Firefox, the default weight for `<b>` is `bolder` which results in no bold
+    // effect since we only have specific weights of our fonts available.
+    font-weight: bold;
+}
+
 h2 {
     color: $primary-fg-color;
     font-weight: 400;

res/css/_components.scss

@@ -6,6 +6,7 @@
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
+@import "./structures/_GenericErrorPage.scss";
 @import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";

res/css/structures/_GenericErrorPage.scss

@@ -0,0 +1,19 @@
+.mx_GenericErrorPage {
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+}
+
+.mx_GenericErrorPage_box {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 500px;
+    height: 200px;
+    border: 1px solid #f22;
+    padding: 10px;
+    background-color: #fcc;
+}

res/css/views/settings/tabs/_SettingsTab.scss

@@ -72,3 +72,7 @@ limitations under the License.
     // give them more visual distinction between the sections.
     margin-top: 30px;
 }
+
+.mx_SettingsTab a {
+    color: $accent-color-alt;
+}