From 49d071444eb3948bbedfbad5ad3f42282b6d2556 Mon Sep 17 00:00:00 2001 From: Andrew Rylatt Date: Fri, 20 May 2016 14:01:21 +0100 Subject: [PATCH 1/2] Update material theme font URLs to be '//' instead of 'http://' --- src/themes/material/collections/menu.overrides | 2 +- src/themes/material/elements/button.overrides | 2 +- src/themes/material/elements/header.overrides | 2 +- src/themes/material/modules/dropdown.overrides | 2 +- src/themes/material/modules/modal.overrides | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/themes/material/collections/menu.overrides b/src/themes/material/collections/menu.overrides index 8eea17f98..f9b2bfd23 100644 --- a/src/themes/material/collections/menu.overrides +++ b/src/themes/material/collections/menu.overrides @@ -1 +1 @@ -@import url(http://fonts.googleapis.com/css?family=Roboto); +@import url(//fonts.googleapis.com/css?family=Roboto); diff --git a/src/themes/material/elements/button.overrides b/src/themes/material/elements/button.overrides index 751266a08..58a7a008c 100644 --- a/src/themes/material/elements/button.overrides +++ b/src/themes/material/elements/button.overrides @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Roboto); +@import url(//fonts.googleapis.com/css?family=Roboto); .ui.primary.button:hover { box-shadow: diff --git a/src/themes/material/elements/header.overrides b/src/themes/material/elements/header.overrides index 7278edcb6..524caeab5 100644 --- a/src/themes/material/elements/header.overrides +++ b/src/themes/material/elements/header.overrides @@ -2,7 +2,7 @@ Overrides *******************************/ -@import url(http://fonts.googleapis.com/css?family=Roboto); +@import url(//fonts.googleapis.com/css?family=Roboto); h1.ui.header, .ui.huge.header { diff --git a/src/themes/material/modules/dropdown.overrides b/src/themes/material/modules/dropdown.overrides index 40fcd920e..b09d08852 100644 --- a/src/themes/material/modules/dropdown.overrides +++ b/src/themes/material/modules/dropdown.overrides @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Roboto:400,700); +@import url(//fonts.googleapis.com/css?family=Roboto:400,700); .ui.dropdown { font-family: 'Roboto'; diff --git a/src/themes/material/modules/modal.overrides b/src/themes/material/modules/modal.overrides index 6b9b94738..f381f995d 100644 --- a/src/themes/material/modules/modal.overrides +++ b/src/themes/material/modules/modal.overrides @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Roboto); +@import url(//fonts.googleapis.com/css?family=Roboto); .ui.modal .header { font-family: "Roboto", Arial, Sans-serif !important; From 200613183c6597682e87c91253b6559099529b79 Mon Sep 17 00:00:00 2001 From: Andrew Rylatt Date: Tue, 31 May 2016 21:06:08 +0100 Subject: [PATCH 2/2] Force HTTPS URLs --- src/themes/material/collections/menu.overrides | 2 +- src/themes/material/elements/button.overrides | 2 +- src/themes/material/elements/header.overrides | 2 +- src/themes/material/modules/dropdown.overrides | 2 +- src/themes/material/modules/modal.overrides | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/themes/material/collections/menu.overrides b/src/themes/material/collections/menu.overrides index f9b2bfd23..fef5b1ff5 100644 --- a/src/themes/material/collections/menu.overrides +++ b/src/themes/material/collections/menu.overrides @@ -1 +1 @@ -@import url(//fonts.googleapis.com/css?family=Roboto); +@import url(https://fonts.googleapis.com/css?family=Roboto); diff --git a/src/themes/material/elements/button.overrides b/src/themes/material/elements/button.overrides index 58a7a008c..87ad6c210 100644 --- a/src/themes/material/elements/button.overrides +++ b/src/themes/material/elements/button.overrides @@ -1,4 +1,4 @@ -@import url(//fonts.googleapis.com/css?family=Roboto); +@import url(https://fonts.googleapis.com/css?family=Roboto); .ui.primary.button:hover { box-shadow: diff --git a/src/themes/material/elements/header.overrides b/src/themes/material/elements/header.overrides index 524caeab5..16a5928f4 100644 --- a/src/themes/material/elements/header.overrides +++ b/src/themes/material/elements/header.overrides @@ -2,7 +2,7 @@ Overrides *******************************/ -@import url(//fonts.googleapis.com/css?family=Roboto); +@import url(https://fonts.googleapis.com/css?family=Roboto); h1.ui.header, .ui.huge.header { diff --git a/src/themes/material/modules/dropdown.overrides b/src/themes/material/modules/dropdown.overrides index b09d08852..f34b44dc7 100644 --- a/src/themes/material/modules/dropdown.overrides +++ b/src/themes/material/modules/dropdown.overrides @@ -1,4 +1,4 @@ -@import url(//fonts.googleapis.com/css?family=Roboto:400,700); +@import url(https://fonts.googleapis.com/css?family=Roboto:400,700); .ui.dropdown { font-family: 'Roboto'; diff --git a/src/themes/material/modules/modal.overrides b/src/themes/material/modules/modal.overrides index f381f995d..7cd32eeb8 100644 --- a/src/themes/material/modules/modal.overrides +++ b/src/themes/material/modules/modal.overrides @@ -1,4 +1,4 @@ -@import url(//fonts.googleapis.com/css?family=Roboto); +@import url(https://fonts.googleapis.com/css?family=Roboto); .ui.modal .header { font-family: "Roboto", Arial, Sans-serif !important;