Issue 5872 - apply style changes

skin/desktop-options.css

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 31 matching lines @@
   src: local("Ø"), url(fonts/SourceSansPro-bold.woff) format("woff");
   font-weight: 700;
   font-style: normal;
 }
 
 html
 {
   font-size: 16px;
 }
 
 body

[ire, 2017/11/09 09:08:29]

The line-height isn't set at all? It's supposed to be 1.5

[saroyanm, 2017/11/13 17:07:14]

Yes, it's not, the style guide are being constantly updated.
Done.

 {
   background-color: #F3F3F3;
   display: flex;
   justify-content: center;
   /* We force vertical scrollbars to keep the content centered */
   overflow-y: scroll;
   margin: 1.2rem 0.3rem;
   font-family: "Source Sans Pro", sans-serif;
-  font-size: 1.25rem;
+  font-size: 1rem;
   color: #494949;

[ire, 2017/11/09 09:08:28]

According to the spec this colour should be #4A4A4A?

[saroyanm, 2017/11/13 17:07:14]

Well spotted, done.

 }
 
 h1
 {
   font-size: 3rem;
   font-weight: 300;
 }
 
 h2
 {
-  font-size: 1.375rem;
+  font-size: 1.125rem;
   font-weight: 700;
 }
 
 a
 {
-  color: #099CD0;
+  color: #077CA6;
   text-decoration: none;

[ire, 2017/11/09 09:08:28]

Shouldn't this be underlined?

[saroyanm, 2017/11/13 17:07:14]

Well spotted, seems like I missed when this was updated.
Done.

 }
 
 a:hover
 {
   color: #5CBCE1;
 }
 
 ul
 {
   margin: 0rem;
@@ skipping 12 matching lines @@
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
 /*
   Buttons and links
  */
 
 button,
 .button

[ire, 2017/11/09 09:08:28]

Since Chrome 62, buttons by default have rounded corners so you would need to
set `border-radius: 0`

[saroyanm, 2017/11/13 17:07:14]

Interesting, didn't know about that, apparently that affects only Mac users.
Updated.

 {
   display: block;
-  padding: 0.8rem 1.2rem;
+  padding: 0.6rem 0.8rem;
   background-color: transparent;
-  font-size: 1.125rem;
+  font-size: 1rem;
   font-weight: 700;
   text-decoration: none;
   text-transform: uppercase;
   cursor: pointer;
 }
 
 button.primary,
 .button.primary
 {
   border: 0px;
   color: #FFF;
-  background-color: #099CD0;
+  background-color: #077CA6;
 }
 
 button.primary:not([disabled]):hover,
 .button.primary:hover
 {
   box-shadow: inset 0 0 0 3px #005D80;
 }
 
 button.primary[disabled]
 {
   background-color: #5CBCE1;
 }
 
 button.secondary,
 .button.secondary
 {
-  border: 1px solid #099CD0;
-  color: #099CD0;
+  border: 2px solid #077CA6;
+  color: #077CA6;
 }
 
 button.secondary:hover,
 .button.secondary:hover
 {
-  box-shadow: inset 0 0 0 2px #099CD0;
+  box-shadow: inset 0 0 0 1px #077CA6;
 }
 
 button[role="checkbox"]
 {
-  width: 18px;
-  height: 18px;
+  width: 1.2rem;
+  height: 1.2rem;
   padding: 0px;
   border: 0px;
   background-color: transparent;
 }
 
 button[role="checkbox"]:not(.toggle)
 {
-  background-image: url(icons/checkbox.png);
+  background-image: url(icons/checkbox.svg#off);
   display: inline-block;
 }
 
 button[role="checkbox"][aria-checked="true"]:not(.toggle)
 {
-  background-position: 0px 18px;
+  background-image: url(icons/checkbox.svg#on);
 }
 
 button[role="checkbox"][disabled],
 button[role="checkbox"][aria-disabled="true"]
 {
   border-radius: 2px;
   background-color: #ccc;
 }
 
 button[role="checkbox"].toggle
 {
   background: url(icons/toggle.svg#on);
 }
 
 button[role="checkbox"][aria-checked="false"].toggle
 {
   background: url(icons/toggle.svg#off);
 }
 
 button[role="checkbox"][aria-checked="true"].toggle
 {
   background: url(icons/toggle.svg#on);
 }
 
 button[role="checkbox"].toggle
 {
   background-position: initial;
-  width: 2.25rem;
-  height: 1.3rem;
+  width: 1.7rem;

[ire, 2017/11/09 09:08:29]

This should be 1.9rem according to the spec
(https://bitbucket.org/adblockplus/spec/src/b140349a623ca03a314b03009cecbff948...)

[saroyanm, 2017/11/13 17:07:14]

You are right, the SVG should have been updated first, because in Firefox it was
clear that proportions was wrong, now it should be right dimensions.
Done.

+  height: 1rem;
 }
 
 button[role="checkbox"][disabled].toggle
 {
   background-image: none;
 }
 
 button.delete::before
 {
   background-image: url(icons/trash.svg#default);
@@ skipping 20 matching lines @@
   border: 0px;
   padding: 0px;
   background-color: transparent;
 }
 
 button.gear::before,
 button.delete::before
 {
   content: "";
   display: block;
-  height: 1.9rem;
-  width: 1.9rem;
+  height: 1rem;
+  width: 1rem;
+  border: 0.2rem solid transparent;

[ire, 2017/11/09 09:08:28]

I don't understand the purpose of the border, could you please explain?

I also discovered that it was causing extra spacing in the .context-menu icon

[saroyanm, 2017/11/13 17:07:15]

I think I should have left a comment here:
There was a question whether the 1rem is small enough or not, Jeen asked me to
leave the icons size 1rem, but increase the hover(click) area, see ->
https://bitbucket.org/adblockplus/spec/pull-requests/84/issue-89-adjusted-fon...

It mentioned Padding there, but intention is to have broader clickable zone.

[ire, 2017/11/14 16:55:20]

Okay I understand now, thanks!

The issue in the .context-menu still exists though. Perhaps you should add this
border only to the icon in the table, so it doesn't interfere with that other
use case?

[saroyanm, 2017/11/14 19:19:00]

Right, I missed the part about the .context-menu
.context-menu is also in the table and we are using delete icons in different
tables as well, I think we should have a rule for context-menu which will
override this.
Done.

+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 button.link,
 button.list
 {
-  color: #099CD0;
+  color: #077CA6;
 }
 
 button.link

[ire, 2017/11/14 16:55:21]

This should be underlined to look like the <a> links

[saroyanm, 2017/11/14 19:18:59]

I agree, done.

 {
   border: 0px;
   background-color: transparent;
   font-weight: 300;
   font-family: inherit;
   text-transform: none;
   padding: 0.2rem;
 }
 
 button.link:hover
 {
   color: #5CBCE1;
 }
 
 button.list
 {
   border-style: solid;;
   border-color: #CDCDCD;
   border-width: 0px 1px 1px 1px;
   width: 100%;
   background-color: #E1F2FA;
   text-align: initial;
 }
 
 button.list:hover
 {
-  box-shadow: inset 0 0 0 3px #099CD0;
-  border-color: #099CD0;
+  box-shadow: inset 0 0 0 3px #077CA6;
+  border-color: #077CA6;
 }
 
 .side-controls:not(.wrap)
 {
   margin: 0.8rem 0rem;
   display: flex;
   justify-content: flex-end;
 }
 
 .side-controls button
@@ skipping 173 matching lines @@
 {
   margin: 1.4rem 0rem;
 }
 
 [role="tablist"]
 {
   list-style: none;
   margin: 0rem;
   padding: 0rem;
   position: relative;
-  font-size: 1.25rem;
+  font-size: 1rem;
 }
 
 [role="tablist"] li a
 {
   display: flex;
   margin-top: -1px;
   padding: 1rem 0.8rem;
   -moz-margin-end: -1px;
   -webkit-margin-end: -1px;
   -moz-margin-start: -1px;
@@ skipping 22 matching lines @@
 
 #sidebar footer
 {
   width: 100%;
 }
 
 #sidebar footer p
 {
   display: flex;
   justify-content: center;
   margin: 1.2rem 0rem;

[ire, 2017/11/14 16:55:21]

The vertical spacing here should be 1rem

[saroyanm, 2017/11/14 19:19:00]

Well spotted, done.

 }
 
 /* This is a stopgap solution of footer overlapping tabs on low resolutions */
 @media (min-height: 37rem)
 {
   #sidebar .fixed
   {
     position: fixed;
   }
 
@@ skipping 13 matching lines @@
 body[data-tab|="whitelist"] #content-whitelist,
 body[data-tab|="help"] #content-help
 {
   display: block;
 }
 
 main
 {
   background-color: #FFFFFF;
   border: 1px solid #CDCDCD;
-  max-width: 46.3rem;
+  width: 46.3rem;

[ire, 2017/11/09 09:08:29]

I think your intention was to force this element to always be 46.3rem and never
resize, but it still does. If that was your intention, you also need to add
`min-width: 46.3rem`

[saroyanm, 2017/11/13 17:07:15]

My intention was to prevent a main area resize effect, switching from/to
Whitelisting website were causing an annoying resize effect

[ire, 2017/11/14 16:55:20]

Acknowledged.

   padding: 0px 0rem 1.4rem 0rem;
 }
 
 main > div
 {
   display: none;
 }
 
 main p
 {
   margin: 0.8rem 0rem;
 }
 
 /*
   Sections
  */
 
 [role="tabpanel"] > section,
 [role="tabpanel"] > .section
 {
   padding: 2rem;

[ire, 2017/11/14 16:55:21]

According to the spec this spacing should be 1.4rem

[saroyanm, 2017/11/14 19:18:59]

You are right, vertical spacings seems to be specified as 1.4rem, but horizontal
looks to still be 2rem. 
Done.

   border-top: 1px solid #CDCDCD;
 }
 
 [role="tabpanel"] > header h1,
 [role="tabpanel"] > header p
 {
   padding: 0rem 2rem;
   margin: 1.4rem 0rem;
 }
 
@@ skipping 31 matching lines @@
   flex: 3;
 }
 
 /*
   Acceptable ads
  */
 
 #acceptable-ads ul
 {
   position: relative;
-  padding-left: 2rem;
+  padding-left: 2.2rem;
   list-style: none;
 }
 
 html[dir="rtl"] #acceptable-ads ul
 {
   padding-left: 0rem;
-  padding-right: 2rem;
+  padding-right: 2.2rem;
 }
 
 #acceptable-ads button
 {
   position: absolute;
   margin-top: 0.3rem;
   left: 0rem;
 }
 
 html[dir="rtl"] button
 {
   left: auto;
   right: 0rem;
 }
 
 #acceptable-ads label
 {
   font-weight: 700;
-  font-size: 1.375rem;
+  font-size: 1rem;
+  -moz-margin-end: 0.5rem;
+  -webkit-margin-end: 0.5rem;
 }
 
 #dnt
 {
   padding: 0.8rem;
-  border: 1px solid #099CD0;
+  border: 1px solid #077CA6;
 }
 
 .new
 {
   display: inline-block;
-  margin: 0rem 0.5rem;
-  padding: 0.3rem 0.6rem;
+  padding: 0.2rem 0.5rem;
   border-radius: 0.2rem;
-  background-color: #099CD0;
+  background-color: #077CA6;
   color: #FFF;
   line-height: 100%;
-  font-size: 1rem;
+  font-size: 0.8rem;
   text-transform: uppercase;
 }
 
 /*
   Tables
  */
 
 ul.table,
 ul.list
 {
@@ skipping 13 matching lines @@
 {
   margin: 0rem;
   border-style: solid;
   border-color: #CDCDCD;
   border-width: 0px 1px 1px 1px;
 }
 
 .list li
 {
   padding: 0rem;
-  margin: 0rem 0rem 1.3rem 0rem;
+  margin: 0rem 0rem 0.8rem 0rem;

[ire, 2017/11/09 09:08:28]

I don't think you need to apply margins to all of the sides here.
`margin-bottom: 0.8rem` works the same.

[saroyanm, 2017/11/13 17:07:14]

Agree, done.

 }
 
 .list li [role="checkbox"]
 {
   flex-shrink: 0;
 }
 
 .table li:first-of-type
 {
   border-top: 1px solid #CDCDCD;
 }
 
 .table.list li
 {
-  padding: 0.5rem 1.1rem;
+  padding: 0.5rem 1.0rem;

[ire, 2017/11/09 09:08:28]

You don't need the .0 here. i.e 1rem is enough

[saroyanm, 2017/11/13 17:07:15]

Done.

   margin: 0rem;
 }
 
 li .display
 {
   margin: 0rem 1rem;
 }
 
 .table.list li .display
 {
   flex: 1;
+  margin: 0rem;
 }
 
 .table.list li.empty-placeholder
 {
   padding: 1.3em 1.9em;
 }
 
 .table.list li.empty-placeholder:not(:last-of-type)
 {
   border-bottom: 0px;
@@ skipping 25 matching lines @@
 .table li:first-of-type:last-of-type [data-single="visible"]
 {
   display: block;
 }
 
 .th
 {
   display: flex;
 }
 
-.col4 > *
+.col5 > *
 {
   display: inline-block;
 }
 
-.col4
+.col5
 {
-  margin: 0rem 0.9rem;
+  margin: 0rem 1rem;
 }
 
-.th .col4:nth-of-type(1),
-.table .col4:nth-of-type(1)
+.th .col5:nth-of-type(1),
+.table .col5:nth-of-type(1)
+{
+  flex: 7;

[ire, 2017/11/09 09:08:28]

NIT: It's not exactly clear how these flex numbers came about.

Suggestions:

1. The last two columns should be the same size (`flex: 1`)
2. The first and fourth columns should be 4 times the base size (`flex: 4`)
3. The second column, like you did, is double the first column (`flex: 8`)

[saroyanm, 2017/11/13 17:07:15]

Mostly eyepick
I agree with you.

+}
+
+.th .col5:nth-of-type(2),
+.table .col5:nth-of-type(2)
+{
+  flex: 14;
+}
+
+.th .col5:nth-of-type(3),
+.table .col5:nth-of-type(3)
+{
+  flex: 7;
+}
+
+.th .col5:nth-of-type(4),
+.table .col5:nth-of-type(4)
 {
   flex: 2;
 }
 
-.th .col4:nth-of-type(2),
-.table .col4:nth-of-type(2)
-{
-  flex: 3;
-}
-
-.th .col4:nth-of-type(3),
-.table .col4:nth-of-type(3)
-{
-  flex: 2;
-}
-
-.th .col4:nth-of-type(4),
-.table .col4:nth-of-type(4)
+.th .col5:nth-of-type(5),
+.table .col5:nth-of-type(5)
 {
   flex: 1;
+  -moz-margin-start: 0;
+  -webkit-margin-start: 0;
+  -moz-margin-end: 1.8rem;
+  -webkit-margin-end: 1.8rem;
 }
 
 .table.cols
 {
-  font-size: 1.1rem;
+  font-size: 1rem;

[ire, 2017/11/09 09:08:29]

I don't think setting the font-size is necessary here, the body font-size is
inherited

[saroyanm, 2017/11/13 17:07:14]

Done.

 }
 
 .table.cols .display
 {
   margin: 0rem;
 }
 
 .table.cols li
 {
   padding: 0.9rem 0rem;
@@ skipping 70 matching lines @@
   -moz-margin-end: 1rem;
   -webkit-margin-end: 1rem;
   line-height: 1.5rem;
   text-decoration: none;
   cursor: help;
 }
 
 .tooltip::before
 {
   content: "";
-  width: 1.3rem;
-  height: 1.3rem;
+  width: 1.1rem;
+  height: 1.1rem;
   display: block;
   background-image: url(icons/tooltip.svg);
 }
 
 /* 
   Used for translatable screen reader only conten.
   e.g.: Use instead of aria-label to avoid complex attribute value translation
 */
 .sr-only
 {
@@ skipping 26 matching lines @@
 
 /*
   Whitelist tab
  */
 
 #content-whitelist form
 {
   display: flex;
 }
 
 #content-whitelist form input

[ire, 2017/11/09 09:08:29]

The font-family for this input isn't the "Source Sans Pro", it's the default
system font

[saroyanm, 2017/11/13 17:07:15]

Well spotted!
Done.

 {
   flex: 1;
+  height: 100%;
   padding: 0.5rem 1rem;
-  font-size: 1.25rem;
-  border: 2px solid #099CD0;
+  font-size: 1rem;
+  border: 2px solid #077CA6;
 }
 
 #content-whitelist form button
 {
   -moz-margin-start: 0.7rem;
   -webkit-margin-start: 0.7rem;
 }
 
 #whitelisting-table li
 {
@@ skipping 40 matching lines @@
 #custom-filters-raw
 {
   width: 100%;
   height: 23.6rem;
   padding: 0.8rem 1.3rem; 
 }
 
 #custom-filters-raw:focus
 {
   outline: none;
-  border: 2px solid #099CD0;
+  border: 2px solid #077CA6;
 }
 
 #empty-custom-filters
 {
   padding: 1.5rem;
   border: 1px solid #CDCDCD;
 }
 
 /*
   Context menu
@@ skipping 22 matching lines @@
 
 html[dir="rtl"] [role="tooltip"]
 {
   right: auto;
   left: -1rem;
 }
 
 [role="tooltip"],
 .context-menu .content
 {
-  border: 1px solid #099CD0;
+  border: 1px solid #077CA6;
   border-radius: 3px;
   background-color: #FFFFFF;
 }
 
 
 .tooltip:not(:hover) > [role="tooltip"],
 [role="tooltip"]:hover
 {
   visibility: hidden;
   opacity: 0;
   -webkit-transition-delay: 0ms;
   transition-delay: 0ms;
 }
 
 .context-menu
 {
   position: absolute;
-  right: 3rem;
-  top: -3rem;
+  right: 2.5rem;
+  top: -2.7rem;
   z-index: 1;
   visibility: hidden;
 }
 
 html[dir="rtl"] .context-menu
 {
   right: auto;
-  left: 3rem;
+  left: 2.5rem;
 }
 
 .context-menu .content
 {
   padding: 0rem;
   position: relative;
   cursor: default;
 }
 
 li.show-context-menu .context-menu
 {
   visibility: visible;
 }
 
 [role="tooltip"]::before,
 .context-menu::before
 {
   content: "";
   width: 0rem;
   height: 0rem;
   position: absolute;
 }
 
 [role="tooltip"]::before
 {
   border-left: 10px solid transparent;
   border-right: 10px solid transparent;
-  border-bottom: 10px solid #099CD0;
+  border-bottom: 10px solid #077CA6;
   top: -10px;
   right: 15px;
 }
 
 html[dir="rtl"] [role="tooltip"]::before
 {
   right: auto;
   left: 15px;
 }
 
 .context-menu::before
 {
-  border-left: 10px solid #099CD0;
+  border-left: 10px solid #077CA6;
   border-top: 10px solid transparent;
   border-bottom: 10px solid transparent;
   top: 22px;
   right: -0.5rem;
 }
 
 html[dir="rtl"] .context-menu::before
 {
   border-left: 0rem;
-  border-right: 10px solid #099CD0;
+  border-right: 10px solid #077CA6;
   right: auto;
   left: -0.5rem;
 }
 
 .context-menu li[role="menuitem"]
 {
   width: 12.2rem;
   border: 0rem;
   padding: 0rem;
 }
 
 .context-menu li[role="menuitem"] > *
 {
   width: 100%;
   display: flex;
   border: 0rem;
-  padding: 1rem 0rem;
-  color: #099CD0;
-  font-size: 1.1rem;
+  padding: 0.7rem 0rem;
+  color: #077CA6;
+  font-size: 1rem;

[saroyanm, 2017/11/08 15:46:46]

Note: There is a difference between font-sizes for buttons and <a> tags in this
context menu, I'm not sure if there is an easy fix?
This needs an investigation, if it's not easy fixable make sense to tackle
separately.

[ire, 2017/11/09 09:08:29]

It's because the font families aren't actually the same. I think you need to set
`font-family: "Source Sans Pro"` here

[saroyanm, 2017/11/13 17:07:14]

Right, Done :)

   font-weight: 700;
   text-transform: none;
 }
 
 .context-menu li[role="menuitem"] > *:hover,
 .context-menu li[role="menuitem"] > *:focus
 {
   background-color: #E1F2FA;
   cursor: pointer;
 }
 
 .context-menu li[role="menuitem"] > *::before
 {
   content: "";
-  height: 1.5rem;
-  width: 1.5rem;
+  height: 1rem;
+  width: 1rem;
   margin: 0rem 1.1rem;
 }
 
 .context-menu .update-subscription::before
 {
   background-image: url(icons/reload.svg);
 }
 
 .context-menu .website::before
 {
@@ skipping 95 matching lines @@
   width: 50vw;
   margin: auto;
   border-radius: 3px;
   background-color: #FFFFFF;
 }
 
 #dialog header
 {
   display: flex;
   padding: 0.7rem 1.5rem;
-  background-color: #099CD0;
+  background-color: #077CA6;
 }
 
 #dialog header h3
 {
   margin: 0rem;
-  font-size: 1.375rem;
+  font-size: 1rem;
   font-weight: 700;
 }
 
 #dialog-close,
 #hide-notification
 {
   border: 0rem;
   padding: 0rem;
   margin: 0rem;
   background-color: transparent;
@@ skipping 111 matching lines @@
 {
   position: fixed;
   top: 0rem;
   left: 0rem;
   display: flex;
   padding: 1rem 1.9rem;
   width: 100%;
   box-sizing: border-box;
   opacity: 0.8;
   font-size: 1rem;
-  color: #099CD0;
+  color: #077CA6;
   background-color: #E1F2FA;
 }
 
 #notification strong
 {
   flex: 1;
   text-align: center;
 }
 
 #hide-notification
 {
   margin: 0rem 1rem;
 }
 
 #hide-notification::after
 {
   background-image: url(icons/delete.svg#secondary);
 }
 
 #hide-notification:hover::after
 {
   background-image: url(icons/delete.svg#secondary-hover);
 }