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 38 matching lines @@
   font-size: 16px;
 }
 
 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;
+  margin: 1rem 0.3rem;
   font-family: "Source Sans Pro", sans-serif;
   font-size: 1rem;
   line-height: 1.5rem;
   color: #4A4A4A;
 }
 
 h1
 {
   font-size: 3rem;
   font-weight: 300;
+  line-height: 3rem;
 }
 
 h2
 {
   font-size: 1.125rem;
   font-weight: 700;
 }
 
 a
 {
@@ skipping 25 matching lines @@
   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.

+  font-family: inherit;
 }
 
 button
 {
   border-radius: 0rem;
 }
 
 /*
   Buttons and links
  */
@@ skipping 141 matching lines @@
 button.link,
 button.list
 {
   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-weight: 400;
   font-family: inherit;
   text-transform: none;
+  text-decoration: underline;
   padding: 0.2rem;
 }
 
 button.link:hover
 {
   color: #5CBCE1;
 }
 
 button.list
 {
   border-style: solid;;
   border-color: #CDCDCD;
-  border-width: 0px 1px 1px 1px;
+  border-width: 1px;
   width: 100%;
   background-color: #E1F2FA;
   text-align: initial;
 }
 
 button.list:hover
 {
   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;
 }
 
@@ skipping 20 matching lines @@
   position: relative;
   padding-top: 0.7rem;
   margin: 1.8rem 0rem 0.5rem 0rem;
 }
 
 .floating-input input
 {
   border-color: #CDCDCD;
   border-width: 0px 0px 1px 0px;
   outline: none;
-  font-size: 1.3rem;
+  font-size: 1rem;
   padding: 5px;
   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.

+  font-size: 1rem;
 }
 
 .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 12 matching lines @@
 [data-validation] .floating-input input:focus:invalid ~ .attention::before,
 [data-validation] .floating-input input:valid ~ .attention::before
 {
   content: "";
   position: absolute;
   display: block;
   margin: 0.5rem;
   height: 1.5rem;
   width: 1.5rem;
   border: 0rem;
-  top: 0.5rem;
+  top: 0.3rem;
   right: 0rem;
 }
 
 html[dir="rtl"] [data-validation] .floating-input input:focus:invalid ~ .attention::before,
 html[dir="rtl"] [data-validation] .floating-input input:valid ~ .attention::before
 {
   left: 0rem;
   right: auto;
 }
 
 [data-validation] .floating-input input:focus:invalid ~ .attention::before
 {
   background-image: url(icons/attention.svg);
 }
 
 [data-validation] .floating-input input:valid ~ .attention::before
 {
-  top: 0.8rem;
+  top: 0.5rem;
   background-image: url(icons/checkmark.svg#approved);
 }
 
 [data-validation] .floating-input input ~ .error-msg
 {
   margin-top: 0.5rem;
   color: #C11D27;
   display: block;
   visibility: hidden;
 }
@@ skipping 45 matching lines @@
 
 #sidebar header h1 strong
 {
   font-weight: 700;
 }
 
 #sidebar header p
 {
   margin: 0rem;
   font-size: 2.4rem;
+  line-height: 2.6rem;
 }
 
 html[dir="rtl"] #sidebar header
 {
   text-align: left;
 }
 
 #sidebar-logo
 {
   width: 3rem;
@@ skipping 48 matching lines @@
 
 #sidebar footer
 {
   width: 100%;
 }
 
 #sidebar footer p
 {
   display: flex;
   justify-content: center;
-  margin: 1.2rem 0rem;
+  margin: 1rem 0rem;
 }
 
 /* This is a stopgap solution of footer overlapping tabs on low resolutions */
 @media (min-height: 37rem)
 {
   #sidebar .fixed
   {
     position: fixed;
   }
 
@@ skipping 34 matching lines @@
   margin: 0.8rem 0rem;
 }
 
 /*
   Sections
  */
 
 [role="tabpanel"] > section,
 [role="tabpanel"] > .section
 {
-  padding: 2rem;
+  padding: 1.4rem 2rem;
   border-top: 1px solid #CDCDCD;
 }
 
 [role="tabpanel"] > header h1,
 [role="tabpanel"] > header p
 {
   padding: 0rem 2rem;
   margin: 1.4rem 0rem;
 }
 
@@ skipping 125 matching lines @@
   flex-shrink: 0;
 }
 
 .table li:first-of-type
 {
   border-top: 1px solid #CDCDCD;
 }
 
 .table.list li
 {
   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;
 }
 
+.table.list.bottom-control li:last-of-type
+{
+  border-bottom: 0px;
+}
+
 li .display
 {
   margin: 0rem 1rem;
 }
 
 .table.list li .display
 {
   flex: 1;
   margin: 0rem;
 }
 
 .table.list li.empty-placeholder
 {
-  padding: 1.3em 1.9em;
+  padding: 1rem 1.4rem;
 }
 
 .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;
+  text-decoration: none;
 }
 
 .table:not(.list):not(.cols) li
 {
   padding-top: 0px;
   padding-bottom: 6px;
 }
 
 .table li [data-single="visible"],
 .table li:first-of-type:last-of-type [data-single="hidden"]
@@ skipping 115 matching lines @@
   height: 1.3rem;
   background-image: url(icons/checkmark.svg#default);
   margin: 0rem;
 }
 
 #dialog .table.list li button .display
 {
   flex: none;
   margin: 0rem 0.8rem;
   text-transform: none;
+  font-weight: 400;
 }
 
 /*
   Tooltips
 */
 
 .tooltip
 {
   display: inline-block;
   position: relative;
@@ skipping 66 matching lines @@
 }
 
 #content-whitelist form button
 {
   -moz-margin-start: 0.7rem;
   -webkit-margin-start: 0.7rem;
 }
 
 #whitelisting-table li
 {
+  padding-left: 1.4rem;
+  padding-right: 1.4rem;
   border-left: 0rem;
   border-right: 0rem; 
 }
 
 /*
   Advanced tab content
 */
 
 #all-filter-lists-table li.show-message .last-update,
 #all-filter-lists-table li:not(.show-message) .message,
@@ skipping 53 matching lines @@
 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.

+  padding: 0.2rem 1rem;
   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;
 }
 
@@ skipping 96 matching lines @@
   padding: 0rem;
 }
 
 .context-menu li[role="menuitem"] > *
 {
   width: 100%;
   display: flex;
   border: 0rem;
   padding: 0.7rem 0rem;
   color: #077CA6;
+  align-items: center;
   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.

+  font-weight: 400;
   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: 1rem;
   width: 1rem;
   margin: 0rem 1.1rem;
+  border: 0rem;
 }
 
 .context-menu .update-subscription::before
 {
   background-image: url(icons/reload.svg);
 }
 
 .context-menu .website::before
 {
   background-image: url(icons/globe.svg);
@@ skipping 29 matching lines @@
 {
   display: inline-block;
   -moz-margin-end: 1rem;
   -webkit-margin-end: 1rem;
 }
 
 #social ul li a
 {
   display: block;
   text-align: center;
+  text-decoration: none;
 }
 
 #social ul li a::before
 {
   display: block;
   margin: 0em auto;
   width: 2.5rem;
   height: 2.5rem;
   content: "";
 }
@@ skipping 48 matching lines @@
   background-color: #FFFFFF;
 }
 
 #dialog header
 {
   display: flex;
   padding: 0.7rem 1.5rem;
   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: 1rem;
   font-weight: 700;
 }
 
 #dialog-close,
 #hide-notification
 {
   border: 0rem;
@@ skipping 42 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
 {
   width: 100%;
@@ skipping 71 matching lines @@
 
 #hide-notification::after
 {
   background-image: url(icons/delete.svg#secondary);
 }
 
 #hide-notification:hover::after
 {
   background-image: url(icons/delete.svg#secondary-hover);
 }