Issue 5872 - apply style changes

skin/desktop-options.css

Index: skin/desktop-options.css
===================================================================
--- a/skin/desktop-options.css
+++ b/skin/desktop-options.css
@@ -58,8 +58,9 @@
   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
@@ -70,14 +71,13 @@
 
 h2
 {
-  font-size: 1.375rem;
+  font-size: 1.125rem;
   font-weight: 700;
 }
 
 a
 {
-  color: #099CD0;
-  text-decoration: none;
+  color: #077CA6;
 }
 
 a:hover
@@ -106,6 +106,21 @@
 }
 
 /*
+  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
  */
 
@@ -113,9 +128,9 @@
 .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;
@@ -127,7 +142,7 @@
 {
   border: 0px;
   color: #FFF;
-  background-color: #099CD0;
+  background-color: #077CA6;
 }
 
 button.primary:not([disabled]):hover,
@@ -144,20 +159,20 @@
 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;
@@ -165,13 +180,13 @@
 
 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],
@@ -199,8 +214,9 @@
 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
@@ -241,14 +257,17 @@
 {
   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
@@ -278,8 +297,8 @@
 
 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)
@@ -473,7 +492,7 @@
   margin: 0rem;
   padding: 0rem;
   position: relative;
-  font-size: 1.25rem;
+  font-size: 1rem;
 }
 
 [role="tablist"] li a
@@ -550,7 +569,7 @@
 {
   background-color: #FFFFFF;
   border: 1px solid #CDCDCD;
-  max-width: 46.3rem;
+  width: 46.3rem;
   padding: 0px 0rem 1.4rem 0rem;
 }
 
@@ -623,14 +642,14 @@
 #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
@@ -649,25 +668,26 @@
 #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;
 }
 
@@ -701,7 +721,7 @@
 .list li
 {
   padding: 0rem;
-  margin: 0rem 0rem 1.3rem 0rem;
+  margin-bottom: 0.8rem;
 }
 
 .list li [role="checkbox"]
@@ -716,7 +736,7 @@
 
 .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;
 }
 
@@ -728,6 +748,7 @@
 .table.list li .display
 {
   flex: 1;
+  margin: 0rem;
 }
 
 .table.list li.empty-placeholder
@@ -773,43 +794,48 @@
   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
@@ -900,8 +926,8 @@
 .tooltip::before
 {
   content: "";
-  width: 1.3rem;
-  height: 1.3rem;
+  width: 1.1rem;
+  height: 1.1rem;
   display: block;
   background-image: url(icons/tooltip.svg);
 }
@@ -951,9 +977,10 @@
 #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
@@ -1014,7 +1041,7 @@
 #custom-filters-raw:focus
 {
   outline: none;
-  border: 2px solid #099CD0;
+  border: 2px solid #077CA6;
 }
 
 #empty-custom-filters
@@ -1057,7 +1084,7 @@
 [role="tooltip"],
 .context-menu .content
 {
-  border: 1px solid #099CD0;
+  border: 1px solid #077CA6;
   border-radius: 3px;
   background-color: #FFFFFF;
 }
@@ -1075,8 +1102,8 @@
 .context-menu
 {
   position: absolute;
-  right: 3rem;
-  top: -3rem;
+  right: 2.5rem;
+  top: -2.7rem;
   z-index: 1;
   visibility: hidden;
 }
@@ -1084,7 +1111,7 @@
 html[dir="rtl"] .context-menu
 {
   right: auto;
-  left: 3rem;
+  left: 2.5rem;
 }
 
 .context-menu .content
@@ -1112,7 +1139,7 @@
 {
   border-left: 10px solid transparent;
   border-right: 10px solid transparent;
-  border-bottom: 10px solid #099CD0;
+  border-bottom: 10px solid #077CA6;
   top: -10px;
   right: 15px;
 }
@@ -1125,7 +1152,7 @@
 
 .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;
@@ -1135,7 +1162,7 @@
 html[dir="rtl"] .context-menu::before
 {
   border-left: 0rem;
-  border-right: 10px solid #099CD0;
+  border-right: 10px solid #077CA6;
   right: auto;
   left: -0.5rem;
 }
@@ -1152,11 +1179,12 @@
   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,
@@ -1169,8 +1197,8 @@
 .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;
 }
 
@@ -1286,13 +1314,13 @@
 {
   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;
 }
 
@@ -1424,7 +1452,7 @@
   box-sizing: border-box;
   opacity: 0.8;
   font-size: 1rem;
-  color: #099CD0;
+  color: #077CA6;
   background-color: #E1F2FA;
 }