diff --git a/ietf/static/ietf/font-datatracker/config.json b/ietf/static/ietf/font-datatracker/config.json index a542e8016..be91a7523 100755 --- a/ietf/static/ietf/font-datatracker/config.json +++ b/ietf/static/ietf/font-datatracker/config.json @@ -7,7 +7,7 @@ "ascent": 850, "glyphs": [ { - "uid": "26ee22854c398f64295baf8a5dcc7a71", + "uid": "2e705421770210ffdce62e2a92093aff", "css": "meetecho", "code": 59392, "src": "custom_icons", @@ -19,6 +19,12 @@ "search": [ "meetecho-icon" ] + }, + { + "uid": "05ef9b5e8742971aa85b23cfcbe71594", + "css": "users", + "code": 59393, + "src": "mfglabs" } ] } \ No newline at end of file diff --git a/ietf/static/ietf/font-datatracker/css/font-datatracker.css b/ietf/static/ietf/font-datatracker/css/font-datatracker.css index e706f5b61..449a51144 100755 --- a/ietf/static/ietf/font-datatracker/css/font-datatracker.css +++ b/ietf/static/ietf/font-datatracker/css/font-datatracker.css @@ -1,20 +1,30 @@ @font-face { font-family: 'font-datatracker'; - src: url('../font/font-datatracker.eot?60587374'); - src: url('../font/font-datatracker.eot?60587374#iefix') format('embedded-opentype'), - url('../font/font-datatracker.woff2?60587374') format('woff2'), - url('../font/font-datatracker.woff?60587374') format('woff'), - url('../font/font-datatracker.ttf?60587374') format('truetype'), - url('../font/font-datatracker.svg?60587374#font-datatracker') format('svg'); + src: url('../font/font-datatracker.eot?74830924'); + src: url('../font/font-datatracker.eot?74830924#iefix') format('embedded-opentype'), + url('../font/font-datatracker.woff2?74830924') format('woff2'), + url('../font/font-datatracker.woff?74830924') format('woff'), + url('../font/font-datatracker.ttf?74830924') format('truetype'), + url('../font/font-datatracker.svg?74830924#font-datatracker') format('svg'); font-weight: normal; font-style: normal; } +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'font-datatracker'; + src: url('../font/font-datatracker.svg?74830924#font-datatracker') format('svg'); + } +} +*/ -.fd { + [class^="fd-"]:before, [class*=" fd-"]:before { font-family: "font-datatracker"; font-style: normal; font-weight: normal; - speak: none; + speak: never; display: inline-block; text-decoration: inherit; @@ -45,4 +55,5 @@ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } -.fd-meetecho:before { content: '\e800'; } /* '' */ \ No newline at end of file +.fd-meetecho:before { content: '\e800'; } /* '' */ +.fd-users:before { content: '\e801'; } /* '' */ \ No newline at end of file diff --git a/ietf/static/ietf/font-datatracker/font/font-datatracker.eot b/ietf/static/ietf/font-datatracker/font/font-datatracker.eot index b0f35e502..5dbcc4348 100755 Binary files a/ietf/static/ietf/font-datatracker/font/font-datatracker.eot and b/ietf/static/ietf/font-datatracker/font/font-datatracker.eot differ diff --git a/ietf/static/ietf/font-datatracker/font/font-datatracker.svg b/ietf/static/ietf/font-datatracker/font/font-datatracker.svg index cbd2186a6..406e29bd7 100755 --- a/ietf/static/ietf/font-datatracker/font/font-datatracker.svg +++ b/ietf/static/ietf/font-datatracker/font/font-datatracker.svg @@ -3,10 +3,12 @@ Copyright (C) 2020 by original authors @ fontello.com - - + + + + \ No newline at end of file diff --git a/ietf/static/ietf/font-datatracker/font/font-datatracker.ttf b/ietf/static/ietf/font-datatracker/font/font-datatracker.ttf index d7ab48679..e955d879a 100755 Binary files a/ietf/static/ietf/font-datatracker/font/font-datatracker.ttf and b/ietf/static/ietf/font-datatracker/font/font-datatracker.ttf differ diff --git a/ietf/static/ietf/font-datatracker/font/font-datatracker.woff b/ietf/static/ietf/font-datatracker/font/font-datatracker.woff index dc0d089a1..7af4c84c6 100755 Binary files a/ietf/static/ietf/font-datatracker/font/font-datatracker.woff and b/ietf/static/ietf/font-datatracker/font/font-datatracker.woff differ diff --git a/ietf/static/ietf/font-datatracker/font/font-datatracker.woff2 b/ietf/static/ietf/font-datatracker/font/font-datatracker.woff2 index 239ca87fd..fd748e4e0 100755 Binary files a/ietf/static/ietf/font-datatracker/font/font-datatracker.woff2 and b/ietf/static/ietf/font-datatracker/font/font-datatracker.woff2 differ diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index c579cf622..7d04b442d 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -36,17 +36,17 @@ {% if session.agenda_note|first_url|conference_url %} + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} + title="Online conference"> {% elif item.timeslot.location.webex_url %} + title="Webex session"> {% elif item.timeslot.location.video_stream_url %} @@ -56,7 +56,7 @@ {% else %} - {% endif %} diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index 75363faef..7e5a5b9ce 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -54,17 +54,17 @@ {% if session.agenda_note|first_url|conference_url %} + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} + title="Online conference"> {% elif item.timeslot.location.webex_url %} + title="Webex session"> {% endif %} {% else %} diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html index 3cd6ed1df..688860c81 100644 --- a/ietf/templates/meeting/session_details_panel.html +++ b/ietf/templates/meeting/session_details_panel.html @@ -43,12 +43,12 @@ {% if session.agenda_note|first_url|conference_url %} + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} + title="Online conference"> {% endif %} {{ session.remote_instructions }}