Minor: Use shared add-ons styling for Basilisk

* Fix-up errors * Remove add-ons style based on OmniSidebar
FranklinDM · Feb 8, 2019 · 12394a9 · 12394a9
1 parent fd3122f
commit 12394a9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 526 deletions.
diff --git a/chrome.manifest b/chrome.manifest
@@ -28,6 +28,7 @@ style       chrome://browser/content/history/history-panel.xul         chrome://
 
 overlay     about:addons                                               chrome://aios/content/addons.xul
 style       about:addons                                               chrome://browser/skin/browser.css
+style       about:addons                                               chrome://aios/skin/css/addons.css
 
 overlay     chrome://mozapps/content/xpinstall/xpinstallConfirm.xul    chrome://aios/content/addons_xpinstall.xul
 
@@ -47,7 +48,6 @@ overlay     chrome://global/content/console.xul                        chrome://
 style       chrome://aios/content/about.xul                            chrome://aios/skin/css/prefs.css
 
 # For Pale Moon
-style       about:addons                                               chrome://aios/skin/css/addons.css							application={8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}
 overlay     chrome://browser/content/web-panels.xul                    chrome://aios/content/multipanel_fixes.xul					application={8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}
 override    chrome://browser/content/downloads/indicatorOverlay.xul    chrome://aios/content/indicatorOverlay.xul					application={8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}
 
@@ -56,5 +56,4 @@ overlay     chrome://browser/content/browser.xul                       chrome://
 overlay     chrome://browser/content/web-panels.xul                    chrome://aios/content/australis/multipanel_fixes.xul			application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 override    chrome://browser/content/downloads/indicatorOverlay.xul    chrome://aios/content/australis/indicatorOverlay.xul			application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 style       chrome://browser/content/browser.xul                       chrome://aios/skin/css/aios_buttons_australis.css			application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-style       about:addons                                               chrome://aios/skin/css/addons_australis.css					application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 style       chrome://browser/content/web-panels.xul                    chrome://aios/skin/css/multipanel_australis.css				application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
diff --git a/content/addons.js b/content/addons.js
@@ -38,9 +38,16 @@ var AiOS_Addons = {
         document.getElementById("header-search").setAttribute("flex", "1");
 
         // Move toolbar with search box, etc.
-        before = document.getElementById("view-port-container");
+        before = document.getElementById("view-port-container") || document.getElementById("view-port");
         insertedElement = before.parentNode.insertBefore(document.getElementById("header"), before);
 
+        // Move the navigation bar (WebExAM)
+        if (AiOS_HELPER.usingCUI) {
+            document.getElementById("nav-header").setAttribute("modified", "true");
+            before = document.getElementById("show-all-extensions");
+            insertedElement = before.parentNode.insertBefore(document.getElementById("nav-header"), before);
+        }
+
         // Cut labels when searching without search results...
         document.getElementById("search-list-empty").childNodes[1].childNodes[0].setAttribute("crop", "end");
 

diff --git a/skin/css/addons.css b/skin/css/addons.css
@@ -11,9 +11,15 @@ page[aios-inSidebar] .view-pane > .list > scrollbox {
 /*
  * Navigation
  */
-page[aios-inSidebar] #nav-header {
+page[aios-inSidebar] #nav-header:not([modified]) {
 	display: none;
 }
+page[aios-inSidebar] #nav-header {
+    background: none;
+}
+page[aios-inSidebar] .nav-button {
+    margin: 0;
+}
 page[aios-inSidebar] > hbox {
 	-moz-box-orient: vertical;
 }
@@ -68,6 +74,7 @@ page[aios-inSidebar] #updates-container #close-btn {
 	display: block !important;
 }
 page[aios-inSidebar] .view-header {
+    margin: 0;
 	padding: 0 4px;
 	min-height: 0;
 }
@@ -78,6 +85,7 @@ page[aios-inSidebar] .search-filter-radio {
 	max-height: 18px;
 }
 page[aios-inSidebar] #search-filter {
+    margin: 0;
 	padding: 0;
 	font-size: 11px;
 }
@@ -213,6 +221,9 @@ page[aios-inSidebar] #detail-view {
 page[aios-inSidebar] #detail-view vbox {
 	font-size: 1em;
 }
+page[aios-inSidebar] #detail-view > .box-inherit {
+    margin: 0;
+}
 page[aios-inSidebar] #detail-view .detail-view-container {
 	padding: 10px;
 }
@@ -304,6 +315,7 @@ page[aios-inSidebar] #detail-view #detail-controls button {
 /*
  * Default theme styling
  */
+
 page[aios-inSidebar][aios-appDefTheme="true"] {
 	background-image: none;
 }
@@ -313,7 +325,7 @@ page[aios-inSidebar][aios-appDefTheme="true"] .addon:not([selected="true"]) {
 page[aios-inSidebar][aios-appDefTheme="true"] #categories {
 	border-top: none;
 	border-bottom: 1px solid ThreedShadow;
-	background-color: Menu;
+	background-color: -moz-field;
 }
 page[aios-inSidebar][aios-appDefTheme="true"] .category,
 page[aios-inSidebar][aios-appDefTheme="true"] .category:not([disabled]) {
@@ -328,10 +340,12 @@ page[aios-inSidebar][aios-appDefTheme="true"] .category:hover,
 page[aios-inSidebar][aios-appDefTheme="true"] .category:not([disabled]):hover {
 	background-color: #E0E8F6;
 }
+
 page[aios-inSidebar][aios-appDefTheme="true"] #header {
 	border-top: 1px solid ThreedHighlight;
 	border-bottom: 1px solid ThreedShadow;
 }
+/*
 page[aios-inSidebar][aios-appDefTheme="true"] #updates-container {
 	color: infotext;
 	background-color: infobackground;
@@ -422,3 +436,4 @@ page[aios-inSidebar][aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aio
 page[aios-inSidebar] richlistitem[type="user-script"] hbox.pending > vbox button:first-child {
 	display: none !important;
 }
+*/