From 6806c589d0983663898b7d87d2c9ceaba6afce49 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Sun, 24 Jun 2018 19:04:28 +0200
Subject: Merging highcontrast themes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/accessibility/css/fonthighcontrast.scss     | 36 -------------------
 apps/accessibility/css/themehighcontrast.scss    | 45 +++++++++++++++++++++++-
 apps/accessibility/lib/AccessibilityProvider.php |  6 ----
 3 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 apps/accessibility/css/fonthighcontrast.scss

(limited to 'apps')

diff --git a/apps/accessibility/css/fonthighcontrast.scss b/apps/accessibility/css/fonthighcontrast.scss
deleted file mode 100644
index 943be42c4b0..00000000000
--- a/apps/accessibility/css/fonthighcontrast.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'),
-		url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-/* overriding default light */
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans'), local('OpenSans'),
-	url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 500;
-	src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
-		url('../../../core/fonts/OpenSans-Semibold.woff') format('woff');
-}
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 700;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'),
-		url('../../../core/fonts/OpenSans-Bold.woff') format('woff');
-}
-
-$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-body {
-	font-weight: 400;
-}
\ No newline at end of file
diff --git a/apps/accessibility/css/themehighcontrast.scss b/apps/accessibility/css/themehighcontrast.scss
index 7929677fbb6..dbb9dee4249 100644
--- a/apps/accessibility/css/themehighcontrast.scss
+++ b/apps/accessibility/css/themehighcontrast.scss
@@ -1,3 +1,36 @@
+// Fonts
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: normal;
+	src: local('Open Sans'), local('OpenSans'),
+		url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
+}
+
+/* overriding default light */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 300;
+	src: local('Open Sans'), local('OpenSans'),
+	url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
+}
+
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 500;
+	src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
+		url('../../../core/fonts/OpenSans-Semibold.woff') format('woff');
+}
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 700;
+	src: local('Open Sans Bold'), local('OpenSans-Bold'),
+		url('../../../core/fonts/OpenSans-Bold.woff') format('woff');
+}
+
 // SCSS variables
 $color-main-text: #000;
 $color-main-background: #fff;
@@ -17,6 +50,16 @@ $color-box-shadow: $color-main-text;
 $color-border: darken($color-main-background, 50%);
 $color-border-dark: darken($color-main-background, 50%);
 
+$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+
+
+// Font weight reset
+body {
+	font-weight: 400;
+}
+
+// Opacity trick
 * {
 	opacity: 1 !important;
-}
\ No newline at end of file
+}
+
diff --git a/apps/accessibility/lib/AccessibilityProvider.php b/apps/accessibility/lib/AccessibilityProvider.php
index 068db7e3997..17d01360edb 100644
--- a/apps/accessibility/lib/AccessibilityProvider.php
+++ b/apps/accessibility/lib/AccessibilityProvider.php
@@ -76,12 +76,6 @@ class AccessibilityProvider {
 				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
 				'title' => $this->l->t('Dyslexia font'),
 				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia. The typeface was created by Abelardo Gonzalez, who released it through an open-source license.')
-			],
-			[
-				'id'    => 'fonthighcontrast',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-highcontrast.jpg'),
-				'title' => $this->l->t('High Contrast font'),
-				'text'  => $this->l->t('Increase the weight of the font to improve the readability.')
 			]
 		);
 	}
-- 
cgit v1.2.3