From: Robert Kaiser Date: Mon, 22 Aug 2011 02:44:31 +0000 (+0200) Subject: update both themes to the state of SeaMonkey 2.3 and Firefox 6 X-Git-Tag: LCARStrek-2.3~2 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=f993773df903b31f33af331dc3fbd4394beed74d;p=themes.git update both themes to the state of SeaMonkey 2.3 and Firefox 6 --- diff --git a/EarlyBlue/communicator/bookmarks/editBookmarkOverlay.css b/EarlyBlue/communicator/bookmarks/editBookmarkOverlay.css index 50aa4b41..34e3e250 100644 --- a/EarlyBlue/communicator/bookmarks/editBookmarkOverlay.css +++ b/EarlyBlue/communicator/bookmarks/editBookmarkOverlay.css @@ -77,33 +77,6 @@ margin-bottom: 2px; } - -/**** name picker ****/ - -/* Make the microsummary picker look like a regular textbox instead of - * an editable menulist when no microsummaries are available. - */ -#editBMPanel_namePicker[droppable="false"] { - /* These rules come from the textbox element in textbox.css. */ - cursor: text; - margin: 2px 3px; - border: 1px inset #CCD0DD; - padding: 1px 0px; - -moz-padding-start: 2px; - background-color: #FFFFFF; - color: #000000; - min-height: 19px; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-editable-box { - padding: 0; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker, -#editBMPanel_namePicker[droppable="false"] > menupopup { - display: none; -} - /* Hide the value column of the tag autocomplete popup * leaving only the comment column visible. This is * so that only the tag being edited is shown in the diff --git a/EarlyBlue/global/colorpicker.css b/EarlyBlue/global/colorpicker.css index d0d268ac..cb24e789 100644 --- a/EarlyBlue/global/colorpicker.css +++ b/EarlyBlue/global/colorpicker.css @@ -67,20 +67,20 @@ colorpicker[type="button"][open="true"] { /* ::::: colorpicker tiles ::::: */ .colorpickertile { - width : 20px; - height : 20px; - margin : 1px; - border : 1px inset #CCD0DD; + width: 20px; + height: 20px; + margin: 1px; + border: 1px inset #CCD0DD; } .colorpickertile[selected="true"] { - border : 1px solid #000000; + border: 1px solid #000000; } .colorpickertile[hover="true"] { - border : 1px solid #FFFFFF; + border: 1px solid #FFFFFF; } .cp-light[hover="true"] { - border : 2px dotted #9999CC; + border: 2px dotted #9999CC; } diff --git a/EarlyBlue/global/webConsole.css b/EarlyBlue/global/webConsole.css index ade85f34..8ba4ff74 100644 --- a/EarlyBlue/global/webConsole.css +++ b/EarlyBlue/global/webConsole.css @@ -308,3 +308,14 @@ padding: 1px 0px; -moz-box-align: center; } + +.web-console-panel { + -moz-appearance: none; + background-color: white; +} + +.web-console-panel > .hud-box { + height: 100%; + width: 100%; + background-color: white; +} diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf index d415a836..7533769d 100644 --- a/EarlyBlue/install.rdf +++ b/EarlyBlue/install.rdf @@ -5,13 +5,13 @@ EarlyBlue@kairo.at - 2.2 + 2.3 {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} - 2.2 + 2.3 2.6a1 diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index c97408c8..f650d2dc 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -115,6 +115,11 @@ } } +/*** global informations ***/ +#addons-page .global-info-container { + background-color: #9C9CFF; +} + /* Plugins aren't yet disabled by safemode (bug 342333), so don't show that warning when viewing plugins. */ #addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, @@ -279,19 +284,19 @@ #category-discover > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); } -#category-languages > .category-icon { +#category-locale > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); } -#category-searchengines > .category-icon { +#category-searchengine > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); } -#category-extensions > .category-icon { +#category-extension > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); } -#category-themes > .category-icon { +#category-theme > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); } -#category-plugins > .category-icon { +#category-plugin > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); } #category-availableUpdates > .category-icon { diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css index e0b6f2ad..1ecac655 100644 --- a/EarlyBlue/mozapps/plugins/pluginProblem.css +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -3,14 +3,14 @@ /* These styles affect only the bound element, not other page content. */ .mainBox { - text-align: center; - background-color: #CCD0DD; - color: #000000; - border-radius: 12px; - /* recessed effect with 'disabled' shadow */ - box-shadow: inset 0 1px 5px #808080; - padding: 5px; - -moz-user-select: none; + text-align: center; + background-color: #CCD0DD; + color: #000000; + border-radius: 12px; + /* recessed effect with 'disabled' shadow */ + box-shadow: inset 0 1px 5px #808080; + padding: 5px; + -moz-user-select: none; } html|a { @@ -18,48 +18,51 @@ html|a { } .icon { - min-width: 48px; - min-height: 48px; - background-position: center; - background-repeat: no-repeat; + min-width: 48px; + min-height: 48px; + background-position: center; + background-repeat: no-repeat; } :-moz-type-unsupported .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); +} +:-moz-type-unsupported .icon[status="ready"] { + background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } :-moz-handler-disabled .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); } :-moz-handler-blocked .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); } :-moz-handler-crashed .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginCrashed.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginCrashed.png"); } .throbber { - padding-left: 16px; /* width of the background image */ - background: url("chrome://global/skin/icons/loading.gif") no-repeat; - margin-left: 5px; + padding-left: 16px; /* width of the background image */ + background: url("chrome://global/skin/icons/loading.gif") no-repeat; + margin-left: 5px; } .msg { - font-size: 12px; - cursor: default; + font-size: 12px; + cursor: default; } .submitStatus div { - min-height: 19px; /* height of biggest line (with throbber) */ + min-height: 19px; /* height of biggest line (with throbber) */ } .msgBottomLinks { - padding-left: 2px; - padding-right: 2px; + padding-left: 2px; + padding-right: 2px; } .helpIcon { - float: left; - display: inline-block; - min-width: 16px; - min-height: 16px; - background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; + float: left; + display: inline-block; + min-width: 16px; + min-height: 16px; + background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 708a139c..a03b3a86 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1227,7 +1227,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, #identity-box:-moz-focusring { outline: 1px dotted #008484; - outline-offset: -3px; + outline-offset: -1px; } #identity-box.verifiedDomain:-moz-focusring, @@ -1238,7 +1238,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, #identity-icon-labels { -moz-margin-start: 1px; -moz-margin-end: 3px; - -moz-transform: translate(0, -1px); } /* Location bar dropmarker */ @@ -1264,7 +1263,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, width: 24px; height: 18px; padding: 1px 4px; - background: url("urlbar-favicon-glow.png") center center no-repeat; } #page-proxy-favicon:not([src]) { @@ -1481,6 +1479,41 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- min-width: 27em; } +.panel-promo-box { + margin: 8px -16px -16px -16px; + padding: 8px 16px; + background-color: #000000; + color: #FF9F00; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + border-top: 1px solid #9C9CFF; +} + +.panel-promo-icon { + list-style-image: url("chrome://browser/skin/sync-notification-24.png"); + -moz-margin-end: 10px; + vertical-align: middle; +} + +.panel-promo-closebutton { + list-style-image: url("chrome://global/skin/icons/close-button.gif"); + -moz-margin-end: -10px; + margin-top: -5px; +} + +.panel-promo-closebutton:hover { + list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); +} + +.panel-promo-closebutton:hover:active { + list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); +} + +.panel-promo-closebutton > .toolbarbutton-text { + padding: 0; + margin: 0; +} + /* ::::: content area ::::: */ #sidebar { @@ -1944,7 +1977,25 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { /* Notification icon box */ #notification-popup-box { - margin: 0 3px; + position: relative; + background-color: #000000; + background-clip: padding-box; + padding-left: 3px; + border-radius: 2.5px 0 0 2.5px; + -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0; + -moz-margin-end: -8px; + margin-top: -2px; + margin-bottom: -2px; +} + +#notification-popup-box:not([hidden]) + #identity-box { + -moz-padding-start: 10px; + border-radius: 0; +} + +#notification-popup-box:-moz-locale-dir(rtl), +.notification-anchor-icon:-moz-locale-dir(rtl) { + -moz-transform: scaleX(-1); } .notification-anchor-icon { diff --git a/LCARStrek/browser/places/editBookmarkOverlay.css b/LCARStrek/browser/places/editBookmarkOverlay.css index 0d8eaf00..20bd2072 100644 --- a/LCARStrek/browser/places/editBookmarkOverlay.css +++ b/LCARStrek/browser/places/editBookmarkOverlay.css @@ -89,34 +89,6 @@ margin-bottom: 2px; } -/**** name picker ****/ - -/* Make the microsummary picker look like a regular textbox instead of - * an editable menulist when no microsummaries are available. - */ -#editBMPanel_namePicker[droppable="false"] { - /* These rules come from the textbox element in textbox.css. */ - border-radius: 3px; - -moz-outline-radius: 5px; - cursor: text; - margin: 1px 2px; - border: 1px solid #9C9CFF; - padding: 1px 0px; - -moz-padding-start: 2px; - background-color: #000000; - color: #E7ADE7; - min-height: 19px; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-editable-box { - padding: 0; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker, -#editBMPanel_namePicker[droppable="false"] > menupopup { - display: none; -} - /* Hide the value column of the tag autocomplete popup * leaving only the comment column visible. This is * so that only the tag being edited is shown in the diff --git a/LCARStrek/browser/preferences/aboutPermissions.css b/LCARStrek/browser/preferences/aboutPermissions.css new file mode 100644 index 00000000..eda69e09 --- /dev/null +++ b/LCARStrek/browser/preferences/aboutPermissions.css @@ -0,0 +1,102 @@ +/* background styles borrowed from extensions.css */ +#permissions-page { + background-color: #000000; + color: #FF9F00; + margin: 20px; +} + +#permissions-content { + border: 1px solid #9C9CFF; + border-radius: 5px; +} + +/* sites box */ + +#sites-box { + padding: 10px; + width: 25em; +} + +.site { + padding: 4px; + border-bottom: 1px solid #9C9CFF; +} + +.site-favicon { + height: 16px; + width: 16px; + -moz-margin-end: 4px; + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); +} + +#all-sites-item > .site-container > .site-favicon { + list-style-image: none; +} + +/* permissions box */ + +#permissions-box { + padding-top: 10px; + overflow-y: auto; +} + +#site-description { + font-size: 125%; + -moz-margin-start: 6px; /* to match button margin */ +} + +#site-label { + font-weight: bold; + margin-top: 0; + margin-bottom: 0; +} + +#defaults-description { + font-size: 125%; + font-weight: bold; + -moz-margin-start: 6px; +} + +.pref-item { + margin-bottom: 10px; +} + +.pref-icon { + width: 36px; + height: 36px; + -moz-margin-end: 10px; +} + +.pref-icon[type="password"] { + list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png"); +} +.pref-icon[type="cookie"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} +.pref-icon[type="geo"] { + list-style-image: url("chrome://browser/skin/Geolocation-64.png"); +} +.pref-icon[type="indexedDB"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} +.pref-icon[type="install"] { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); +} +.pref-icon[type="popup"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} +.pref-icon[type="image"] { + list-style-image: url("chrome://global/skin/icons/alert-question.gif"); +} + +.pref-title { + font-size: 125%; + margin-bottom: 0; + font-weight: bold; +} + +.pref-menulist { + margin-left: 6px; + margin-right: 6px; + min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */ +} diff --git a/LCARStrek/browser/sync-notification-24.png b/LCARStrek/browser/sync-notification-24.png new file mode 100644 index 00000000..fe7f9180 Binary files /dev/null and b/LCARStrek/browser/sync-notification-24.png differ diff --git a/LCARStrek/browser/urlbar-arrow.png b/LCARStrek/browser/urlbar-arrow.png new file mode 100644 index 00000000..979ce3fc Binary files /dev/null and b/LCARStrek/browser/urlbar-arrow.png differ diff --git a/LCARStrek/communicator/bookmarks/editBookmarkOverlay.css b/LCARStrek/communicator/bookmarks/editBookmarkOverlay.css index c4558553..49e71dd8 100644 --- a/LCARStrek/communicator/bookmarks/editBookmarkOverlay.css +++ b/LCARStrek/communicator/bookmarks/editBookmarkOverlay.css @@ -85,35 +85,6 @@ margin-bottom: 2px; } - -/**** name picker ****/ - -/* Make the microsummary picker look like a regular textbox instead of - * an editable menulist when no microsummaries are available. - */ -#editBMPanel_namePicker[droppable="false"] { - /* These rules come from the textbox element in textbox.css. */ - border-radius: 3px; - -moz-outline-radius: 5px; - cursor: text; - margin: 1px 2px; - border: 1px solid #9C9CFF; - padding: 1px 0px; - -moz-padding-start: 2px; - background-color: #000000; - color: #E7ADE7; - min-height: 19px; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-editable-box { - padding: 0; -} - -#editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker, -#editBMPanel_namePicker[droppable="false"] > menupopup { - display: none; -} - /* Hide the value column of the tag autocomplete popup * leaving only the comment column visible. This is * so that only the tag being edited is shown in the diff --git a/LCARStrek/global/webConsole.css b/LCARStrek/global/webConsole.css index 88608089..b5f125f5 100644 --- a/LCARStrek/global/webConsole.css +++ b/LCARStrek/global/webConsole.css @@ -308,3 +308,14 @@ padding: 1px 0px; -moz-box-align: center; } + +.web-console-panel { + -moz-appearance: none; + background-color: black; +} + +.web-console-panel > .hud-box { + height: 100%; + width: 100%; + background-color: black; +} diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf index 4d4aeafc..3b1c3e39 100644 --- a/LCARStrek/install.rdf +++ b/LCARStrek/install.rdf @@ -5,13 +5,13 @@ LCARStrek@kairo.at - 2.2 + 2.3 {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} - 2.2 + 2.3 2.6a1 @@ -19,7 +19,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 5.0 + 6.0 9.0a1 diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index a9e58c50..9e5a783a 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -100,7 +100,7 @@ #detail-view .global-warning { padding: 4px 12px; - border-bottom: 3px solid #000000; + border-bottom: 3px solid #000000; } @media all and (max-width: 600px) { @@ -115,6 +115,13 @@ } } +/*** global informations ***/ +#addons-page .global-info-container { + background-color: #9C9CFF; + border-top-right-radius: 5px; + border-top-left-radius: 5px; +} + /* Plugins aren't yet disabled by safemode (bug 342333), so don't show that warning when viewing plugins. */ #addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, @@ -289,19 +296,19 @@ #category-discover > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); } -#category-languages > .category-icon { +#category-locale > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); } -#category-searchengines > .category-icon { +#category-searchengine > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); } -#category-extensions > .category-icon { +#category-extension > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); } -#category-themes > .category-icon { +#category-theme > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); } -#category-plugins > .category-icon { +#category-plugin > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); } #category-availableUpdates > .category-icon { diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 03ea6500..83f75cea 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -3,14 +3,14 @@ /* These styles affect only the bound element, not other page content. */ .mainBox { - text-align: center; - background-color: #000000; - color: #FFCF00; - border-radius: 12px; - /* recessed effect with 'disabled' shadow */ - box-shadow: inset 0 1px 5px #8050B0; - padding: 5px; - -moz-user-select: none; + text-align: center; + background-color: #000000; + color: #FFCF00; + border-radius: 12px; + /* recessed effect with 'disabled' shadow */ + box-shadow: inset 0 1px 5px #8050B0; + padding: 5px; + -moz-user-select: none; } html|a { @@ -18,48 +18,51 @@ html|a { } .icon { - min-width: 48px; - min-height: 48px; - background-position: center; - background-repeat: no-repeat; + min-width: 48px; + min-height: 48px; + background-position: center; + background-repeat: no-repeat; } :-moz-type-unsupported .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); +} +:-moz-type-unsupported .icon[status="ready"] { + background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } :-moz-handler-disabled .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); } :-moz-handler-blocked .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); } :-moz-handler-crashed .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginCrashed.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginCrashed.png"); } .throbber { - padding-left: 16px; /* width of the background image */ - background: url("chrome://global/skin/icons/loading.gif") no-repeat; - margin-left: 5px; + padding-left: 16px; /* width of the background image */ + background: url("chrome://global/skin/icons/loading.gif") no-repeat; + margin-left: 5px; } .msg { - font-size: 12px; - cursor: default; + font-size: 12px; + cursor: default; } .submitStatus div { - min-height: 19px; /* height of biggest line (with throbber) */ + min-height: 19px; /* height of biggest line (with throbber) */ } .msgBottomLinks { - padding-left: 2px; - padding-right: 2px; + padding-left: 2px; + padding-right: 2px; } .helpIcon { - float: left; - display: inline-block; - min-width: 16px; - min-height: 16px; - background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; + float: left; + display: inline-block; + min-width: 16px; + min-height: 16px; + background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; } diff --git a/origdiff b/origdiff index f2df0f36..adbfe841 100755 --- a/origdiff +++ b/origdiff @@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd) # ============ vars specific to the versions ============== -NAME_PRE=2 -NAME_POST=5 +NAME_PRE=5 +NAME_POST=6 -TAG_PRE_COMM=COMM_2_0_BASE -TAG_POST_COMM=BETA_5_END -TAG_PRE_MOZ=GECKO_2_0_BASE -TAG_POST_MOZ=FIREFOX_BETA_5_END -TAG_PRE_EXT=SEAMONKEY_2_1_RELEASE -TAG_POST_EXT=SEAMONKEY_2_2_RELEASE +TAG_PRE_COMM=BETA_5_END +TAG_POST_COMM=BETA_6_END +TAG_PRE_MOZ=FIREFOX_BETA_5_END +TAG_POST_MOZ=FIREFOX_BETA_6 +TAG_PRE_EXT=SEAMONKEY_2_2_RELEASE +TAG_POST_EXT=SEAMONKEY_2_3_RELEASE # ===================== process repos =====================