skin/desktop-options.css - Issue 29654555: Issue 6209 - Updated woff fonts and table status column for long texts

Unified Diff: skin/desktop-options.css

Issue 29654555: Issue 6209 - Updated woff fonts and table status column for long texts (Closed)

Patch Set: Added font ranges Created Jan. 29, 2018, 4:14 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: skin/desktop-options.css

===================================================================

--- a/skin/desktop-options.css

+++ b/skin/desktop-options.css

@@ -15,33 +15,221 @@

* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

+/* cyrillic-ext */

saroyanm 2018/01/29 16:16:17 I added fonts from the URLS bellow accordingly: *

Thomas Greiner 2018/02/14 17:13:45 Can you verify that we actually need each of those

Thomas Greiner 2018/02/14 17:13:46 Anything we need to consider when using the fonts

saroyanm 2018/02/14 18:30:04 Not sure how I can verify ? We do support "cyrill

saroyanm 2018/02/14 18:30:04 Only thing I could find is from -> https://develop

Thomas Greiner 2018/02/15 12:17:06 Ok. From what I read in the license text, the requ

Thomas Greiner 2018/02/15 12:17:06 I assumed there'd be resources out there that clar

saroyanm 2018/02/15 18:47:19 If we include Font as an npm package, we don't nee

If we include Font as an npm package, we don't need to include License ?

Sure, I was referring to use @include rather than manage another file in HTML, but if you have a strong preference to current method, I'll go for it.

saroyanm 2018/02/15 18:47:19 I don't think that C&T ever noticed that we had th

saroyanm 2018/02/16 21:02:56 As discussed, I've included "fonts" file separatel

On 2018/02/15 18:47:19, saroyanm wrote: > On 2018/02/15 12:17:06, Thomas Greiner wrote: > > On 2018/02/14 18:30:04, saroyanm wrote: > > > Only thing I could find is from -> https://developers.google.com/fonts/faq > > > The open source fonts in the Google Fonts catalog are published under > licenses > > > that allow you to use them on any website, whether it’s commercial or > > personal. > > > Search queries may surface results from external foundries, who may or may > not > > > use open source licenses. > > > > > > Source Sans Pro is "OFL" and links to actual license from here -> > > > https://fonts.google.com/specimen/Source+Sans+Pro > > > > > > I'll include the license as a separate file. > > > > Ok. From what I read in the license text, the requirements are: > > - Include the license text in adblockplusui and in the extension build > > - Include the copyright notice in adblockplusui and in the extension build > > > > The Google Fonts page doesn't mention though what the copyright notice should > > say so I did a quick search and found the font's official site at > > https://typekit.com/fonts/source-sans. There you find links on the bottom for > > each font variant. Those pages contain the license as well as the copyright > > notice we need to include. > > > > This also matches the license file that I found in the repo where you got the > > font files from: > > https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.txt > > > > We could even include the fonts as an npm package if we want (see > > > https://github.com/adobe-fonts/source-sans-pro/blob/release/README.md#font-in... > > and https://www.npmjs.com/package/source-sans-pro). > If we include Font as an npm package, we don't need to include License ? > > > > I agree, mind if I use Import until we have CSS preprocessor in place > > > https://developer.mozilla.org/en-US/docs/Web/CSS/%40import ? > > > > I think there's a misunderstanding. What I'm suggesting is to include it as > > follows: > > > > <head> > > ... > > <link rel="stylesheet" type="text/css" href="fonts.css"> > > <link rel="stylesheet" type="text/css" href="desktop-options.css"> > > ... > > </head> > Sure, I was referring to use @include rather than manage another file in HTML, > but if you have a strong preference to current method, I'll go for it.

As discussed, I've included "fonts" file separately as you suggested and included license.

@font-face

{

font-family: "Source Sans Pro";

- src: url(fonts/SourceSansPro-Light.woff);

+ font-style: normal;

+ font-weight: 300;

/* local("Ø") forces using no local font called Source Sans Pro */

- src: local("Ø"), url(fonts/SourceSansPro-Light.woff) format("woff");

- font-weight: 300;

- font-style: normal;

+ src: local("Ø"), url("fonts/Source-Sans-Pro/300/cyrillic-ext.woff2") format("woff2");

+ unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;

Thomas Greiner 2018/02/14 17:13:45 Coding style: "Line length: 80 characters or less"

saroyanm 2018/02/14 18:30:04 Will fix this.

saroyanm 2018/02/16 21:02:56 Done.

}

@font-face

{

font-family: "Source Sans Pro";

- src: url(fonts/SourceSansPro-Regular.woff);

+ font-style: normal;

+ font-weight: 400;

/* local("Ø") forces using no local font called Source Sans Pro */

- src: local("Ø"), url(fonts/SourceSansPro-Regular.woff) format("woff");

- font-style: normal;

+ src: local("Ø"), url("fonts/Source-Sans-Pro/400/cyrillic-ext.woff2") format("woff2");

+ unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;

}

@font-face

{

font-family: "Source Sans Pro";

- src: url(fonts/SourceSansPro-bold.woff);

+ font-style: normal;

+ font-weight: 700;

/* local("Ø") forces using no local font called Source Sans Pro */

- src: local("Ø"), url(fonts/SourceSansPro-bold.woff) format("woff");

+ src: local("Ø"), url("fonts/Source-Sans-Pro/700/cyrillic-ext.woff2") format("woff2");

+ unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;

+/* cyrillic */

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/300/cyrillic.woff2") format("woff2");

+ unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/400/cyrillic.woff2") format("woff2");

+ unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/700/cyrillic.woff2") format("woff2");

+ unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;

+/* greek-ext */

+@font-face

+ font-family: "Source Sans Pro";

font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/300/greek-ext.woff2") format("woff2");

+ unicode-range: U+1F00-1FFF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/400/greek-ext.woff2") format("woff2");

+ unicode-range: U+1F00-1FFF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/700/greek-ext.woff2") format("woff2");

+ unicode-range: U+1F00-1FFF;

+/* greek */

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/300/greek.woff2") format("woff2");

+ unicode-range: U+0370-03FF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/400/greek.woff2") format("woff2");

+ unicode-range: U+0370-03FF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/700/greek.woff2") format("woff2");

+ unicode-range: U+0370-03FF;

+/* vietnamese */

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/300/vietnamese.woff2") format("woff2");

+ unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/400/vietnamese.woff2") format("woff2");

+ unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url("fonts/Source-Sans-Pro/700/vietnamese.woff2") format("woff2");

+ unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;

+/* latin-ext */

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/300/latin-ext.woff2) format("woff2");

+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/400/latin-ext.woff2) format("woff2");

+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/700/latin-ext.woff2) format("woff2");

+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;

+/* latin */

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 300;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/300/latin.woff2) format("woff2");

+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 400;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/400/latin.woff2) format("woff2");

+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;

+@font-face

+ font-family: "Source Sans Pro";

+ font-style: normal;

+ font-weight: 700;

+ /* local("Ø") forces using no local font called Source Sans Pro */

+ src: local("Ø"), url(fonts/Source-Sans-Pro/700/latin.woff2) format("woff2");

+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;

}

html

@@ -943,15 +1131,17 @@

vertical-align: middle;

}

-.cols .col5

+.cols .col5,

+.th .col5

{

margin: 0rem 1rem;

+ align-self: center;

}

.th .col5:nth-of-type(1),

.table .col5:nth-of-type(1)

{

- flex: 4;

+ flex: 5;

Thomas Greiner 2018/02/14 17:13:45 If the design doesn't consider long texts, there's

saroyanm 2018/02/14 18:30:04 I agree that this need to be fixed in design, but

Thomas Greiner 2018/02/15 12:17:07 Ok, I'm fine with that.

}

.th .col5:nth-of-type(2),

@@ -992,10 +1182,10 @@

padding: 0.5rem 0rem;

}

-.table.cols .state

+.table.cols .toggle

{

- -moz-margin-start: 1rem;

- -webkit-margin-start: 1rem;

+ -moz-margin-end: 0.5rem;

+ -webkit-margin-end: 0.5rem;

}

.table.cols .gear

« no previous file with comments | « no previous file | skin/fonts/Source-Sans-Pro/300/cyrillic.woff2 » ('j') | no next file with comments »