1.7.6.1

Aris-t2 · May 29, 2018 · d259c12 · d259c12
1 parent 305aa92
commit d259c12
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 102 deletions.
diff --git a/updates.json b/updates.json
@@ -2,8 +2,8 @@
   "addons": {
     "ClassicThemeRestorer@ArisT2Noia4dev": {
       "updates": [
-        { "version": "1.7.6",
-          "update_link": "https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.6/CTR_v1.7.6.xpi",
+        { "version": "1.7.6.1",
+          "update_link": "https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.6/CTR_v1.7.6.1.xpi",
           "applications": {
             "gecko": { "strict_min_version": "45" }
 		  }

diff --git a/updates.rdf b/updates.rdf
@@ -9,15 +9,15 @@
 
         <RDF:li>
           <RDF:Description>
-            <em:version>1.7.6</em:version>
+            <em:version>1.7.6.1</em:version>
 
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>45.*</em:minVersion>
                 <em:maxVersion>62.*</em:maxVersion>
 
-                <em:updateLink>https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.6/CTR_v1.7.6.xpi</em:updateLink>
+                <em:updateLink>https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.6/CTR_v1.7.6.1.xpi</em:updateLink>
 
               </RDF:Description>
             </em:targetApplication>

diff --git a/xpi/content/css/linux/overlayextra.css b/xpi/content/css/linux/overlayextra.css
@@ -9,15 +9,6 @@
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/bookmarks-inv.png");
 	}
 
-	@media (min-resolution: 1.1dppx) {
-		#ctraddon_bookmarks-menu-toolbar-button:not(:-moz-lwtheme) .toolbarbutton-icon,
-		#ctraddon_bookmarks-button:not(:-moz-lwtheme) .toolbarbutton-icon{
-		  -moz-image-region: rect(0px, 32px, 32px, 0);
-		  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu.png);
-		  width: 16px !important;
-		}
-	}
-
 	/* fallback images for non-default theme */
 	#ctraddon_history-menu-toolbar-button,
 	#ctraddon_history-button {

diff --git a/xpi/content/css/win8/overlayextra.css b/xpi/content/css/win8/overlayextra.css
@@ -143,13 +143,13 @@
 		  list-style-image: url("chrome://classic_theme_restorer/content/images/[email protected]");
 		}
 
-		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 32px !important;
 		}
-		#main-window[defaultfxtheme="true"] #nav-bar #ctraddon_history-menu-toolbar-button .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-menu-toolbar-button,#ctraddon_bookmarks-menu-toolbar-button) .toolbarbutton-icon {
 		  width: 40px !important;
 		}
-		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 18px !important;
 		  height: 18px !important;
 		}
@@ -314,76 +314,6 @@
 										  ThreeDHighlight 28px, #f0f0f0 28px);
 	  }
 
-	  /* Hi-DPI overrides of the menu backgrounds, to adjust where the gutter line falls */
-	  /*@media (min-resolution: 1.25dppx) {
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup {
-		  background-image: linear-gradient(to right, white 22.4px, ThreeDLightShadow 22.4px,
-											ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-											ThreeDHighlight 24px, white 24px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup {
-		  background-image: linear-gradient(to right, #f0f0f0 22.4px, ThreeDLightShadow 22.4px,
-											ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-											ThreeDHighlight 24px, #f0f0f0 24px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, white 22.4px, ThreeDLightShadow 22.4px,
-											ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-											ThreeDHighlight 24px, white 24px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, #f0f0f0 22.4px, ThreeDLightShadow 22.4px,
-											ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-											ThreeDHighlight 24px, #f0f0f0 24px);
-		}
-	  }
-
-	  @media (min-resolution: 1.5dppx) {
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup {
-		  background-image: linear-gradient(to right, white 20.6667px, ThreeDLightShadow 20.6667px,
-											ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-											ThreeDHighlight 22px, white 22px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup {
-		  background-image: linear-gradient(to right, #f0f0f0 20.6667px, ThreeDLightShadow 20.6667px,
-											ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-											ThreeDHighlight 22px, #f0f0f0 22px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, white 20.6667px, ThreeDLightShadow 20.6667px,
-											ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-											ThreeDHighlight 22px, white 22px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, #f0f0f0 20.6667px, ThreeDLightShadow 20.6667px,
-											ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-											ThreeDHighlight 22px, #f0f0f0 22px);
-		}
-	  }
-
-	  @media (min-resolution: 2dppx) {
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup {
-		  background-image: linear-gradient(to right, white 19.5px, ThreeDLightShadow 19.5px,
-											ThreeDLightShadow 20px, ThreeDHighlight 20px,
-											ThreeDHighlight 20.5px, white 20.5px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup {
-		  background-image: linear-gradient(to right, #f0f0f0 19.5px, ThreeDLightShadow 19.5px,
-											ThreeDLightShadow 20px, ThreeDHighlight 20px,
-											ThreeDHighlight 20.5px, #f0f0f0 20.5px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, white 19.5px, ThreeDLightShadow 19.5px,
-											ThreeDLightShadow 20px, ThreeDHighlight 20px,
-											ThreeDHighlight 20.5px, white 20.5px);
-		}
-		#main-window[defaultfxtheme="true"] #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-		  background-image: linear-gradient(to left, #f0f0f0 19.5px, ThreeDLightShadow 19.5px,
-											ThreeDLightShadow 20px, ThreeDHighlight 20px,
-											ThreeDHighlight 20.5px, #f0f0f0 20.5px);
-		}
-	  }*/
-
 	  #main-window[defaultfxtheme="true"] #appmenuPrimaryPane > menuseparator {
 		-moz-appearance: none;
 		margin-top: 3px;

diff --git a/xpi/content/css/winaero/overlayextra.css b/xpi/content/css/winaero/overlayextra.css
@@ -12,12 +12,12 @@
 	@media (min-resolution: 1.1dppx) {
 		#ctraddon_bookmarks-menu-toolbar-button:not(:-moz-lwtheme) .toolbarbutton-icon,
 		#ctraddon_bookmarks-button:not(:-moz-lwtheme) .toolbarbutton-icon{
-		  -moz-image-region: rect(0px, 32px, 32px, 0);
-		  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu.png);
+		  -moz-image-region: rect(0px, 32px, 32px, 0) !important;
+		  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu.png) !important;
 		  width: 16px !important;
 		}
 	}
-
+	
 	/* fallback images for non-default theme */
 	#ctraddon_history-menu-toolbar-button,
 	#ctraddon_history-button {
@@ -127,13 +127,13 @@
 		  list-style-image: url("chrome://classic_theme_restorer/content/images/[email protected]");
 		}
 
-		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 32px !important;
 		}
-		#main-window[defaultfxtheme="true"] #nav-bar #ctraddon_history-menu-toolbar-button .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-menu-toolbar-button,#ctraddon_bookmarks-menu-toolbar-button) .toolbarbutton-icon {
 		  width: 40px !important;
 		}
-		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 18px !important;
 		  height: 18px !important;
 		}
@@ -531,4 +531,6 @@
 	/* disable window dragging feature for menu bar and tab bar in customizing mode, if springs, seperators or spacers are on them */
 	#main-window[tabsintitlebar][customizing="true"] :-moz-any(#toolbar-menubar,#TabsToolbar):-moz-any([currentset*="customizableui-special-spring"],[currentset*="customizableui-special-separator"],[currentset*="customizableui-special-spacer"]){
 	  -moz-window-dragging: no-drag !important;
-	}
+	}
+
+
diff --git a/xpi/content/css/winxp/overlayextra.css b/xpi/content/css/winxp/overlayextra.css
@@ -112,13 +112,13 @@
 		  list-style-image: url("chrome://classic_theme_restorer/content/images/[email protected]");
 		}
 
-		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-button,/*#ctraddon_history-menu-toolbar-button,*/#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 32px !important;
 		}
-		#main-window[defaultfxtheme="true"] #nav-bar #ctraddon_history-menu-toolbar-button .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] #nav-bar :-moz-any(#ctraddon_history-menu-toolbar-button,#ctraddon_bookmarks-menu-toolbar-button) .toolbarbutton-icon {
 		  width: 40px !important;
 		}
-		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button) .toolbarbutton-icon {
+		#main-window[defaultfxtheme="true"] toolbar:not(#nav-bar) :-moz-any(#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_go-button,#ctraddon_preferences-button,#ctraddon_restart-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button) .toolbarbutton-icon {
 		  width: 18px !important;
 		  height: 18px !important;
 		}

diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
@@ -523,11 +523,11 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/[email protected]);
 	}
 
-	#ctraddon_bookmarks-menu-toolbar-button[cui-areatype="menu-panel"]  dropmarker,
+	#ctraddon_bookmarks-menu-toolbar-button[cui-areatype="menu-panel"] dropmarker,
 	toolbarpaletteitem[place="palette"] > #ctraddon_bookmarks-menu-toolbar-button  dropmarker,
-	#ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"]  dropmarker,
-	toolbarpaletteitem[place="palette"] > #ctraddon_history-menu-toolbar-button  dropmarker{
-	  visibility:collapse;
+	#ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] dropmarker,
+	toolbarpaletteitem[place="palette"] > #ctraddon_history-menu-toolbar-button dropmarker{
+	  visibility: collapse;
 	}
 	#ctraddon_bookmarks-menu-toolbar-button[cui-areatype="menu-panel"],
 	#ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] {

diff --git a/xpi/install.rdf b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.7.6</em:version>
+		<em:version>1.7.6.1</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
@@ -19,7 +19,7 @@
 			</Description>
 		</em:targetApplication>
 
-		<em:updateURL>https://raw.githubusercontent.com/Aris-t2/ClassicThemeRestorer/master/updates.json</em:updateURL>
+		<em:updateURL>https://raw.githubusercontent.com/Aris-t2/ClassicThemeRestorer/master/updates.rdf</em:updateURL>
 
 		<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
 		<em:homepageURL>https://github.com/Aris-t2/ClassicThemeRestorer/</em:homepageURL>