From 211abd926903d33feafbc4ac6374747d6a07f066 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 12 Aug 2020 16:32:49 +0200 Subject: [PATCH] move emoji font collection to own font definition --- src/ui/web/css/font.css | 15 +++++++++++++++ src/ui/web/css/main.css | 2 +- src/ui/web/css/themes/bubbles/theme.css | 3 +-- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/ui/web/css/font.css diff --git a/src/ui/web/css/font.css b/src/ui/web/css/font.css new file mode 100644 index 00000000..f6ef9a29 --- /dev/null +++ b/src/ui/web/css/font.css @@ -0,0 +1,15 @@ +/** from https://gist.github.com/mfornos/9991865 */ + +@font-face { + font-family: 'emoji'; + src: local('Apple Color Emoji'), + local('Segoe UI Emoji'), + local('Segoe UI Symbol'), + local('Noto Color Emoji'), + local('Android Emoji'), + local('EmojiSymbols'), + local('Symbola'); + + /* Emoji unicode blocks */ + unicode-range: U+1F300-1F5FF, U+1F600-1F64F, U+1F680-1F6FF, U+2600-26FF; +} diff --git a/src/ui/web/css/main.css b/src/ui/web/css/main.css index bbe8dcad..496f76db 100644 --- a/src/ui/web/css/main.css +++ b/src/ui/web/css/main.css @@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - +@import url('font.css'); @import url('layout.css'); @import url('login.css'); @import url('left-panel.css'); diff --git a/src/ui/web/css/themes/bubbles/theme.css b/src/ui/web/css/themes/bubbles/theme.css index 54a6b0f2..d06b49f1 100644 --- a/src/ui/web/css/themes/bubbles/theme.css +++ b/src/ui/web/css/themes/bubbles/theme.css @@ -16,8 +16,7 @@ limitations under the License. */ .hydrogen { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, sans-serif, - "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, sans-serif, 'emoji'; background-color: black; color: white; }