Issue 2376 - Implement custom filters in new options page

skin/options.css

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+@font-face
+{
+  font-family: "Source Sans Pro";
+  src: url(fonts/SourceSansPro-Light.woff);
+  /* local("Ø") forces using no local font called Source Sans Pro */
+  src: local("Ø"), url(fonts/SourceSansPro-Light.woff) format("woff");
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face
+{
+  font-family: "Source Sans Pro";
+  src: url(fonts/SourceSansPro-Regular.woff);
+  /* local("Ø") forces using no local font called Source Sans Pro */
+  src: local("Ø"), url(fonts/SourceSansPro-Regular.woff) format("woff");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face
+{
+  font-family: "Source Sans Pro";
+  src: url(fonts/SourceSansPro-Semibold.woff);
+  /* local("Ø") forces using no local font called Source Sans Pro */
+  src: local("Ø"), url(fonts/SourceSansPro-Semibold.woff) format("woff");
+  font-weight: 600;
+  font-style: normal;
+}
+
 body
 {
   background-color: #F5F5F5;
   display: flex;
+  margin: 20px 10px;
   font-family: "Source Sans Pro", sans-serif;
   font-size: 14px;
-  white-space: nowrap;
 }
 
 h1 
 {
   font-size: 24px;
-  font-weight: 100;
+  line-height: 1em;
+  font-weight: 300;
 }
 
 h2
 {
   font-size: 16px;
-  font-weight: 500;
+  font-weight: 600;
 }
 
 p
 {
-  font-weight: 100;
+  font-weight: 300;
 }
 
 hr
 {
   background-color: #CDCDCD;
   border: 0px;
   height: 1px;
   margin: 0px;
 }
 
 input[type="search"]::-webkit-search-cancel-button
 {
   display: none;
 }
 
 input[type="text"], input[type="search"]
 {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;

[Thomas Greiner, 2015/06/30 09:23:29]

What about applying `box-sizing:border-box` to every element on the page to
ensure consistency? Because I guess that's quite a common problem.

[saroyanm, 2015/07/08 18:25:43]

I think it make sense to create a separate ticket for that. It will need some
additional fixes on layout.

[Thomas Greiner, 2015/07/09 11:07:54]

Fine with me.

 }
 
 .option-name
 {
   display: flex;
 }
 
 .option-name > *
 {
   -moz-margin-end: 6px;
   -webkit-margin-end: 6px;
 }
 
 #nav-sidebar
 {
-  position: relative;
-  padding: 0px 0px 16px 0px;
-  -moz-padding-start: 10px;
-  -webkit-padding-start: 10px;
   min-width: 198px;
 }
 
 #nav-sidebar .fixed
 {
-  height: 100%;
+  top: 40px;
+  bottom: 2px;
+  height: auto;
   position: fixed;
 }
 
 #page-title
 {
-  -webkit-margin-start: 10px;
-  -moz-margin-start: 10px;
+  padding: 0px 20px;
 }
 
 #page-title p
 {
   margin: 0px;
-  padding: 40px 0px 0px 0px;
   font-size: 16px;
+  line-height: 1em;
 }
 
 #page-title h1
 {
   margin: 0px;
   padding: 8px 0px 16px 0px;
 }
 
 .flex-container
 {
   display: flex;
   flex-flow: row wrap;
 }
 
 .tabs li
 {
   cursor: pointer;
   display: flex;
 }
 
-.tabs li span:first-child
+.tabs li a
 {
   flex: 1;
+  color: inherit;
+  text-decoration: none;
 }
 
 .tabs.vertical
 {
   list-style: none;
   margin: 0px;
   position: relative;
   padding: 0px;
   width: 198px;
 }
 
 .tabs.vertical li
 {
-  border-color: #CDCDCD;
+  border-color: #CDCDCD transparent;
   border-style: solid;
-  border-width: 1px 0px 0px 0px;
+  border-width: 1px;
   font-size: 16px;
-  font-weight: 100;
-  padding: 16px 0px;
-  -moz-padding-end: 20px;
-  -webkit-padding-end: 20px;
-  -moz-padding-start: 11px;
-  -webkit-padding-start: 11px;
-}
-
-body[data-tab="general"] #tab-general + li,
-body[data-tab="advanced"] #tab-advanced + li,
-body[data-tab="help"] #tab-help + li
-{
-  border-width: 0px;
-}
-
-#tab-help,
-body[data-tab="advanced"] #tab-advanced + li
-{
-  border-bottom-width: 1px;
+  font-weight: 300;
+  line-height: 1em;
+  margin-top: -1px;
+  padding: 14px 20px;
 }
 
 body[data-tab="general"] #tab-general,
 body[data-tab="advanced"] #tab-advanced,
 body[data-tab="help"] #tab-help
 {
   background-color: #FFFFFF;
   border-radius: 3px 0px 0px 3px;
   border-width: 1px;
-  -moz-border-end: 0px;
-  -webkit-border-end: 0px;
-  font-weight: 900;
+  font-weight: 600;
+  -moz-border-start-color: #CDCDCD;
+  -webkit-border-start-color: #CDCDCD;
   -moz-margin-end: -1px;
   -webkit-margin-end: -1px;
-  -moz-padding-start: 10px;
-  -webkit-padding-start: 10px;
-  position: relative;
+  -moz-margin-start: -1px;
+  -webkit-margin-start: -1px;
+  -moz-padding-end: 21px;
+  -webkit-padding-end: 21px;
+  -moz-padding-start: 21px;
+  -webkit-padding-start: 21px;
+}
+
+html[dir="rtl"] body[data-tab="general"] #tab-general,
+html[dir="rtl"] body[data-tab="advanced"] #tab-advanced,
+html[dir="rtl"] body[data-tab="help"] #tab-help
+{
+  border-radius: 0px 3px 3px 0px;
 }
 
 .tabs.vertical.bottom
 {
   bottom: 0px;
   position: absolute;
 }
 
 .tabs.vertical.bottom li:first-child
 {
   border-top: 0px;
 }
 
-.tabs.vertical .icon
-{
-  margin: 2px 0px 0px 0px;
+#tab-contribute
+{
+  border-bottom: none;
+}
+
+#nav-sidebar ul li .icon
+{
+  height: 14px;
+  width: 14px;
 }
 
 #tab-general .icon
 {
-  background-position: -15px -17px;
-  height: 16px;
-  width: 16px;
+  background-position: -16px -18px;
 }
 
 #tab-advanced .icon
 {
-  background-position: -45px -18px;
-  height: 16px;
-  width: 16px;
+  background-position: -46px -18px;
 }
 
 #tab-help .icon
 {
-  background-position: 0px -17px;
-  height: 16px;
-  width: 16px;
+  background-position: -1px -18px;
 }
 
 #tab-share .icon
 {
-  background-position: -60px -17px;
-  height: 16px;
-  width: 16px;
-}
-
-#tab-donate .icon
-{
-  background-position: -30px -17px;
-  height: 16px;
-  width: 16px;
+  background-position: -61px -18px;
+}
+
+#tab-contribute .icon
+{
+  background-position: -31px -18px;
 }
 
 #tab-content
 {
   background-color: #FFFFFF;
   border: 1px solid #CDCDCD;
   border-radius: 8px;
   padding: 0px 60px 40px 60px;
   width: 960px;
 }
 
 #tab-content h1
 {
   border-bottom: 1px solid #CDCDCD;
   margin: 0px;
   padding: 40px 0px 16px 0px;
 }
 
-.nav-link
-{
-  -moz-margin-start: 12px;
-  -webkit-margin-start: 12px;
+#link-version
+{
+  display: flex;
+  margin: 12px 20px;
   color: #3A7BA6;
+  text-decoration: none;
+}
+
+#abp-version
+{
+  -moz-margin-start: 5px;
+  -webkit-margin-start: 5px;
 }
 
 #content-wrapper
 {
   position: relative;
 }
 
 #content-wrapper > div
 {
   display: none;
@@ skipping 156 matching lines @@
   color: #3A7BA6;
   padding: 10px 0px 11px 0px;
   text-align: center;
   width: 50%;
 }
 
 .tabs.horizontal li.active
 {
   border-bottom: 2px solid #1E8728;
   color: black;
-  font-weight: bold;
+  font-weight: 600;
   padding-bottom: 10px;
 }
 
 .icon, .table input[type="checkbox"]::before, .table button.delete,
 #content-help a::before, #dialog-close::before,
-#custom-filters-add-btn::after
+#custom-filters-add button::after
 {
   background-image: url(options-sprite.png);
   display: inline-block;
 }
 
 .icon-add
 {
   background-position: -0px -0px;
   cursor: pointer;
   height: 18px;
-  width: 18px;
+  min-width: 18px;
 }
 
 .icon-update
 {
   background-position: -34px -0px;
   cursor: pointer;
   height: 18px;
   width: 18px;
 }
 
@@ skipping 83 matching lines @@
 {
   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: 355px;

[Thomas Greiner, 2015/06/30 09:23:30]

Could you please try making this more dynamic instead of hard-coding the pixel
value?

[saroyanm, 2015/07/08 18:25:42]

Done, but I do not understand why it's overlapping to the icon when mangin-start
is 14px. Do you have idea why it's overlapping ?

[Thomas Greiner, 2015/07/09 11:07:55]

It seems that #whitelisting-add-icon's width is lower than 18px for some reason
so you need to specify min-width on it.

[saroyanm, 2015/07/09 16:31:40]

Done.

+  width: 100%;
 }
 
 #whitelisting .controls .button-add span
 {
   -moz-margin-start: 5px;
   -webkit-margin-start: 5px;
 }
 
 #whitelisting .button-add
 {
@@ skipping 25 matching lines @@
   color: #3A7BA6;
   cursor: pointer;
 }
 
 /*
   Advanced tab content
 */
 
 #custom-filters-header
 {
-  -moz-margin-start: 20px;
-  -webkit-margin-start: 20px;

[Thomas Greiner, 2015/06/30 09:23:29]

What about `padding: 0px 20px;` instead? We want to have the same distance on
either side anyway.

[saroyanm, 2015/07/08 18:25:43]

Done.

+  padding: 0px 20px;
   margin-bottom: 10px;
 }
 
-#custom-filters-textarea-controls, #custom-filters-edit-btn,
-#custom-filters-list-wrapper, #custom-filters-textarea
+#custom-filters-raw-controls
+{
+  display: flex;
+}
+
+#custom-filters:not(.mode-edit) #custom-filters-raw,
+#custom-filters:not(.mode-edit) #custom-filters-raw-controls,
+#custom-filters.mode-edit #custom-filters-show-edit,
+#custom-filters.mode-edit #custom-filters-list-wrapper
 {
   display: none;
 }
 
-#custom-filters[data-view="edit"] #custom-filters-textarea,
-#custom-filters[data-view="list"] #custom-filters-edit-btn,
-#custom-filters[data-view="list"] #custom-filters-list-wrapper

[Thomas Greiner, 2015/06/30 09:23:29]

You could combine this, the block above and the block below into this cleaner
construct:

#custom-filters-textarea-controls
{
  display: flex;
}

#custom-filters:not(.mode-edit) #custom-filters-textarea-controls,
#custom-filters:not(.mode-edit) #custom-filters-textarea,
#custom-filters.mode-edit #custom-filters-edit-btn,
#custom-filters.mode-edit #custom-filters-list-wrapper
{
  display: none;
}

[saroyanm, 2015/07/08 18:25:42]

Done.

-{
-  display: block;
-}
-
-#custom-filters[data-view="edit"] #custom-filters-textarea-controls
-{
-  display: flex;
-}
-
-#custom-filters-save-btn
-{
-  -moz-margin-start: 16px;
-  -webkit-margin-start: 16px;

[Thomas Greiner, 2015/06/30 09:23:30]

Again, what about `padding: 0px 16px;` instead?

[saroyanm, 2015/07/08 18:25:42]

Done.

+#custom-filters-raw-save
+{
+  padding: 0px 16px;
 }
 
 #custom-filters .table
 {
   height: 290px;
   overflow: auto;
   width: auto;
 }
 
-#custom-filter-add-wrapper
+#custom-filters-add
 {
   display: flex;
   padding: 0px;
   border: none;
 }
 
 #custom-filters .controls
 {
   border-top: none;
 }
 
-#custom-filters-textarea
+#custom-filters-raw
 {
   width: 100%;
-  height: 328px;

[Thomas Greiner, 2015/06/30 09:23:30]

I assume you'll make this pixel value more dynamic with the tabs implementation
in #2375?

[saroyanm, 2015/07/08 18:25:43]

Couldn't find better way to achieve this, currently it's getting the height of
the wrapper, but please note that the list view table's height is hardcoded.

-}
-
-#custom-filters input[type="text"],
-#custom-filters input[type="text"]:focus

[Thomas Greiner, 2015/06/30 09:23:29]

Please split up those two styles. I assume `:focus` only needs `outline:0px`.

[saroyanm, 2015/07/08 18:25:42]

Done.

+  height: 100%;
+}
+
+#custom-filters-wrapper
+{
+  height: 330px;
+}
+
+#custom-filters input[type="text"]
 {
   border-width: 1px 0px 1px 0px;
   border-bottom-style: solid;
   border-top-style: solid;
   border-color: #1E8728;
   height: 25px;
-  outline: 0px;
   -moz-padding-start: 10px;
   -webkit-padding-start: 10px;
   -moz-padding-end: 60px;
   -webkit-padding-end: 60px;
   padding-top: 18px;
   padding-bottom: 18px;
   width: 100%;
 }
 
-#custom-filters-add-textbox
+#custom-filters input[type="text"]:focus
+{
+  outline: 0px;
+}
+
+#custom-filters-add input
 {
   font-size: 13px;

[Thomas Greiner, 2015/06/30 09:23:30]

Missing background color which is specified in design mockup.

[saroyanm, 2015/07/08 18:25:42]

Done.

-}
-
-#custom-filters-add-textbox::-webkit-input-placeholder
-{
-  font-weight: bold;

[Thomas Greiner, 2015/06/30 09:23:29]

Actually, we don't have fonts for bold (= `font-weight:700`), only for semi-bold
(= `font-weight:600`) so I'd generally suggest to exclusively use integers to
specify font weights.

[saroyanm, 2015/07/08 18:25:43]

Done.

-}
-#custom-filters-add-textbox::-moz-placeholder
-{
-  font-weight: bold;
+  background-color: #F5F5F5;
+}
+
+#custom-filters-add input::-webkit-input-placeholder
+{
+  font-weight: 600;
+}
+#custom-filters-add input::-moz-placeholder
+{
+  font-weight: 600;
 }
 
 #custom-filters-table
 {
   border-top: 1px solid #CDCDCD;
 }
 
-#custom-filters-add-btn

[Thomas Greiner, 2015/06/30 09:23:29]

The add-button doesn't occupy the entire block it's contained in. Therefore if
you click slightly above the text, the action is not registered.

[saroyanm, 2015/07/08 18:25:42]

Done.

[Thomas Greiner, 2015/07/09 11:07:54]

It still doesn't register it when you click on the area to the right side of the
button. Adding `-x-padding-end` should be sufficient for that.

[saroyanm, 2015/07/09 16:31:40]

Done.

+#custom-filters-add button
 {
   font-size: 14px;
-  position: absolute;

[Thomas Greiner, 2015/06/30 09:23:29]

Doesn't this also work without `position:absolute` and `bottom:11px`?  Because
it seems like those don't do anything.

[saroyanm, 2015/07/08 18:25:42]

Exactly and they are fixing comment above :)

   -webkit-margin-start: -60px;
   -moz-margin-start: -60px;
-  bottom: 11px;
+  -webkit-padding-end: 6px;
+  -moz-padding-end: 6px;
   cursor: pointer;
   color: #3A7BA6;
 }
 
-#custom-filters-add-btn::before
+#custom-filters-add button::before
 {
   content: "";
   display: inline-block;
   -moz-border-end: 1px solid #CDCDCD;
   -webkit-border-end: 1px solid #CDCDCD;
   height: 15px;
   -webkit-margin-end: 10px;
   -moz-margin-end: 10px;
   margin-bottom: -2px;
   width: 1px;
 }
 
-#custom-filters-add-btn::after

[saroyanm, 2015/06/29 11:34:18]

I do think we need to show icon for other buttons in similar way.
@Thomas please let me know if I need to create a ticket, in case it's not
covered in current ticket. 

[Thomas Greiner, 2015/06/30 09:23:29]

Yep, agreed. I guess you already confirmed in
https://codereview.adblockplus.org/29321206/diff/29321207/options.html#new-li...
that you'll create a ticket so fine with me.

+#custom-filters-add button::after
 {
   content: "";
   background-position: -28px -85px;
   cursor: pointer;
   height: 10px;
   -webkit-margin-start: 6px;
   -moz-margin-start: 6px;
   width: 10px;
 }
 
 .tooltip, #block-element-explanation a
 {
   border-bottom: dotted 2px;
   color: #3A7BA6;
   font-size: 12px;
   text-decoration: none;
 }
 
 #content-advanced .tooltip
 {
   -moz-margin-start: 8px;
   -webkit-margin-start: 8px;
 }
 
 #block-element-explanation a
 {
   color: black;
   border-bottom-color: #3A7BA6;
-  font-weight: bold;
+  font-weight: 600;
   -moz-padding-start: 0px;
   -webkit-padding-start: 0px;
 }
 
 /*
   Help tab content
 */
 
 #content-help
 {
@@ skipping 190 matching lines @@
   -moz-padding-end: 10px;
   -webkit-padding-start: 0px;
   -moz-padding-start: 0px;
 }
 
 #other-language .display
 {
   -webkit-margin-start: 10px;
   -moz-margin-start: 10px;
 }