From: Robert Kaiser Date: Sun, 20 Feb 2011 00:58:07 +0000 (+0100) Subject: Merge branch 'master' of linz:/srv/git/themes X-Git-Tag: EarlyBlue-2.1~39 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=e030399484eb750c8dd3e6a5f65e2bb2134dcf7f;hp=0c5f9076949973483283c7e935285c9abc476686 Merge branch 'master' of linz:/srv/git/themes --- diff --git a/EarlyBlue/global/notification.css b/EarlyBlue/global/notification.css index 7aa95c86..42f38eb9 100644 --- a/EarlyBlue/global/notification.css +++ b/EarlyBlue/global/notification.css @@ -54,7 +54,7 @@ notification[type="critical"] .messageImage { max-width: 248px; } -.popup-notification-menubutton { +.popup-notification-button-container { margin-top: 17px; } diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf index 48610be3..bec0b006 100644 --- a/EarlyBlue/install.rdf +++ b/EarlyBlue/install.rdf @@ -5,13 +5,13 @@ EarlyBlue@kairo.at - 2.1b2pre + 2.1b3pre {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} - 2.1b2pre + 2.1b3pre 2.1b3pre diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 9c42a58b..8d1e33de 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -67,6 +67,17 @@ menubar { #navigator-toolbox { } +#navigator-toolbox::after { + content: ""; + display: -moz-box; + -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ + height: 1px; +} +#navigator-toolbox[tabsontop=false]::after, +#main-window[disablechrome] #navigator-toolbox::after { + visibility: collapse; +} + #navigator-toolbox > toolbar:not(:-moz-lwtheme) { } @@ -90,8 +101,8 @@ menubar { visibility: visible; } -#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar)[iconsize="small"], -#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar)[defaulticonsize="small"]:not([iconsize]) { +#navigator-toolbox[iconsize="small"] > #nav-bar, +#navigator-toolbox > toolbar:not(#nav-bar):not(#toolbar-menubar):not(#TabsToolbar)[iconsize="small"] { padding-top: 1px; padding-bottom: 1px; } @@ -109,11 +120,6 @@ menubar { /* background-image: -moz-linear-gradient(@toolbarHighlight@, @toolbarHighlight@); */ } -#navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme), -#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme), -#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) { -} - #personal-bookmarks { min-height: 24px; } @@ -194,22 +200,32 @@ menubar { min-height: 1em; } +#appmenu-editmenu { + -moz-box-pack: end; +} + #appmenu_print, #appmenu_print_popup, .appmenu-edit-button, +#appmenu-editmenu-cut, +#appmenu-editmenu-copy, +#appmenu-editmenu-paste, #appmenu-quit { list-style-image: url("appmenu-icons.png"); } -#appmenu-cut { +#appmenu-cut, +#appmenu-editmenu-cut { -moz-image-region: rect(0 16px 16px 0); } -#appmenu-copy { +#appmenu-copy, +#appmenu-editmenu-copy { -moz-image-region: rect(0 32px 16px 16px); } -#appmenu-paste { +#appmenu-paste, +#appmenu-editmenu-paste { -moz-image-region: rect(0 48px 16px 32px); } @@ -423,6 +439,11 @@ menuitem.bookmark-item { /* ::::: small primary toolbar buttons ::::: */ +#nav-bar { + /* force iconsize="small" on this toolbar */ + counter-reset: smallicons; +} + toolbar[mode="text"] .toolbarbutton-1, toolbar[mode="icons"] .toolbarbutton-1, toolbar[iconsize="small"] .toolbarbutton-1, @@ -535,7 +556,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { border-bottom-left-radius: 0; } -toolbar:not([iconsize="small"])[mode="icons"] #back-button { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button { border-radius: 10000px; width: 30px; height: 30px; @@ -547,32 +568,33 @@ toolbar:not([iconsize="small"])[mode="icons"] #back-button { -moz-image-region: rect(18px, 20px, 38px, 0); } -toolbar:not([iconsize="small"])[mode="icons"] #back-button:not([disabled="true"]):not([checked="true"]):not(:active):hover { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover { } -toolbar:not([iconsize="small"])[mode="icons"] #back-button:not([disabled="true"]):hover:active { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover:active, +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] { } -toolbar:not([iconsize="small"])[mode="icons"][currentset*="unified-back-forward-button"], -#nav-bar:not([iconsize="small"])[mode="icons"]:not([currentset]) { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"], +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) { /* padding-top: 3px; padding-bottom: 5px; */ } -#navigator-toolbox[tabsontop="true"] > toolbar:not([iconsize="small"])[mode="icons"][currentset*="unified-back-forward-button"], -#navigator-toolbox[tabsontop="true"] > #nav-bar:not([iconsize="small"])[mode="icons"]:not([currentset]) { +#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"], +#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) { /* padding-top: 5px; */ } -toolbar:not([iconsize="small"])[mode="icons"] #forward-button { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button { /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask"); - -moz-margin-start: -6px; + -moz-margin-start: -6px !important; padding-left: 7px; padding-right: 3px; } -toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="true"]):not(:active):hover { +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover { /*mask: url(keyhole-forward-mask.svg#mask-hover);*/ mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask-hover"); } @@ -792,22 +814,6 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru -moz-margin-start: 3px; } -.urlbar-textbox-container { - border-radius: 3px 0 0 3px; - padding: 2px; -} - -.urlbar-frontcap { -/* margin-top: 2px; - margin-bottom: 2px; - margin-left: 2px; */ -} - -.searchbar-textbox { - border-radius: 3px; - padding: 2px; -} - #urlbar:-moz-lwtheme, .searchbar-textbox:-moz-lwtheme { /* background-color: rgba(255,255,255,.8); @@ -830,6 +836,10 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, -moz-box-align: stretch; } +.urlbar-textbox-container { + -moz-box-align: stretch; +} + #urlbar-icons { height: 18px; -moz-box-align: center; @@ -856,11 +866,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, -moz-margin-start: 0; } -.urlbar-frontcap-and-textbox { - direction: ltr; - -moz-box-align: stretch; -} - #urlbar-display { margin-top: -2px; margin-bottom: -2px; @@ -874,28 +879,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, color: #8050B0; } -/* over-link in location bar */ - -.urlbar-origin-label { - padding: 0 0 0 4px; - margin: 0; -} - -.urlbar-over-link-box { - position: relative; - right: 0; - color: #8050B0; - padding: 0 5px 0 18px; - min-height: 22px; - background: url("chrome://browser/skin/urlbar-over-link-arrow.png") no-repeat left center; -} - -.urlbar-over-link-host-label, -.urlbar-over-link-path-label { - padding: 0; - margin: 0; -} - /* identity box */ #identity-box { @@ -1076,6 +1059,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-image-region: rect(0px, 16px, 16px, 0px); } +#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + -moz-transform: scaleX(-1); +} + #go-button:hover { -moz-image-region: rect(16px, 16px, 32px, 0px); } @@ -1084,23 +1071,37 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #urlbar > toolbarbutton { list-style-image: url("chrome://browser/skin/reload-stop-go.png"); + margin: -2px; + -moz-margin-start: 0; padding: 0 3px; background-origin: border-box; border: none; - border-left: 1px solid #9C9CFF; + -moz-border-start: 1px solid #9C9CFF; +} + +#urlbar:-moz-locale-dir(ltr) > toolbarbutton { border-top-right-radius: 2px; border-bottom-right-radius: 2px; } +#urlbar:-moz-locale-dir(rtl) > toolbarbutton { + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; +} + #urlbar > toolbarbutton:not([disabled]):active:hover { - padding-left: 4px; - border-left: none; + -moz-padding-start: 4px; + -moz-border-start: none; } #urlbar-go-button { -moz-image-region: rect(0px, 56px, 14px, 42px); } +#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + -moz-transform: scaleX(-1); +} + #urlbar-go-button:hover { } @@ -1216,11 +1217,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- border-bottom: 1px solid #FF9F00; } -#tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > scrollbox:not(:-moz-lwtheme) { - margin-bottom: -1px; -} - -/* Tabs */ .tabbrowser-tab, .tabs-newtab-button { margin-top: 0px; @@ -1233,6 +1229,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tabbrowser-tab[selected="true"] { } +#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { +} + .tabbrowser-tab:-moz-lwtheme { } @@ -1298,6 +1297,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tab DnD indicator */ .tab-drop-indicator { list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png"); + margin-bottom: -11px; } /* Tab close button */ @@ -1352,13 +1352,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- padding-bottom: 0; } -.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"], -.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled="true"] { +.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], +.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] { opacity: .4; } -.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active, -.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled="true"]):hover:active { +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active, +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active { -moz-image-region: rect(0, 30px, 17px, 15px); } @@ -1374,6 +1374,34 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: #008484; } +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(ltr), +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(rtl) { + -moz-appearance: none; + -moz-border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 / 0 2px 0 0; + padding-right: 1px; +} + +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(ltr), +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(rtl) { + -moz-appearance: none; + -moz-border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 / 0 0 0 2px; + padding-left: 1px; +} + +@media all and (-moz-windows-classic) { + .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(ltr), + .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(rtl) { + padding-left: 4px; + padding-right: 2px; + } + + .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(ltr), + .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(rtl) { + padding-left: 2px; + padding-right: 4px; + } +} + .tabs-newtab-button > .toolbarbutton-icon { margin-top: -1px; margin-bottom: -1px; @@ -1591,10 +1619,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://browser/skin/Geolocation-64.png"); } -.geolocation-text-link { - margin-top: 17px; -} - .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-progress"], .popup-notification-icon[popupid="addon-install-cancelled"], @@ -1885,3 +1909,29 @@ panel[dimmed="true"] { #addonbar-closebutton:hover:active { list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); } + +/* Status panel */ + +.statuspanel-label { + margin: 0; + padding: 2px 4px; + background: -moz-linear-gradient(white, #ddd); + border: 1px none #9C9CFF; + border-top-style: solid; + color: #FF9F00; + text-shadow: none; +} + +.statuspanel-label:-moz-locale-dir(ltr):not([mirror]), +.statuspanel-label:-moz-locale-dir(rtl)[mirror] { + border-right-style: solid; + border-top-right-radius: .3em; + margin-right: 1em; +} + +.statuspanel-label:-moz-locale-dir(rtl):not([mirror]), +.statuspanel-label:-moz-locale-dir(ltr)[mirror] { + border-left-style: solid; + border-top-left-radius: .3em; + margin-left: 1em; +} diff --git a/LCARStrek/global/notification.css b/LCARStrek/global/notification.css index 9337cd3b..601b23d2 100644 --- a/LCARStrek/global/notification.css +++ b/LCARStrek/global/notification.css @@ -61,7 +61,7 @@ notification[type="critical"] .messageImage { max-width: 248px; } -.popup-notification-menubutton { +.popup-notification-button-container { margin-top: 17px; } diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf index 33403eab..1f6285d3 100644 --- a/LCARStrek/install.rdf +++ b/LCARStrek/install.rdf @@ -5,13 +5,13 @@ LCARStrek@kairo.at - 2.1b2pre + 2.1b3pre {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} - 2.1b2pre + 2.1b3pre 2.1b3pre @@ -19,7 +19,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 4.0b8 + 4.0b12 4.0.* diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index f59709f1..a8b94900 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -623,6 +623,12 @@ background-color: #008484; } +.addon-view[pending="enable"] .pending, +.addon-view[pending="upgrade"] .pending, +.addon-view[pending="install"] .pending { + color: #000000; +} + .addon-view[pending="disable"], .addon-view[pending="uninstall"] { color: #8050B0; diff --git a/LCARStrek/browser-old/aboutDialog.css b/LCARStrek/x-browser-old/aboutDialog.css similarity index 100% rename from LCARStrek/browser-old/aboutDialog.css rename to LCARStrek/x-browser-old/aboutDialog.css diff --git a/LCARStrek/browser-old/bookmarks/bookmarksManager.css b/LCARStrek/x-browser-old/bookmarks/bookmarksManager.css similarity index 100% rename from LCARStrek/browser-old/bookmarks/bookmarksManager.css rename to LCARStrek/x-browser-old/bookmarks/bookmarksManager.css diff --git a/LCARStrek/browser-old/bookmarks/move-disabled.gif b/LCARStrek/x-browser-old/bookmarks/move-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/move-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/move-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/move-hover.gif b/LCARStrek/x-browser-old/bookmarks/move-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/move-hover.gif rename to LCARStrek/x-browser-old/bookmarks/move-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/move.gif b/LCARStrek/x-browser-old/bookmarks/move.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/move.gif rename to LCARStrek/x-browser-old/bookmarks/move.gif diff --git a/LCARStrek/browser-old/bookmarks/new-bookmark-disabled.gif b/LCARStrek/x-browser-old/bookmarks/new-bookmark-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-bookmark-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/new-bookmark-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/new-bookmark-hover.gif b/LCARStrek/x-browser-old/bookmarks/new-bookmark-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-bookmark-hover.gif rename to LCARStrek/x-browser-old/bookmarks/new-bookmark-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/new-bookmark.gif b/LCARStrek/x-browser-old/bookmarks/new-bookmark.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-bookmark.gif rename to LCARStrek/x-browser-old/bookmarks/new-bookmark.gif diff --git a/LCARStrek/browser-old/bookmarks/new-folder-disabled.gif b/LCARStrek/x-browser-old/bookmarks/new-folder-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-folder-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/new-folder-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/new-folder-hover.gif b/LCARStrek/x-browser-old/bookmarks/new-folder-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-folder-hover.gif rename to LCARStrek/x-browser-old/bookmarks/new-folder-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/new-folder.gif b/LCARStrek/x-browser-old/bookmarks/new-folder.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-folder.gif rename to LCARStrek/x-browser-old/bookmarks/new-folder.gif diff --git a/LCARStrek/browser-old/bookmarks/new-seperator-disabled.gif b/LCARStrek/x-browser-old/bookmarks/new-seperator-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-seperator-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/new-seperator-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/new-seperator-hover.gif b/LCARStrek/x-browser-old/bookmarks/new-seperator-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-seperator-hover.gif rename to LCARStrek/x-browser-old/bookmarks/new-seperator-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/new-seperator.gif b/LCARStrek/x-browser-old/bookmarks/new-seperator.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/new-seperator.gif rename to LCARStrek/x-browser-old/bookmarks/new-seperator.gif diff --git a/LCARStrek/browser-old/bookmarks/properties-disabled.gif b/LCARStrek/x-browser-old/bookmarks/properties-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/properties-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/properties-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/properties-hover.gif b/LCARStrek/x-browser-old/bookmarks/properties-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/properties-hover.gif rename to LCARStrek/x-browser-old/bookmarks/properties-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/properties.gif b/LCARStrek/x-browser-old/bookmarks/properties.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/properties.gif rename to LCARStrek/x-browser-old/bookmarks/properties.gif diff --git a/LCARStrek/browser-old/bookmarks/rename-disabled.gif b/LCARStrek/x-browser-old/bookmarks/rename-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/rename-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/rename-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/rename-hover.gif b/LCARStrek/x-browser-old/bookmarks/rename-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/rename-hover.gif rename to LCARStrek/x-browser-old/bookmarks/rename-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/rename.gif b/LCARStrek/x-browser-old/bookmarks/rename.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/rename.gif rename to LCARStrek/x-browser-old/bookmarks/rename.gif diff --git a/LCARStrek/browser-old/bookmarks/trash-disabled.gif b/LCARStrek/x-browser-old/bookmarks/trash-disabled.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/trash-disabled.gif rename to LCARStrek/x-browser-old/bookmarks/trash-disabled.gif diff --git a/LCARStrek/browser-old/bookmarks/trash-hover.gif b/LCARStrek/x-browser-old/bookmarks/trash-hover.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/trash-hover.gif rename to LCARStrek/x-browser-old/bookmarks/trash-hover.gif diff --git a/LCARStrek/browser-old/bookmarks/trash.gif b/LCARStrek/x-browser-old/bookmarks/trash.gif similarity index 100% rename from LCARStrek/browser-old/bookmarks/trash.gif rename to LCARStrek/x-browser-old/bookmarks/trash.gif diff --git a/LCARStrek/browser-old/browser.css b/LCARStrek/x-browser-old/browser.css similarity index 100% rename from LCARStrek/browser-old/browser.css rename to LCARStrek/x-browser-old/browser.css diff --git a/LCARStrek/browser-old/browser.xml b/LCARStrek/x-browser-old/browser.xml similarity index 100% rename from LCARStrek/browser-old/browser.xml rename to LCARStrek/x-browser-old/browser.xml diff --git a/LCARStrek/browser-old/downloads/downloadmanager.css b/LCARStrek/x-browser-old/downloads/downloadmanager.css similarity index 100% rename from LCARStrek/browser-old/downloads/downloadmanager.css rename to LCARStrek/x-browser-old/downloads/downloadmanager.css diff --git a/LCARStrek/browser-old/icons/back-disabled.gif b/LCARStrek/x-browser-old/icons/back-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/back-disabled.gif rename to LCARStrek/x-browser-old/icons/back-disabled.gif diff --git a/LCARStrek/browser-old/icons/back-hover.gif b/LCARStrek/x-browser-old/icons/back-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/back-hover.gif rename to LCARStrek/x-browser-old/icons/back-hover.gif diff --git a/LCARStrek/browser-old/icons/back-small-disabled.gif b/LCARStrek/x-browser-old/icons/back-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/back-small-disabled.gif rename to LCARStrek/x-browser-old/icons/back-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/back-small-hover.gif b/LCARStrek/x-browser-old/icons/back-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/back-small-hover.gif rename to LCARStrek/x-browser-old/icons/back-small-hover.gif diff --git a/LCARStrek/browser-old/icons/back-small.gif b/LCARStrek/x-browser-old/icons/back-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/back-small.gif rename to LCARStrek/x-browser-old/icons/back-small.gif diff --git a/LCARStrek/browser-old/icons/back.gif b/LCARStrek/x-browser-old/icons/back.gif similarity index 100% rename from LCARStrek/browser-old/icons/back.gif rename to LCARStrek/x-browser-old/icons/back.gif diff --git a/LCARStrek/browser-old/icons/bookmark-folder-closed.gif b/LCARStrek/x-browser-old/icons/bookmark-folder-closed.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmark-folder-closed.gif rename to LCARStrek/x-browser-old/icons/bookmark-folder-closed.gif diff --git a/LCARStrek/browser-old/icons/bookmark-folder-open.gif b/LCARStrek/x-browser-old/icons/bookmark-folder-open.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmark-folder-open.gif rename to LCARStrek/x-browser-old/icons/bookmark-folder-open.gif diff --git a/LCARStrek/browser-old/icons/bookmark-group.gif b/LCARStrek/x-browser-old/icons/bookmark-group.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmark-group.gif rename to LCARStrek/x-browser-old/icons/bookmark-group.gif diff --git a/LCARStrek/browser-old/icons/bookmark-item.gif b/LCARStrek/x-browser-old/icons/bookmark-item.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmark-item.gif rename to LCARStrek/x-browser-old/icons/bookmark-item.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-disabled.gif b/LCARStrek/x-browser-old/icons/bookmarks-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-disabled.gif rename to LCARStrek/x-browser-old/icons/bookmarks-disabled.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-folder.gif b/LCARStrek/x-browser-old/icons/bookmarks-folder.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-folder.gif rename to LCARStrek/x-browser-old/icons/bookmarks-folder.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-hover.gif b/LCARStrek/x-browser-old/icons/bookmarks-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-hover.gif rename to LCARStrek/x-browser-old/icons/bookmarks-hover.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-small-disabled.gif b/LCARStrek/x-browser-old/icons/bookmarks-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-small-disabled.gif rename to LCARStrek/x-browser-old/icons/bookmarks-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-small-hover.gif b/LCARStrek/x-browser-old/icons/bookmarks-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-small-hover.gif rename to LCARStrek/x-browser-old/icons/bookmarks-small-hover.gif diff --git a/LCARStrek/browser-old/icons/bookmarks-small.gif b/LCARStrek/x-browser-old/icons/bookmarks-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks-small.gif rename to LCARStrek/x-browser-old/icons/bookmarks-small.gif diff --git a/LCARStrek/browser-old/icons/bookmarks.gif b/LCARStrek/x-browser-old/icons/bookmarks.gif similarity index 100% rename from LCARStrek/browser-old/icons/bookmarks.gif rename to LCARStrek/x-browser-old/icons/bookmarks.gif diff --git a/LCARStrek/browser-old/icons/copy-disabled.gif b/LCARStrek/x-browser-old/icons/copy-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy-disabled.gif rename to LCARStrek/x-browser-old/icons/copy-disabled.gif diff --git a/LCARStrek/browser-old/icons/copy-hover.gif b/LCARStrek/x-browser-old/icons/copy-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy-hover.gif rename to LCARStrek/x-browser-old/icons/copy-hover.gif diff --git a/LCARStrek/browser-old/icons/copy-small-disabled.gif b/LCARStrek/x-browser-old/icons/copy-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy-small-disabled.gif rename to LCARStrek/x-browser-old/icons/copy-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/copy-small-hover.gif b/LCARStrek/x-browser-old/icons/copy-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy-small-hover.gif rename to LCARStrek/x-browser-old/icons/copy-small-hover.gif diff --git a/LCARStrek/browser-old/icons/copy-small.gif b/LCARStrek/x-browser-old/icons/copy-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy-small.gif rename to LCARStrek/x-browser-old/icons/copy-small.gif diff --git a/LCARStrek/browser-old/icons/copy.gif b/LCARStrek/x-browser-old/icons/copy.gif similarity index 100% rename from LCARStrek/browser-old/icons/copy.gif rename to LCARStrek/x-browser-old/icons/copy.gif diff --git a/LCARStrek/browser-old/icons/cut-disabled.gif b/LCARStrek/x-browser-old/icons/cut-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut-disabled.gif rename to LCARStrek/x-browser-old/icons/cut-disabled.gif diff --git a/LCARStrek/browser-old/icons/cut-hover.gif b/LCARStrek/x-browser-old/icons/cut-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut-hover.gif rename to LCARStrek/x-browser-old/icons/cut-hover.gif diff --git a/LCARStrek/browser-old/icons/cut-small-disabled.gif b/LCARStrek/x-browser-old/icons/cut-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut-small-disabled.gif rename to LCARStrek/x-browser-old/icons/cut-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/cut-small-hover.gif b/LCARStrek/x-browser-old/icons/cut-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut-small-hover.gif rename to LCARStrek/x-browser-old/icons/cut-small-hover.gif diff --git a/LCARStrek/browser-old/icons/cut-small.gif b/LCARStrek/x-browser-old/icons/cut-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut-small.gif rename to LCARStrek/x-browser-old/icons/cut-small.gif diff --git a/LCARStrek/browser-old/icons/cut.gif b/LCARStrek/x-browser-old/icons/cut.gif similarity index 100% rename from LCARStrek/browser-old/icons/cut.gif rename to LCARStrek/x-browser-old/icons/cut.gif diff --git a/LCARStrek/browser-old/icons/downloads-disabled.gif b/LCARStrek/x-browser-old/icons/downloads-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads-disabled.gif rename to LCARStrek/x-browser-old/icons/downloads-disabled.gif diff --git a/LCARStrek/browser-old/icons/downloads-hover.gif b/LCARStrek/x-browser-old/icons/downloads-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads-hover.gif rename to LCARStrek/x-browser-old/icons/downloads-hover.gif diff --git a/LCARStrek/browser-old/icons/downloads-small-disabled.gif b/LCARStrek/x-browser-old/icons/downloads-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads-small-disabled.gif rename to LCARStrek/x-browser-old/icons/downloads-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/downloads-small-hover.gif b/LCARStrek/x-browser-old/icons/downloads-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads-small-hover.gif rename to LCARStrek/x-browser-old/icons/downloads-small-hover.gif diff --git a/LCARStrek/browser-old/icons/downloads-small.gif b/LCARStrek/x-browser-old/icons/downloads-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads-small.gif rename to LCARStrek/x-browser-old/icons/downloads-small.gif diff --git a/LCARStrek/browser-old/icons/downloads.gif b/LCARStrek/x-browser-old/icons/downloads.gif similarity index 100% rename from LCARStrek/browser-old/icons/downloads.gif rename to LCARStrek/x-browser-old/icons/downloads.gif diff --git a/LCARStrek/browser-old/icons/forward-disabled.gif b/LCARStrek/x-browser-old/icons/forward-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward-disabled.gif rename to LCARStrek/x-browser-old/icons/forward-disabled.gif diff --git a/LCARStrek/browser-old/icons/forward-hover.gif b/LCARStrek/x-browser-old/icons/forward-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward-hover.gif rename to LCARStrek/x-browser-old/icons/forward-hover.gif diff --git a/LCARStrek/browser-old/icons/forward-small-disabled.gif b/LCARStrek/x-browser-old/icons/forward-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward-small-disabled.gif rename to LCARStrek/x-browser-old/icons/forward-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/forward-small-hover.gif b/LCARStrek/x-browser-old/icons/forward-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward-small-hover.gif rename to LCARStrek/x-browser-old/icons/forward-small-hover.gif diff --git a/LCARStrek/browser-old/icons/forward-small.gif b/LCARStrek/x-browser-old/icons/forward-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward-small.gif rename to LCARStrek/x-browser-old/icons/forward-small.gif diff --git a/LCARStrek/browser-old/icons/forward.gif b/LCARStrek/x-browser-old/icons/forward.gif similarity index 100% rename from LCARStrek/browser-old/icons/forward.gif rename to LCARStrek/x-browser-old/icons/forward.gif diff --git a/LCARStrek/browser-old/icons/go-disabled.gif b/LCARStrek/x-browser-old/icons/go-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/go-disabled.gif rename to LCARStrek/x-browser-old/icons/go-disabled.gif diff --git a/LCARStrek/browser-old/icons/go-hover.gif b/LCARStrek/x-browser-old/icons/go-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/go-hover.gif rename to LCARStrek/x-browser-old/icons/go-hover.gif diff --git a/LCARStrek/browser-old/icons/go.gif b/LCARStrek/x-browser-old/icons/go.gif similarity index 100% rename from LCARStrek/browser-old/icons/go.gif rename to LCARStrek/x-browser-old/icons/go.gif diff --git a/LCARStrek/browser-old/icons/history-disabled.gif b/LCARStrek/x-browser-old/icons/history-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/history-disabled.gif rename to LCARStrek/x-browser-old/icons/history-disabled.gif diff --git a/LCARStrek/browser-old/icons/history-hover.gif b/LCARStrek/x-browser-old/icons/history-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/history-hover.gif rename to LCARStrek/x-browser-old/icons/history-hover.gif diff --git a/LCARStrek/browser-old/icons/history-small-disabled.gif b/LCARStrek/x-browser-old/icons/history-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/history-small-disabled.gif rename to LCARStrek/x-browser-old/icons/history-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/history-small-hover.gif b/LCARStrek/x-browser-old/icons/history-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/history-small-hover.gif rename to LCARStrek/x-browser-old/icons/history-small-hover.gif diff --git a/LCARStrek/browser-old/icons/history-small.gif b/LCARStrek/x-browser-old/icons/history-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/history-small.gif rename to LCARStrek/x-browser-old/icons/history-small.gif diff --git a/LCARStrek/browser-old/icons/history.gif b/LCARStrek/x-browser-old/icons/history.gif similarity index 100% rename from LCARStrek/browser-old/icons/history.gif rename to LCARStrek/x-browser-old/icons/history.gif diff --git a/LCARStrek/browser-old/icons/home-disabled.gif b/LCARStrek/x-browser-old/icons/home-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/home-disabled.gif rename to LCARStrek/x-browser-old/icons/home-disabled.gif diff --git a/LCARStrek/browser-old/icons/home-hover.gif b/LCARStrek/x-browser-old/icons/home-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/home-hover.gif rename to LCARStrek/x-browser-old/icons/home-hover.gif diff --git a/LCARStrek/browser-old/icons/home-small-disabled.gif b/LCARStrek/x-browser-old/icons/home-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/home-small-disabled.gif rename to LCARStrek/x-browser-old/icons/home-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/home-small-hover.gif b/LCARStrek/x-browser-old/icons/home-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/home-small-hover.gif rename to LCARStrek/x-browser-old/icons/home-small-hover.gif diff --git a/LCARStrek/browser-old/icons/home-small.gif b/LCARStrek/x-browser-old/icons/home-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/home-small.gif rename to LCARStrek/x-browser-old/icons/home-small.gif diff --git a/LCARStrek/browser-old/icons/home.gif b/LCARStrek/x-browser-old/icons/home.gif similarity index 100% rename from LCARStrek/browser-old/icons/home.gif rename to LCARStrek/x-browser-old/icons/home.gif diff --git a/LCARStrek/browser-old/icons/info.gif b/LCARStrek/x-browser-old/icons/info.gif similarity index 100% rename from LCARStrek/browser-old/icons/info.gif rename to LCARStrek/x-browser-old/icons/info.gif diff --git a/LCARStrek/browser-old/icons/new-tab-disabled.gif b/LCARStrek/x-browser-old/icons/new-tab-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab-disabled.gif rename to LCARStrek/x-browser-old/icons/new-tab-disabled.gif diff --git a/LCARStrek/browser-old/icons/new-tab-hover.gif b/LCARStrek/x-browser-old/icons/new-tab-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab-hover.gif rename to LCARStrek/x-browser-old/icons/new-tab-hover.gif diff --git a/LCARStrek/browser-old/icons/new-tab-small-disabled.gif b/LCARStrek/x-browser-old/icons/new-tab-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab-small-disabled.gif rename to LCARStrek/x-browser-old/icons/new-tab-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/new-tab-small-hover.gif b/LCARStrek/x-browser-old/icons/new-tab-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab-small-hover.gif rename to LCARStrek/x-browser-old/icons/new-tab-small-hover.gif diff --git a/LCARStrek/browser-old/icons/new-tab-small.gif b/LCARStrek/x-browser-old/icons/new-tab-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab-small.gif rename to LCARStrek/x-browser-old/icons/new-tab-small.gif diff --git a/LCARStrek/browser-old/icons/new-tab.gif b/LCARStrek/x-browser-old/icons/new-tab.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-tab.gif rename to LCARStrek/x-browser-old/icons/new-tab.gif diff --git a/LCARStrek/browser-old/icons/new-window-disabled.gif b/LCARStrek/x-browser-old/icons/new-window-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window-disabled.gif rename to LCARStrek/x-browser-old/icons/new-window-disabled.gif diff --git a/LCARStrek/browser-old/icons/new-window-hover.gif b/LCARStrek/x-browser-old/icons/new-window-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window-hover.gif rename to LCARStrek/x-browser-old/icons/new-window-hover.gif diff --git a/LCARStrek/browser-old/icons/new-window-small-disabled.gif b/LCARStrek/x-browser-old/icons/new-window-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window-small-disabled.gif rename to LCARStrek/x-browser-old/icons/new-window-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/new-window-small-hover.gif b/LCARStrek/x-browser-old/icons/new-window-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window-small-hover.gif rename to LCARStrek/x-browser-old/icons/new-window-small-hover.gif diff --git a/LCARStrek/browser-old/icons/new-window-small.gif b/LCARStrek/x-browser-old/icons/new-window-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window-small.gif rename to LCARStrek/x-browser-old/icons/new-window-small.gif diff --git a/LCARStrek/browser-old/icons/new-window.gif b/LCARStrek/x-browser-old/icons/new-window.gif similarity index 100% rename from LCARStrek/browser-old/icons/new-window.gif rename to LCARStrek/x-browser-old/icons/new-window.gif diff --git a/LCARStrek/browser-old/icons/page-themes.gif b/LCARStrek/x-browser-old/icons/page-themes.gif similarity index 100% rename from LCARStrek/browser-old/icons/page-themes.gif rename to LCARStrek/x-browser-old/icons/page-themes.gif diff --git a/LCARStrek/browser-old/icons/paste-disabled.gif b/LCARStrek/x-browser-old/icons/paste-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste-disabled.gif rename to LCARStrek/x-browser-old/icons/paste-disabled.gif diff --git a/LCARStrek/browser-old/icons/paste-hover.gif b/LCARStrek/x-browser-old/icons/paste-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste-hover.gif rename to LCARStrek/x-browser-old/icons/paste-hover.gif diff --git a/LCARStrek/browser-old/icons/paste-small-disabled.gif b/LCARStrek/x-browser-old/icons/paste-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste-small-disabled.gif rename to LCARStrek/x-browser-old/icons/paste-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/paste-small-hover.gif b/LCARStrek/x-browser-old/icons/paste-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste-small-hover.gif rename to LCARStrek/x-browser-old/icons/paste-small-hover.gif diff --git a/LCARStrek/browser-old/icons/paste-small.gif b/LCARStrek/x-browser-old/icons/paste-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste-small.gif rename to LCARStrek/x-browser-old/icons/paste-small.gif diff --git a/LCARStrek/browser-old/icons/paste.gif b/LCARStrek/x-browser-old/icons/paste.gif similarity index 100% rename from LCARStrek/browser-old/icons/paste.gif rename to LCARStrek/x-browser-old/icons/paste.gif diff --git a/LCARStrek/browser-old/icons/print-disabled.gif b/LCARStrek/x-browser-old/icons/print-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/print-disabled.gif rename to LCARStrek/x-browser-old/icons/print-disabled.gif diff --git a/LCARStrek/browser-old/icons/print-hover.gif b/LCARStrek/x-browser-old/icons/print-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/print-hover.gif rename to LCARStrek/x-browser-old/icons/print-hover.gif diff --git a/LCARStrek/browser-old/icons/print-small-disabled.gif b/LCARStrek/x-browser-old/icons/print-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/print-small-disabled.gif rename to LCARStrek/x-browser-old/icons/print-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/print-small-hover.gif b/LCARStrek/x-browser-old/icons/print-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/print-small-hover.gif rename to LCARStrek/x-browser-old/icons/print-small-hover.gif diff --git a/LCARStrek/browser-old/icons/print-small.gif b/LCARStrek/x-browser-old/icons/print-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/print-small.gif rename to LCARStrek/x-browser-old/icons/print-small.gif diff --git a/LCARStrek/browser-old/icons/print.gif b/LCARStrek/x-browser-old/icons/print.gif similarity index 100% rename from LCARStrek/browser-old/icons/print.gif rename to LCARStrek/x-browser-old/icons/print.gif diff --git a/LCARStrek/browser-old/icons/reload-disabled.gif b/LCARStrek/x-browser-old/icons/reload-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload-disabled.gif rename to LCARStrek/x-browser-old/icons/reload-disabled.gif diff --git a/LCARStrek/browser-old/icons/reload-hover.gif b/LCARStrek/x-browser-old/icons/reload-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload-hover.gif rename to LCARStrek/x-browser-old/icons/reload-hover.gif diff --git a/LCARStrek/browser-old/icons/reload-small-disabled.gif b/LCARStrek/x-browser-old/icons/reload-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload-small-disabled.gif rename to LCARStrek/x-browser-old/icons/reload-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/reload-small-hover.gif b/LCARStrek/x-browser-old/icons/reload-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload-small-hover.gif rename to LCARStrek/x-browser-old/icons/reload-small-hover.gif diff --git a/LCARStrek/browser-old/icons/reload-small.gif b/LCARStrek/x-browser-old/icons/reload-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload-small.gif rename to LCARStrek/x-browser-old/icons/reload-small.gif diff --git a/LCARStrek/browser-old/icons/reload.gif b/LCARStrek/x-browser-old/icons/reload.gif similarity index 100% rename from LCARStrek/browser-old/icons/reload.gif rename to LCARStrek/x-browser-old/icons/reload.gif diff --git a/LCARStrek/browser-old/icons/search-bar.gif b/LCARStrek/x-browser-old/icons/search-bar.gif similarity index 100% rename from LCARStrek/browser-old/icons/search-bar.gif rename to LCARStrek/x-browser-old/icons/search-bar.gif diff --git a/LCARStrek/browser-old/icons/secure.gif b/LCARStrek/x-browser-old/icons/secure.gif similarity index 100% rename from LCARStrek/browser-old/icons/secure.gif rename to LCARStrek/x-browser-old/icons/secure.gif diff --git a/LCARStrek/browser-old/icons/security-broken.gif b/LCARStrek/x-browser-old/icons/security-broken.gif similarity index 100% rename from LCARStrek/browser-old/icons/security-broken.gif rename to LCARStrek/x-browser-old/icons/security-broken.gif diff --git a/LCARStrek/browser-old/icons/stop-disabled.gif b/LCARStrek/x-browser-old/icons/stop-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop-disabled.gif rename to LCARStrek/x-browser-old/icons/stop-disabled.gif diff --git a/LCARStrek/browser-old/icons/stop-hover.gif b/LCARStrek/x-browser-old/icons/stop-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop-hover.gif rename to LCARStrek/x-browser-old/icons/stop-hover.gif diff --git a/LCARStrek/browser-old/icons/stop-small-disabled.gif b/LCARStrek/x-browser-old/icons/stop-small-disabled.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop-small-disabled.gif rename to LCARStrek/x-browser-old/icons/stop-small-disabled.gif diff --git a/LCARStrek/browser-old/icons/stop-small-hover.gif b/LCARStrek/x-browser-old/icons/stop-small-hover.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop-small-hover.gif rename to LCARStrek/x-browser-old/icons/stop-small-hover.gif diff --git a/LCARStrek/browser-old/icons/stop-small.gif b/LCARStrek/x-browser-old/icons/stop-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop-small.gif rename to LCARStrek/x-browser-old/icons/stop-small.gif diff --git a/LCARStrek/browser-old/icons/stop.gif b/LCARStrek/x-browser-old/icons/stop.gif similarity index 100% rename from LCARStrek/browser-old/icons/stop.gif rename to LCARStrek/x-browser-old/icons/stop.gif diff --git a/LCARStrek/browser-old/icons/throbber-small-stopped.gif b/LCARStrek/x-browser-old/icons/throbber-small-stopped.gif similarity index 100% rename from LCARStrek/browser-old/icons/throbber-small-stopped.gif rename to LCARStrek/x-browser-old/icons/throbber-small-stopped.gif diff --git a/LCARStrek/browser-old/icons/throbber-small.gif b/LCARStrek/x-browser-old/icons/throbber-small.gif similarity index 100% rename from LCARStrek/browser-old/icons/throbber-small.gif rename to LCARStrek/x-browser-old/icons/throbber-small.gif diff --git a/LCARStrek/browser-old/icons/throbber-stopped.gif b/LCARStrek/x-browser-old/icons/throbber-stopped.gif similarity index 100% rename from LCARStrek/browser-old/icons/throbber-stopped.gif rename to LCARStrek/x-browser-old/icons/throbber-stopped.gif diff --git a/LCARStrek/browser-old/icons/throbber.gif b/LCARStrek/x-browser-old/icons/throbber.gif similarity index 100% rename from LCARStrek/browser-old/icons/throbber.gif rename to LCARStrek/x-browser-old/icons/throbber.gif diff --git a/LCARStrek/browser-old/pref/advanced.gif b/LCARStrek/x-browser-old/pref/advanced.gif similarity index 100% rename from LCARStrek/browser-old/pref/advanced.gif rename to LCARStrek/x-browser-old/pref/advanced.gif diff --git a/LCARStrek/browser-old/pref/downloads.gif b/LCARStrek/x-browser-old/pref/downloads.gif similarity index 100% rename from LCARStrek/browser-old/pref/downloads.gif rename to LCARStrek/x-browser-old/pref/downloads.gif diff --git a/LCARStrek/browser-old/pref/extensions.gif b/LCARStrek/x-browser-old/pref/extensions.gif similarity index 100% rename from LCARStrek/browser-old/pref/extensions.gif rename to LCARStrek/x-browser-old/pref/extensions.gif diff --git a/LCARStrek/browser-old/pref/features.gif b/LCARStrek/x-browser-old/pref/features.gif similarity index 100% rename from LCARStrek/browser-old/pref/features.gif rename to LCARStrek/x-browser-old/pref/features.gif diff --git a/LCARStrek/browser-old/pref/general.gif b/LCARStrek/x-browser-old/pref/general.gif similarity index 100% rename from LCARStrek/browser-old/pref/general.gif rename to LCARStrek/x-browser-old/pref/general.gif diff --git a/LCARStrek/browser-old/pref/pref.css b/LCARStrek/x-browser-old/pref/pref.css similarity index 100% rename from LCARStrek/browser-old/pref/pref.css rename to LCARStrek/x-browser-old/pref/pref.css diff --git a/LCARStrek/browser-old/pref/privacy.gif b/LCARStrek/x-browser-old/pref/privacy.gif similarity index 100% rename from LCARStrek/browser-old/pref/privacy.gif rename to LCARStrek/x-browser-old/pref/privacy.gif diff --git a/LCARStrek/browser-old/pref/themes.gif b/LCARStrek/x-browser-old/pref/themes.gif similarity index 100% rename from LCARStrek/browser-old/pref/themes.gif rename to LCARStrek/x-browser-old/pref/themes.gif diff --git a/maketheme b/maketheme index 50cd459e..f9295a9b 100755 --- a/maketheme +++ b/maketheme @@ -26,34 +26,24 @@ THEME_DIR=$SCRIPT_DIR/$THEME_NAME/ WORK_DIR=$SCRIPT_DIR/$THEME_NAME.tmp/ XPI_FILE=$SCRIPT_DIR/$THEME_NAME.xpi -echo ensuring a clean work directory... +echo "Ensuring a clean work directory..." if [ -e $WORK_DIR ] ; then rm -rf $WORK_DIR/* fi mkdir -p $WORK_DIR/chrome -echo copying basic files.... -cp $THEME_DIR/install.rdf $THEME_DIR/icon.png $THEME_DIR/preview.png $WORK_DIR/ - -echo packing internal jar file... -cd $THEME_DIR -SUBDIRS= -for filename in *; do - if [ -d "$filename" ]; then - SUBDIRS="$SUBDIRS $filename" - fi -done -zip -rX0Dq $WORK_DIR/chrome/$THEME_NAME.jar $SUBDIRS +echo "Copying theme files..." +cp -a $THEME_DIR/* $WORK_DIR/ cd $WORK_DIR -echo adjusting manifest... -sed -e "s/skin \w* $THEME_NAME /\0jar:chrome\/$THEME_NAME.jar\!\//" $THEME_DIR/chrome.manifest > chrome.manifest +echo "Removing x-* files not intended for shipping..." +rm -rf x-* -echo creating new xpi file... +echo "Creating new xpi file..." if [ -e $XPI_FILE ] ; then rm $XPI_FILE fi zip -rX9Dq $XPI_FILE * -echo cleaning work directory... +echo "Cleaning work directory..." rm -rf $WORK_DIR