Issue 5326 - General tab (HTML, strings and functionality)

skin/new-options.css

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 82 matching lines @@
 
 input[type="text"],
 input[type="search"],
 textarea
 {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
-button[role="checkbox"]
+button[role="checkbox"],
+#dialog-body .table button[role="checkbox"]

[Thomas Greiner, 2017/08/09 18:14:50]

Detail: Why are those duplicated selectors for checkboxes necessary? On first
glance it appears to work without it.

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

I'll recheck, but I almost sure I did it because of specificity

[Thomas Greiner, 2017/08/15 17:10:30]

Acknowledged.

[saroyanm, 2017/08/16 14:17:39]

Yes it is because of specificity, anyway I'll revisit the Dialog styles
separately.

[Thomas Greiner, 2017/08/16 17:57:08]

Acknowledged.

 {
   width: 18px;
   height: 18px;
   margin-top: 0px;
   -moz-margin-end: 20px;
   -webkit-margin-end: 20px;
   padding: 0px;
   border: none;
   background-color: transparent;
   background-position: -51px 0px;
 }
 
-button[role="checkbox"][aria-checked="true"]
+button[role="checkbox"][aria-checked="true"],
+#dialog-body .table button[role="checkbox"][aria-checked="true"]
 {
   background-position: -68px 0px;
 }
 
-.option-name
-{
-  display: flex;
-  margin-bottom: 16px;
-}
-
-.option-name > :first-child
-{
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 #nav-sidebar
 {
   min-width: 198px;
 }
 
 #nav-sidebar .fixed
 {
   top: 40px;
   bottom: 2px;
   height: auto;
@@ skipping 11 matching lines @@
   font-size: 16px;
   line-height: 1em;
 }
 
 #page-title h1
 {
   margin: 0px;
   padding: 8px 0px 16px 0px;
 }
 
-.hbox
-{
-  display: flex;
-  flex-direction: row;
-}
-
-.hbox > div
-{
-  width: 400px;
-}
-
 .tabs li
 {
   cursor: pointer;
   display: flex;
 }
 
 .tabs li a
 {
   flex: 1;
   color: inherit;
@@ skipping 181 matching lines @@
 }
 
 .table li
 {
   display: flex;
   align-items: center;
   padding: 12px 16px;
   border-radius: 3px;
 }
 
-.table.list,
-#custom-wrapper
+.table.list
 {
   border-bottom: 1px solid #CDCDCD;
 }
 
-.table.list li .display,
-.fill
+.table.list li .display
 {
   flex: 1;
   line-height: 16px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
 .table:not(.list):not(.cols) li
 {
   padding-top: 0px;
   padding-bottom: 6px;
 }
 
-.table.list li:nth-of-type(odd),
-.table.cols li:nth-of-type(odd):not([role="menuitem"]),
-.table li.empty-placeholder
+  .table li.empty-placeholder
 {
   background-color: #F5F5F5;
 }
 
+.table li [data-single='visible'],
+.table li:first-child:nth-last-child(2) [data-single='hidden']

[Thomas Greiner, 2017/08/09 18:14:51]

Detail: It's a nice trick to select an element if it's the only one but it's not
easy to understand because you'd have to know that the last element will always
be the `<template>` element.

Therefore let's use `li:first-of-type:last-of-type` instead because it makes
clear that we're only selecting the element if it's both the first and last
`<li>`.

[saroyanm, 2017/08/14 14:00:10]

I'll try that.

[saroyanm, 2017/08/16 14:17:38]

Done.

+{
+  display: none;
+}
+
+.table li:first-child:nth-last-child(2) [data-single='visible']

[Thomas Greiner, 2017/08/09 18:14:50]

Suggestion: You could move that selector into the rule above using
`li:not(:first-of-type:last-of-type)` to avoid having to know whether it's
supposed to be a block or an inline element.

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

Acknowledged.

[saroyanm, 2017/08/16 14:17:38]

Apparently it's not possible to have two pseudo classes in the :not

[Thomas Greiner, 2017/08/16 17:57:08]

Interesting, I wasn't aware of that. They only accept simple selectors according
to https://www.w3.org/TR/css3-selectors/#negation so you're right.

FYI: The upcoming Selectors Level 4 standard appears to change that so it
accepts a selector list instead. See https://www.w3.org/TR/selectors4/#negation

+{
+  display: block;
+}
+
 .table label
 {
   vertical-align: top;
 }
 
 .table.cols
 {
   border-bottom: 1px solid #CDCDCD;
   border-top: 1px solid #CDCDCD;
 }
@@ skipping 15 matching lines @@
   width: 10px;
 }
 
 .table button.delete:hover
 {
   background-position: -61px -51px;
 }
 
 .icon,
 button[role="checkbox"],
+#dialog-body .table button[role="checkbox"],
 .table button.delete,
 #content-help a::before,
 #dialog-close::before,
-#dialog-body button::before,
 #all-filter-lists-table .arrow,
 .context-menu .content a::before
 {
   background-image: url(options-sprite.png);
   display: inline-block;
 }
 
 .icon-add,
 .icon-update
 {
@@ skipping 19 matching lines @@
   cursor: pointer;
 }
 
 #dialog-close::before
 {
   content: "";
   height: 12px;
   width: 12px;
 }
 
-#content-help a::before,
-#dialog-body button::before
+#content-help a::before
 {
   background-position: 0px -42px;
   content: "";
   cursor: pointer;
   height: 11px;
   vertical-align: middle;
   width: 7px;
   -moz-margin-end: 12px;
   -webkit-margin-end: 12px;
 }
@@ skipping 33 matching lines @@
   -moz-margin-start: 16px;
   -webkit-margin-start: 16px;
   color: #3A7BA6;
   vertical-align: top;
 }
 
 /*
   General tab content
 */
 
-#acceptableads-table,
-#recommend-list-table,
-#blocking-languages-dialog-table,
-#custom-wrapper .table,
-#all-lang-table
+#blocking-languages-dialog-table
 {
   border-bottom: none;
 }
 
 #blocking-languages,
 #acceptable-ads
 {
   -moz-margin-end: 40px;
   -webkit-margin-end: 40px;
 }
 
-#custom-wrapper
+#whitelisting .controls.mode-edit > button,
+#whitelisting .controls:not(.mode-edit) > div
 {
-  height: 290px;
-  overflow: auto;
+  display: none;
 }
 
-#custom-wrapper .table
+#whitelisting .controls input[type="text"]
 {
+  border: 0px;
+  border-bottom: 1px solid #A1A1A1;
+  -moz-padding-end: 25px;
+  -webkit-padding-end: 25px;
+  -moz-margin-start: 14px;
+  -webkit-margin-start: 14px;
+  outline: 0px;
+  padding-bottom: 5px;
+  vertical-align: text-bottom;
   width: 100%;
 }
 
-.button-add
+#whitelisting .controls .button-add span
+{
+  -moz-margin-start: 5px;
+  -webkit-margin-start: 5px;
+}
+
+#whitelisting .button-add
+{
+  -moz-margin-start: 32px;
+  -webkit-margin-start: 32px;
+}
+
+#whitelisting-add-button + span
+{
+  flex: 1;
+}
+
+.icon-enter
+{
+  background-position: -19px -33px;
+  position: absolute;
+  bottom: 9px;
+  -moz-margin-start: -20px;
+  -webkit-margin-start: -20px;
+}
+
+.button-add, .cancel-button
 {
   background-color: transparent;
   border: 0px;
   color: #3A7BA6;
   cursor: pointer;
 }
 
 /*
   Advanced tab content
 */
 
 #all-filter-lists-table li.show-message .last-update,
 #all-filter-lists-table li:not(.show-message) .message,
 #custom-filters:not([data-mode="empty"]) #empty-custom-filters,
 #custom-filters[data-mode="empty"] #custom-filters-raw,
 #custom-filters:not([data-mode="write"]) #custom-filters-raw-controls,
 #custom-filters:not([data-mode="read"]) #custom-filters-edit,
-.state span
+.state span,
+#acceptable-ads:not(.show-dnt-notification) #no-dnt
 {
   display: none;
 }
 
 #all-filter-lists-table
 {
   display: inline-block;
 }
 
 #all-filter-lists-table
@@ skipping 125 matching lines @@
   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: 400px;
   z-index: 1;
 }
 
-html[dir="ltr"] div[role="tooltip"].flip-horizontal,
-html[dir="rtl"] div[role="tooltip"]:not(.flip-horizontal)
-{
-  left: inherit;
-  right: -20px;
-}
-
 .tooltip:not(:hover) > div[role="tooltip"],
 div[role="tooltip"]:hover
 {
   visibility: hidden;
   opacity: 0;
   -webkit-transition-delay: 0ms;
   transition-delay: 0ms;
 }
 
 div[role="tooltip"]::before,
@@ skipping 91 matching lines @@
 .context-menu .source::before
 {
   background-position: -53px -34px;
 }
 
 .context-menu .delete::before
 {
   background-position: -71px -34px;
 }
 
-html[dir="ltr"] div[role="tooltip"].flip-horizontal::before,
-html[dir="rtl"] div[role="tooltip"]:not(.flip-horizontal)::before
-{
-  left: inherit;
-  right: 30px;
-}
-
 div[role="tooltip"] img
 {
   float: left;
   height: 64px;
   margin-top: -2px;
   margin-bottom: 10px;
   width: 64px;
   -moz-margin-end: 10px;
   -webkit-margin-end: 10px;
 }
@@ skipping 151 matching lines @@
   margin-top: 10px;
   padding: 5px;
   width: 100%;
 }
 
 #dialog .table
 {
   width: 100%;
 }
 
-#dialog #dialog-content-language .table
-{
-  overflow: auto;
-}
-
 #dialog .section:not(:first-child)
 {
   margin-top: 24px;
 }
 
 #dialog-title
 {
   -moz-margin-start: 16px;
   -webkit-margin-start: 16px;
   flex: 1;
@@ skipping 22 matching lines @@
 
 #dialog .url
 {
   margin-top: 10px;
   margin-bottom: 20px;
   word-wrap: break-word;
 }
 
 body:not([data-dialog="custom"]) #dialog-title-custom,
 body:not([data-dialog="custom"]) #dialog-content-custom,
-body:not([data-dialog="language"]) #dialog-title-language,
-body:not([data-dialog="language"]) #dialog-content-language,
+body:not([data-dialog="language-add"]) #dialog-title-language-add,
+body:not([data-dialog="language-add"]) #dialog-content-language-add,
+body:not([data-dialog="language-change"]) #dialog-title-language-change,
+body:not([data-dialog="language-change"]) #dialog-content-language-change,
 body:not([data-dialog="predefined"]) #dialog-title-predefined,
 body:not([data-dialog="predefined"]) #dialog-content-predefined,
 body:not([data-dialog]) #dialog
 {
   display: none;
 }
-
-#dialog-content-language .dialog-content-block
-{
-  display: flex;
-  flex-direction: column;
-  height: 120px;
-}
-
-#dialog-content-language #other-language
-{
-  height: 200px;
-}
-
-#other-language .button-add
-{
-  background-color: transparent;
-  margin: 0px;
-  padding: 0px;
-  width: auto;
-  -webkit-border-end: 1px solid #CDCDCD;
-  -moz-border-end: 1px solid #CDCDCD;
-  -webkit-padding-end: 10px;
-  -moz-padding-end: 10px;
-  -webkit-padding-start: 0px;
-  -moz-padding-start: 0px;
-}
-
-#other-language .button-add::before
-{
-  display: none;
-}
-
-#other-language .display
-{
-  -webkit-margin-start: 10px;
-  -moz-margin-start: 10px;
-}