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 40 matching lines @@
 
 body
 {
   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;
-  color: #494949;
+  font-size: 1rem;
+  line-height: 1.5rem;
+  color: #4A4A4A;
 }
 
 h1
 {
   font-size: 3rem;
   font-weight: 300;
 }
 
 h2
 {
-  font-size: 1.375rem;
+  font-size: 1.125rem;
   font-weight: 700;
 }
 
 a
 {
-  color: #099CD0;
-  text-decoration: none;
+  color: #077CA6;
 }
 
 a:hover
 {
   color: #5CBCE1;
 }
 
 ul
 {
   margin: 0rem;
 }
 
 [aria-hidden="true"]
 {
   display: none !important;
 }
 
 input[type="text"],
 input[type="url"],
 textarea,
 main
 {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
 /*
+  Normalization
+ */
+
+input,
+button
+{
+  font-family: "Source Sans Pro", sans-serif;

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

Suggest: You can set the font-family to `inherit` so you don't have to write out
the full family multiple times

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

Done.

+}
+
+button
+{
+  border-radius: 0rem;
+}
+
+/*
   Buttons and links
  */
 
 button,
 .button
 {
   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.9rem;
+  height: 1rem;
+  vertical-align: middle;
 }
 
 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;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 button.link,
 button.list
 {
-  color: #099CD0;
+  color: #077CA6;
 }
 
 button.link
 {
   border: 0px;
   background-color: transparent;
   font-weight: 300;

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

This font weight should be the same as the body, which is 400

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

Done.

   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;

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

NIT: Because there's no top border, the box-shadow looks uneven (it looks less
thick on the top than the other sides)

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

I see, not sure what will be quick fix for this, if I'll add a border on hover
it will move content down which will be more annoying.

[ire, 2017/11/15 07:00:46]

I think you can have the border on all sides normally, and remove the
border-bottom on .table li:last-of-type

[saroyanm, 2017/11/15 10:39:04]

That will require to treat this lists differently, but apparently it's
unavoidable.
Done.

+  border-color: #077CA6;
 }
 
 .side-controls:not(.wrap)
 {
   margin: 0.8rem 0rem;
   display: flex;
   justify-content: flex-end;
 }
 
 .side-controls button
@@ skipping 31 matching lines @@
   width: 100%;
 }
 
 .floating-input input:placeholder-shown ~ label,
 .floating-input input + label,
 .floating-input input:focus + label
 {
   position: absolute;
   top: 0.9rem;
   left: 0.3rem;
   font-size: 1.3rem;

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

According to the spec this should now be 1rem (although that seems a bit small
to me)

This may also be the case for the actual input text but I can't find it written
anywhere in the spec

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

Done.
I think it should same as placeholder text when it's not moved on top of the
field, which is specified to be 1rem.
done.

 }
 
 .floating-input input + label,
 .floating-input input:focus + label
 {
   top: -0.5rem;
   font-size: 0.9rem;
 }
 
 html[dir="rtl"] .floating-input input:placeholder-shown ~ label,
@@ skipping 121 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 56 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;
   padding: 0px 0rem 1.4rem 0rem;
 }
 
 main > div
 {
   display: none;
 }
 
 main p
 {
@@ skipping 52 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-bottom: 0.8rem;
 }
 
 .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 1rem;

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

The horizontal padding on the default tables should be 1.4rem. This 1rem applies
to only the complex tables

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

Seems like it's 1rem still (
https://bitbucket.org/adblockplus/spec/src/b140349a623ca03a314b03009cecbff948...
), 
The exception looks to be only for the table in the Whitelisted tab.
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;
 }
 
 #blocking-languages-table .display
 {
   font-weight: 700;

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

This should be styled like the body text, i.e. 400 font weight

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

Done.

 }
 
 .table.list button.link
 {
   font-weight: 700;
   text-transform: uppercase;
 }
 
 .table:not(.list):not(.cols) li
 {
@@ skipping 10 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: 2;
+  flex: 4;
 }
 
-.th .col4:nth-of-type(2),
-.table .col4:nth-of-type(2)
+.th .col5:nth-of-type(2),
+.table .col5:nth-of-type(2)
 {
-  flex: 3;
+  flex: 8;
 }
 
-.th .col4:nth-of-type(3),
-.table .col4:nth-of-type(3)
+.th .col5:nth-of-type(3),
+.table .col5:nth-of-type(3)
 {
-  flex: 2;
+  flex: 4;
 }
 
-.th .col4:nth-of-type(4),
-.table .col4:nth-of-type(4)
+.th .col5:nth-of-type(4),
+.table .col5:nth-of-type(4)
 {
   flex: 1;
 }
 
-.table.cols
+.th .col5:nth-of-type(5),
+.table .col5:nth-of-type(5)
 {
-  font-size: 1.1rem;
+  flex: 1;
+  -moz-margin-start: 0;
+  -webkit-margin-start: 0;
+  -moz-margin-end: 1.8rem;
+  -webkit-margin-end: 1.8rem;
 }
 
 .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 29 matching lines @@
  */
 
 #content-whitelist form
 {
   display: flex;
 }
 
 #content-whitelist form input
 {
   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
  */
 
 li [role="menubar"]
 {
   position: relative;
 }
 
 [role="tooltip"]
 {
   right: -1rem;
   margin-top: 1rem;
   opacity: 1;
   padding: 1.3rem;

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

According to the spec this padding should be 1rem

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

Done, I also didn't calculate the vertical margins of the padding inside.

   position: absolute;
   -webkit-transition: opacity 200ms ease-in-out 400ms,
     visibility 0ms linear 400ms;
   transition: opacity 200ms ease-in-out 400ms,
     visibility 0ms linear 400ms;
   visibility: visible;
   width: 15rem;
   z-index: 1;
 }
 
 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;
   font-weight: 700;

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

It looks like this should be 400 in the spec images, but it's not specified
anywhere so I'm not sure

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

Agree, done.

   text-transform: none;
+  text-decoration: none;
 }
 
 .context-menu li[role="menuitem"] > *:hover,
 .context-menu li[role="menuitem"] > *:focus
 {
   background-color: #E1F2FA;
   cursor: pointer;
 }
 
 .context-menu li[role="menuitem"] > *::before

[ire, 2017/11/15 07:00:46]

The icons are not vertically aligned with the text

[saroyanm, 2017/11/15 10:39:04]

Done.

 {
   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

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

It's a bit unclear from the spec how this should look because it looks one way
in the image, but the style name says something different. I assume your
implementation is the correct way, but just bringing this up in case it's not.

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

Thanks for bringing this up, the agreement is to prioritize text over the
visuals.

[ire, 2017/11/15 07:00:46]

Acknowledged.

 {
   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 41 matching lines @@
 [data-dialog="about"] button
 {
   margin: 1.5rem auto 1.8rem auto;
 }
 
 [data-dialog="about"] p
 {
   margin: 0.5rem 0rem;
 }
 
 #abp-version

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

I don't think this style is needed?

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

Done.

 {
   margin-bottom: 2rem;
 }
 
 [data-dialog="import"] .side-controls
 {
   margin-top: 2.45rem;
 }
 
 #dialog .table
@@ skipping 49 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);
 }