Merge branch 'master' into Development

cps/static/css/libs/viewer.css

@@ -445,7 +445,7 @@
   --overlay-button-bg-color: rgba(12, 12, 13, 0.1);
   --overlay-button-hover-color: rgba(12, 12, 13, 0.3);
 
-  --loading-icon: url(images/loading.svg);
+  /*--loading-icon: url(images/loading.svg);
   --treeitem-expanded-icon: url(images/treeitem-expanded.svg);
   --treeitem-collapsed-icon: url(images/treeitem-collapsed.svg);
   --toolbarButton-menuArrow-icon: url(images/toolbarButton-menuArrow.svg);
@@ -479,7 +479,7 @@
   --secondaryToolbarButton-spreadNone-icon: url(images/secondaryToolbarButton-spreadNone.svg);
   --secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd.svg);
   --secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven.svg);
-  --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);
+  --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);*/
 }
 
 @media (prefers-color-scheme: dark) {
@@ -515,42 +515,6 @@
     --doorhanger-separator-color: rgba(92, 92, 97, 1);
     --overlay-button-bg-color: rgba(92, 92, 97, 1);
     --overlay-button-hover-color: rgba(115, 115, 115, 1);
-
-    --loading-icon: url(images/loading-dark.svg);
-    --treeitem-expanded-icon: url(images/treeitem-expanded-dark.svg);
-    --treeitem-collapsed-icon: url(images/treeitem-collapsed-dark.svg);
-    --toolbarButton-menuArrow-icon: url(images/toolbarButton-menuArrow-dark.svg);
-    --toolbarButton-sidebarToggle-icon: url(images/toolbarButton-sidebarToggle-dark.svg);
-    --toolbarButton-secondaryToolbarToggle-icon: url(images/toolbarButton-secondaryToolbarToggle-dark.svg);
-    --toolbarButton-pageUp-icon: url(images/toolbarButton-pageUp-dark.svg);
-    --toolbarButton-pageDown-icon: url(images/toolbarButton-pageDown-dark.svg);
-    --toolbarButton-zoomOut-icon: url(images/toolbarButton-zoomOut-dark.svg);
-    --toolbarButton-zoomIn-icon: url(images/toolbarButton-zoomIn-dark.svg);
-    --toolbarButton-presentationMode-icon: url(images/toolbarButton-presentationMode-dark.svg);
-    --toolbarButton-print-icon: url(images/toolbarButton-print-dark.svg);
-    --toolbarButton-openFile-icon: url(images/toolbarButton-openFile-dark.svg);
-    --toolbarButton-download-icon: url(images/toolbarButton-download-dark.svg);
-    --toolbarButton-bookmark-icon: url(images/toolbarButton-bookmark-dark.svg);
-    --toolbarButton-viewThumbnail-icon: url(images/toolbarButton-viewThumbnail-dark.svg);
-    --toolbarButton-viewOutline-icon: url(images/toolbarButton-viewOutline-dark.svg);
-    --toolbarButton-viewAttachments-icon: url(images/toolbarButton-viewAttachments-dark.svg);
-    --toolbarButton-viewLayers-icon: url(images/toolbarButton-viewLayers-dark.svg);
-    --toolbarButton-search-icon: url(images/toolbarButton-search-dark.svg);
-    --findbarButton-previous-icon: url(images/findbarButton-previous-dark.svg);
-    --findbarButton-next-icon: url(images/findbarButton-next-dark.svg);
-    --secondaryToolbarButton-firstPage-icon: url(images/secondaryToolbarButton-firstPage-dark.svg);
-    --secondaryToolbarButton-lastPage-icon: url(images/secondaryToolbarButton-lastPage-dark.svg);
-    --secondaryToolbarButton-rotateCcw-icon: url(images/secondaryToolbarButton-rotateCcw-dark.svg);
-    --secondaryToolbarButton-rotateCw-icon: url(images/secondaryToolbarButton-rotateCw-dark.svg);
-    --secondaryToolbarButton-selectTool-icon: url(images/secondaryToolbarButton-selectTool-dark.svg);
-    --secondaryToolbarButton-handTool-icon: url(images/secondaryToolbarButton-handTool-dark.svg);
-    --secondaryToolbarButton-scrollVertical-icon: url(images/secondaryToolbarButton-scrollVertical-dark.svg);
-    --secondaryToolbarButton-scrollHorizontal-icon: url(images/secondaryToolbarButton-scrollHorizontal-dark.svg);
-    --secondaryToolbarButton-scrollWrapped-icon: url(images/secondaryToolbarButton-scrollWrapped-dark.svg);
-    --secondaryToolbarButton-spreadNone-icon: url(images/secondaryToolbarButton-spreadNone-dark.svg);
-    --secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd-dark.svg);
-    --secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven-dark.svg);
-    --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties-dark.svg);
   }
 }
 
@@ -1686,7 +1650,7 @@ html[dir="rtl"] #findInput {
 }
 #findInput[data-status="pending"] {
   background-image: url(images/loading.svg);
-  background-image: var(--loading-icon);
+  /*background-image: var(--loading-icon);*/
   background-repeat: no-repeat;
   background-position: 98%;
 }
@@ -1694,7 +1658,7 @@ html[dir="rtl"] #findInput {
 
   #findInput[data-status="pending"] {
   background-image: url(images/loading-dark.svg);
-  background-image: var(--loading-icon);
+  /*background-image: var(--loading-icon);*/
   }
 }
 html[dir="rtl"] #findInput[data-status="pending"] {
@@ -2342,7 +2306,7 @@ html[dir="rtl"] #toolbarViewerLeft > .toolbarButton:first-child {
   display: inline-block;
   top: 6px;
   content: url(images/toolbarButton-menuArrow.svg);
-  content: var(--toolbarButton-menuArrow-icon);
+  /*content: var(--toolbarButton-menuArrow-icon);*/
   pointer-events: none;
   max-width: 16px;
 }
@@ -2350,7 +2314,7 @@ html[dir="rtl"] #toolbarViewerLeft > .toolbarButton:first-child {
 
   .dropdownToolbarButton::after {
   content: url(images/toolbarButton-menuArrow-dark.svg);
-  content: var(--toolbarButton-menuArrow-icon);
+  /*content: var(--toolbarButton-menuArrow-icon);*/
   }
 }
 html[dir="ltr"] .dropdownToolbarButton::after {
@@ -2491,14 +2455,14 @@ html[dir="rtl"] .secondaryToolbarButton::before {
 
 .toolbarButton#sidebarToggle::before {
   content: url(images/toolbarButton-sidebarToggle.svg);
-  content: var(--toolbarButton-sidebarToggle-icon);
+  /*content: var(--toolbarButton-sidebarToggle-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton#sidebarToggle::before {
   content: url(images/toolbarButton-sidebarToggle-dark.svg);
-  content: var(--toolbarButton-sidebarToggle-icon);
+  /*content: var(--toolbarButton-sidebarToggle-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton#sidebarToggle::before {
@@ -2507,14 +2471,14 @@ html[dir="rtl"] .toolbarButton#sidebarToggle::before {
 
 .toolbarButton#secondaryToolbarToggle::before {
   content: url(images/toolbarButton-secondaryToolbarToggle.svg);
-  content: var(--toolbarButton-secondaryToolbarToggle-icon);
+  /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton#secondaryToolbarToggle::before {
   content: url(images/toolbarButton-secondaryToolbarToggle-dark.svg);
-  content: var(--toolbarButton-secondaryToolbarToggle-icon);
+  /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton#secondaryToolbarToggle::before {
@@ -2523,14 +2487,14 @@ html[dir="rtl"] .toolbarButton#secondaryToolbarToggle::before {
 
 .toolbarButton.findPrevious::before {
   content: url(images/findbarButton-previous.svg);
-  content: var(--findbarButton-previous-icon);
+  /*content: var(--findbarButton-previous-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.findPrevious::before {
   content: url(images/findbarButton-previous-dark.svg);
-  content: var(--findbarButton-previous-icon);
+  /*content: var(--findbarButton-previous-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton.findPrevious::before {
@@ -2539,14 +2503,14 @@ html[dir="rtl"] .toolbarButton.findPrevious::before {
 
 .toolbarButton.findNext::before {
   content: url(images/findbarButton-next.svg);
-  content: var(--findbarButton-next-icon);
+  /*content: var(--findbarButton-next-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.findNext::before {
   content: url(images/findbarButton-next-dark.svg);
-  content: var(--findbarButton-next-icon);
+  /*content: var(--findbarButton-next-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton.findNext::before {
@@ -2555,14 +2519,14 @@ html[dir="rtl"] .toolbarButton.findNext::before {
 
 .toolbarButton.pageUp::before {
   content: url(images/toolbarButton-pageUp.svg);
-  content: var(--toolbarButton-pageUp-icon);
+  /*content: var(--toolbarButton-pageUp-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.pageUp::before {
   content: url(images/toolbarButton-pageUp-dark.svg);
-  content: var(--toolbarButton-pageUp-icon);
+  /*content: var(--toolbarButton-pageUp-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton.pageUp::before {
@@ -2571,14 +2535,14 @@ html[dir="rtl"] .toolbarButton.pageUp::before {
 
 .toolbarButton.pageDown::before {
   content: url(images/toolbarButton-pageDown.svg);
-  content: var(--toolbarButton-pageDown-icon);
+  /*content: var(--toolbarButton-pageDown-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.pageDown::before {
   content: url(images/toolbarButton-pageDown-dark.svg);
-  content: var(--toolbarButton-pageDown-icon);
+  /*content: var(--toolbarButton-pageDown-icon);*/
   }
 }
 html[dir="rtl"] .toolbarButton.pageDown::before {
@@ -2587,131 +2551,131 @@ html[dir="rtl"] .toolbarButton.pageDown::before {
 
 .toolbarButton.zoomOut::before {
   content: url(images/toolbarButton-zoomOut.svg);
-  content: var(--toolbarButton-zoomOut-icon);
+  /*content: var(--toolbarButton-zoomOut-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.zoomOut::before {
   content: url(images/toolbarButton-zoomOut-dark.svg);
-  content: var(--toolbarButton-zoomOut-icon);
+  /*content: var(--toolbarButton-zoomOut-icon);*/
   }
 }
 
 .toolbarButton.zoomIn::before {
   content: url(images/toolbarButton-zoomIn.svg);
-  content: var(--toolbarButton-zoomIn-icon);
+  /*content: var(--toolbarButton-zoomIn-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.zoomIn::before {
   content: url(images/toolbarButton-zoomIn-dark.svg);
-  content: var(--toolbarButton-zoomIn-icon);
+  /*content: var(--toolbarButton-zoomIn-icon);*/
   }
 }
 
 .toolbarButton.presentationMode::before {
   content: url(images/toolbarButton-presentationMode.svg);
-  content: var(--toolbarButton-presentationMode-icon);
+  /*content: var(--toolbarButton-presentationMode-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.presentationMode::before {
   content: url(images/toolbarButton-presentationMode-dark.svg);
-  content: var(--toolbarButton-presentationMode-icon);
+  /*content: var(--toolbarButton-presentationMode-icon);*/
   }
 }
 
 .secondaryToolbarButton.presentationMode::before {
   content: url(images/toolbarButton-presentationMode.svg);
-  content: var(--toolbarButton-presentationMode-icon);
+  /*content: var(--toolbarButton-presentationMode-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.presentationMode::before {
   content: url(images/toolbarButton-presentationMode-dark.svg);
-  content: var(--toolbarButton-presentationMode-icon);
+  /*content: var(--toolbarButton-presentationMode-icon);*/
   }
 }
 
 .toolbarButton.print::before {
   content: url(images/toolbarButton-print.svg);
-  content: var(--toolbarButton-print-icon);
+  /*content: var(--toolbarButton-print-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.print::before {
   content: url(images/toolbarButton-print-dark.svg);
-  content: var(--toolbarButton-print-icon);
+  /*content: var(--toolbarButton-print-icon);*/
   }
 }
 
 .secondaryToolbarButton.print::before {
   content: url(images/toolbarButton-print.svg);
-  content: var(--toolbarButton-print-icon);
+  /*content: var(--toolbarButton-print-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.print::before {
   content: url(images/toolbarButton-print-dark.svg);
-  content: var(--toolbarButton-print-icon);
+  /*content: var(--toolbarButton-print-icon);*/
   }
 }
 
 .toolbarButton.openFile::before {
   content: url(images/toolbarButton-openFile.svg);
-  content: var(--toolbarButton-openFile-icon);
+  /*content: var(--toolbarButton-openFile-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.openFile::before {
   content: url(images/toolbarButton-openFile-dark.svg);
-  content: var(--toolbarButton-openFile-icon);
+  /*content: var(--toolbarButton-openFile-icon);*/
   }
 }
 
 .secondaryToolbarButton.openFile::before {
   content: url(images/toolbarButton-openFile.svg);
-  content: var(--toolbarButton-openFile-icon);
+  /*content: var(--toolbarButton-openFile-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.openFile::before {
   content: url(images/toolbarButton-openFile-dark.svg);
-  content: var(--toolbarButton-openFile-icon);
+  /*content: var(--toolbarButton-openFile-icon);*/
   }
 }
 
 .toolbarButton.download::before {
   content: url(images/toolbarButton-download.svg);
-  content: var(--toolbarButton-download-icon);
+  /*content: var(--toolbarButton-download-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.download::before {
   content: url(images/toolbarButton-download-dark.svg);
-  content: var(--toolbarButton-download-icon);
+  /*content: var(--toolbarButton-download-icon);*/
   }
 }
 
 .secondaryToolbarButton.download::before {
   content: url(images/toolbarButton-download.svg);
-  content: var(--toolbarButton-download-icon);
+  /*content: var(--toolbarButton-download-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.download::before {
   content: url(images/toolbarButton-download-dark.svg);
-  content: var(--toolbarButton-download-icon);
+  /*content: var(--toolbarButton-download-icon);*/
   }
 }
 
@@ -2727,53 +2691,53 @@ html[dir="rtl"] .toolbarButton.pageDown::before {
 
 .toolbarButton.bookmark::before {
   content: url(images/toolbarButton-bookmark.svg);
-  content: var(--toolbarButton-bookmark-icon);
+  /*content: var(--toolbarButton-bookmark-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .toolbarButton.bookmark::before {
   content: url(images/toolbarButton-bookmark-dark.svg);
-  content: var(--toolbarButton-bookmark-icon);
+  /*content: var(--toolbarButton-bookmark-icon);*/
   }
 }
 
 .secondaryToolbarButton.bookmark::before {
   content: url(images/toolbarButton-bookmark.svg);
-  content: var(--toolbarButton-bookmark-icon);
+  /*content: var(--toolbarButton-bookmark-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.bookmark::before {
   content: url(images/toolbarButton-bookmark-dark.svg);
-  content: var(--toolbarButton-bookmark-icon);
+  /*content: var(--toolbarButton-bookmark-icon);*/
   }
 }
 
 #viewThumbnail.toolbarButton::before {
   content: url(images/toolbarButton-viewThumbnail.svg);
-  content: var(--toolbarButton-viewThumbnail-icon);
+  /*content: var(--toolbarButton-viewThumbnail-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   #viewThumbnail.toolbarButton::before {
   content: url(images/toolbarButton-viewThumbnail-dark.svg);
-  content: var(--toolbarButton-viewThumbnail-icon);
+  /*content: var(--toolbarButton-viewThumbnail-icon);*/
   }
 }
 
 #viewOutline.toolbarButton::before {
   content: url(images/toolbarButton-viewOutline.svg);
-  content: var(--toolbarButton-viewOutline-icon);
+  /*content: var(--toolbarButton-viewOutline-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   #viewOutline.toolbarButton::before {
   content: url(images/toolbarButton-viewOutline-dark.svg);
-  content: var(--toolbarButton-viewOutline-icon);
+  /*content: var(--toolbarButton-viewOutline-icon);*/
   }
 }
 html[dir="rtl"] #viewOutline.toolbarButton::before {
@@ -2782,40 +2746,40 @@ html[dir="rtl"] #viewOutline.toolbarButton::before {
 
 #viewAttachments.toolbarButton::before {
   content: url(images/toolbarButton-viewAttachments.svg);
-  content: var(--toolbarButton-viewAttachments-icon);
+  /*content: var(--toolbarButton-viewAttachments-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   #viewAttachments.toolbarButton::before {
   content: url(images/toolbarButton-viewAttachments-dark.svg);
-  content: var(--toolbarButton-viewAttachments-icon);
+  /*content: var(--toolbarButton-viewAttachments-icon);*/
   }
 }
 
 #viewLayers.toolbarButton::before {
   content: url(images/toolbarButton-viewLayers.svg);
-  content: var(--toolbarButton-viewLayers-icon);
+  /*content: var(--toolbarButton-viewLayers-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   #viewLayers.toolbarButton::before {
   content: url(images/toolbarButton-viewLayers-dark.svg);
-  content: var(--toolbarButton-viewLayers-icon);
+  /*content: var(--toolbarButton-viewLayers-icon);*/
   }
 }
 
 #viewFind.toolbarButton::before {
   content: url(images/toolbarButton-search.svg);
-  content: var(--toolbarButton-search-icon);
+  /*content: var(--toolbarButton-search-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   #viewFind.toolbarButton::before {
   content: url(images/toolbarButton-search-dark.svg);
-  content: var(--toolbarButton-search-icon);
+  /*content: var(--toolbarButton-search-icon);*/
   }
 }
 
@@ -2867,170 +2831,170 @@ html[dir="rtl"] .secondaryToolbarButton > span {
 
 .secondaryToolbarButton.firstPage::before {
   content: url(images/secondaryToolbarButton-firstPage.svg);
-  content: var(--secondaryToolbarButton-firstPage-icon);
+  /*content: var(--secondaryToolbarButton-firstPage-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.firstPage::before {
   content: url(images/secondaryToolbarButton-firstPage-dark.svg);
-  content: var(--secondaryToolbarButton-firstPage-icon);
+  /*content: var(--secondaryToolbarButton-firstPage-icon);*/
   }
 }
 
 .secondaryToolbarButton.lastPage::before {
   content: url(images/secondaryToolbarButton-lastPage.svg);
-  content: var(--secondaryToolbarButton-lastPage-icon);
+  /*content: var(--secondaryToolbarButton-lastPage-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.lastPage::before {
   content: url(images/secondaryToolbarButton-lastPage-dark.svg);
-  content: var(--secondaryToolbarButton-lastPage-icon);
+  /*content: var(--secondaryToolbarButton-lastPage-icon);*/
   }
 }
 
 .secondaryToolbarButton.rotateCcw::before {
   content: url(images/secondaryToolbarButton-rotateCcw.svg);
-  content: var(--secondaryToolbarButton-rotateCcw-icon);
+  /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.rotateCcw::before {
   content: url(images/secondaryToolbarButton-rotateCcw-dark.svg);
-  content: var(--secondaryToolbarButton-rotateCcw-icon);
+  /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
   }
 }
 
 .secondaryToolbarButton.rotateCw::before {
   content: url(images/secondaryToolbarButton-rotateCw.svg);
-  content: var(--secondaryToolbarButton-rotateCw-icon);
+  /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.rotateCw::before {
   content: url(images/secondaryToolbarButton-rotateCw-dark.svg);
-  content: var(--secondaryToolbarButton-rotateCw-icon);
+  /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
   }
 }
 
 .secondaryToolbarButton.selectTool::before {
   content: url(images/secondaryToolbarButton-selectTool.svg);
-  content: var(--secondaryToolbarButton-selectTool-icon);
+  /*content: var(--secondaryToolbarButton-selectTool-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.selectTool::before {
   content: url(images/secondaryToolbarButton-selectTool-dark.svg);
-  content: var(--secondaryToolbarButton-selectTool-icon);
+  /*content: var(--secondaryToolbarButton-selectTool-icon);*/
   }
 }
 
 .secondaryToolbarButton.handTool::before {
   content: url(images/secondaryToolbarButton-handTool.svg);
-  content: var(--secondaryToolbarButton-handTool-icon);
+  /*content: var(--secondaryToolbarButton-handTool-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.handTool::before {
   content: url(images/secondaryToolbarButton-handTool-dark.svg);
-  content: var(--secondaryToolbarButton-handTool-icon);
+  /*content: var(--secondaryToolbarButton-handTool-icon);*/
   }
 }
 
 .secondaryToolbarButton.scrollVertical::before {
   content: url(images/secondaryToolbarButton-scrollVertical.svg);
-  content: var(--secondaryToolbarButton-scrollVertical-icon);
+  /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.scrollVertical::before {
   content: url(images/secondaryToolbarButton-scrollVertical-dark.svg);
-  content: var(--secondaryToolbarButton-scrollVertical-icon);
+  /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
   }
 }
 
 .secondaryToolbarButton.scrollHorizontal::before {
   content: url(images/secondaryToolbarButton-scrollHorizontal.svg);
-  content: var(--secondaryToolbarButton-scrollHorizontal-icon);
+  /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.scrollHorizontal::before {
   content: url(images/secondaryToolbarButton-scrollHorizontal-dark.svg);
-  content: var(--secondaryToolbarButton-scrollHorizontal-icon);
+  /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
   }
 }
 
 .secondaryToolbarButton.scrollWrapped::before {
   content: url(images/secondaryToolbarButton-scrollWrapped.svg);
-  content: var(--secondaryToolbarButton-scrollWrapped-icon);
+  /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.scrollWrapped::before {
   content: url(images/secondaryToolbarButton-scrollWrapped-dark.svg);
-  content: var(--secondaryToolbarButton-scrollWrapped-icon);
+  /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
   }
 }
 
 .secondaryToolbarButton.spreadNone::before {
   content: url(images/secondaryToolbarButton-spreadNone.svg);
-  content: var(--secondaryToolbarButton-spreadNone-icon);
+  /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.spreadNone::before {
   content: url(images/secondaryToolbarButton-spreadNone-dark.svg);
-  content: var(--secondaryToolbarButton-spreadNone-icon);
+  /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
   }
 }
 
 .secondaryToolbarButton.spreadOdd::before {
   content: url(images/secondaryToolbarButton-spreadOdd.svg);
-  content: var(--secondaryToolbarButton-spreadOdd-icon);
+  /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.spreadOdd::before {
   content: url(images/secondaryToolbarButton-spreadOdd-dark.svg);
-  content: var(--secondaryToolbarButton-spreadOdd-icon);
+  /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
   }
 }
 
 .secondaryToolbarButton.spreadEven::before {
   content: url(images/secondaryToolbarButton-spreadEven.svg);
-  content: var(--secondaryToolbarButton-spreadEven-icon);
+  /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.spreadEven::before {
   content: url(images/secondaryToolbarButton-spreadEven-dark.svg);
-  content: var(--secondaryToolbarButton-spreadEven-icon);
+  /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
   }
 }
 
 .secondaryToolbarButton.documentProperties::before {
   content: url(images/secondaryToolbarButton-documentProperties.svg);
-  content: var(--secondaryToolbarButton-documentProperties-icon);
+  /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
 }
 
 @media (prefers-color-scheme: dark) {
 
   .secondaryToolbarButton.documentProperties::before {
   content: url(images/secondaryToolbarButton-documentProperties-dark.svg);
-  content: var(--secondaryToolbarButton-documentProperties-icon);
+  /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
   }
 }
 
@@ -3140,7 +3104,7 @@ html[dir="rtl"] .toolbarField[type="checkbox"] {
 
 .toolbarField.pageNumber.visiblePageIsLoading {
   background-image: url(images/loading.svg);
-  background-image: var(--loading-icon);
+  /*background-image: var(--loading-icon);*/
   background-repeat: no-repeat;
   background-position: 3px;
 }
@@ -3149,7 +3113,7 @@ html[dir="rtl"] .toolbarField[type="checkbox"] {
 
   .toolbarField.pageNumber.visiblePageIsLoading {
   background-image: url(images/loading-dark.svg);
-  background-image: var(--loading-icon);
+  /*background-image: var(--loading-icon);*/
   }
 }
 
@@ -3381,7 +3345,7 @@ html[dir="rtl"] #layersView .treesItem > a > label {
 }
 .treeItemToggler::before {
   content: url(images/treeitem-expanded.svg);
-  content: var(--treeitem-expanded-icon);
+  /*content: var(--treeitem-expanded-icon);*/
   display: inline-block;
   position: absolute;
   max-width: 16px;
@@ -3390,19 +3354,19 @@ html[dir="rtl"] #layersView .treesItem > a > label {
 
   .treeItemToggler::before {
   content: url(images/treeitem-expanded-dark.svg);
-  content: var(--treeitem-expanded-icon);
+  /*content: var(--treeitem-expanded-icon);*/
   }
 }
 .treeItemToggler.treeItemsHidden::before {
   content: url(images/treeitem-collapsed.svg);
-  content: var(--treeitem-collapsed-icon);
+  /*content: var(--treeitem-collapsed-icon);*/
   max-width: 16px;
 }
 @media (prefers-color-scheme: dark) {
 
   .treeItemToggler.treeItemsHidden::before {
   content: url(images/treeitem-collapsed-dark.svg);
-  content: var(--treeitem-collapsed-icon);
+  /*content: var(--treeitem-collapsed-icon);*/
   }
 }
 html[dir="rtl"] .treeItemToggler.treeItemsHidden::before {

cps/static/js/caliBlur.js

@@ -412,7 +412,7 @@ if($("body.advsearch").length > 0) {
     $("#add-to-shelves").toggle();
   });
   $('#add-to-shelf').height("40px");
-  function dropdownToggle() {
+  function search_dropdownToggle() {
       topPos = $("#add-to-shelf").offset().top-20;
       if ($('div[aria-label="Add to shelves"]').length > 0) {
 
@@ -428,10 +428,10 @@ if($("body.advsearch").length > 0) {
       }
   }
 
-  dropdownToggle();
+  search_dropdownToggle();
 
   $(window).on("resize", function () {
-      dropdownToggle();
+      search_dropdownToggle();
   });
 
 }