diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css index 85474f2b7a61..1a95b42dec18 100644 --- a/browser/themes/pinstripe/browser/browser.css +++ b/browser/themes/pinstripe/browser/browser.css @@ -159,7 +159,7 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon { -moz-transform: scaleX(-1); } -/* ----- BOOKMARK BUTTONS ----- */ +/* ----- BOOKMARK BUTTONS ----- */ toolbarbutton.bookmark-item { font-weight: bold; @@ -272,7 +272,7 @@ toolbarbutton.bookmark-item > menupopup { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; } -/* ----- BOOKMARK MENUS ----- */ +/* ----- BOOKMARK MENUS ----- */ .bookmark-item > .menu-iconic-left > .menu-iconic-icon { width: 16px; @@ -288,7 +288,7 @@ toolbarbutton.bookmark-item > menupopup { list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png"); } -/* ----- PRIMARY TOOLBAR BUTTONS ----- */ +/* ----- PRIMARY TOOLBAR BUTTONS ----- */ .toolbarbutton-1, #restore-button, diff --git a/browser/themes/pinstripe/browser/places/editBookmarkOverlay.css b/browser/themes/pinstripe/browser/places/editBookmarkOverlay.css index 559f469ce275..497ea23dda8f 100644 --- a/browser/themes/pinstripe/browser/places/editBookmarkOverlay.css +++ b/browser/themes/pinstripe/browser/places/editBookmarkOverlay.css @@ -54,7 +54,7 @@ } .menulist-icon { - margin: 0 !important; + margin: 0 !important; } /**** expanders ****/ @@ -69,19 +69,19 @@ } .expander-up { - list-style-image: url("chrome://browser/skin/places/expander-open.png") !important; + list-style-image: url("chrome://browser/skin/places/expander-open.png") !important; } .expander-down { - list-style-image: url("chrome://browser/skin/places/expander-closed.png") !important; + list-style-image: url("chrome://browser/skin/places/expander-closed.png") !important; } .expander-down:hover:active { - list-style-image: url("chrome://browser/skin/places/expander-closed-active.png") !important; + list-style-image: url("chrome://browser/skin/places/expander-closed-active.png") !important; } .expander-up:hover:active { - list-style-image: url("chrome://browser/skin/places/expander-open-active.png") !important; + list-style-image: url("chrome://browser/skin/places/expander-open-active.png") !important; } #editBookmarkPanelContent { @@ -166,7 +166,7 @@ } -/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */ +/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */ #editBMPanel_folderMenuList[selectedIndex="0"], #editBMPanel_toolbarFolderItem { diff --git a/browser/themes/pinstripe/browser/preferences/preferences.css b/browser/themes/pinstripe/browser/preferences/preferences.css index e70c1a5b9fe4..90266eb43064 100644 --- a/browser/themes/pinstripe/browser/preferences/preferences.css +++ b/browser/themes/pinstripe/browser/preferences/preferences.css @@ -52,71 +52,71 @@ radio[pane=paneGeneral], radio[pane=paneMain] { - -moz-image-region: rect(0px, 32px, 32px, 0px) + -moz-image-region: rect(0px, 32px, 32px, 0px); } radio[pane=paneGeneral]:active, radio[pane=paneMain]:active:hover { - -moz-image-region: rect(32px, 32px, 64px, 0px) + -moz-image-region: rect(32px, 32px, 64px, 0px); } /* ----- TABS BUTTON ----- */ radio[pane=paneTabs] { - -moz-image-region: rect(0px, 64px, 32px, 32px); + -moz-image-region: rect(0px, 64px, 32px, 32px); } radio[pane=paneTabs]:active:hover { - -moz-image-region: rect(32px, 64px, 64px, 32px); + -moz-image-region: rect(32px, 64px, 64px, 32px); } /* ----- CONTENT BUTTON ----- */ radio[pane=paneContent] { - -moz-image-region: rect(0px, 96px, 32px, 64px); + -moz-image-region: rect(0px, 96px, 32px, 64px); } radio[pane=paneContent]:active:hover { - -moz-image-region: rect(32px, 96px, 64px, 64px); + -moz-image-region: rect(32px, 96px, 64px, 64px); } /* ----- APPLICATIONS BUTTON ----- */ radio[pane=paneApplications] { - -moz-image-region: rect(0px, 128px, 32px, 96px); + -moz-image-region: rect(0px, 128px, 32px, 96px); } radio[pane=paneApplications]:active:hover { - -moz-image-region: rect(32px, 128px, 64px, 96px); + -moz-image-region: rect(32px, 128px, 64px, 96px); } /* ----- PRIVACY BUTTON ----- */ radio[pane=panePrivacy] { - -moz-image-region: rect(0px, 160px, 32px, 128px); + -moz-image-region: rect(0px, 160px, 32px, 128px); } radio[pane=panePrivacy]:active:hover { - -moz-image-region: rect(32px, 160px, 64px, 128px); + -moz-image-region: rect(32px, 160px, 64px, 128px); } /* ----- SECURITY BUTTON ----- */ radio[pane=paneSecurity] { - -moz-image-region: rect(0px, 192px, 32px, 160px); + -moz-image-region: rect(0px, 192px, 32px, 160px); } radio[pane=paneSecurity]:active:hover { - -moz-image-region: rect(32px, 192px, 64px, 160px); + -moz-image-region: rect(32px, 192px, 64px, 160px); } /* ----- ADVANCED BUTTON ----- */ radio[pane=paneAdvanced] { - -moz-image-region: rect(0px, 224px, 32px, 192px); + -moz-image-region: rect(0px, 224px, 32px, 192px); } radio[pane=paneAdvanced]:active:hover { - -moz-image-region: rect(32px, 224px, 64px, 192px); + -moz-image-region: rect(32px, 224px, 64px, 192px); } %ifdef MOZ_SERVICES_SYNC @@ -211,7 +211,7 @@ caption { } #privacyPrefs > tabpanels { - padding: 18px 10px 10px 10px; + padding: 18px 10px 10px; } #OCSPDialogPane { diff --git a/browser/themes/winstripe/browser/preferences/preferences.css b/browser/themes/winstripe/browser/preferences/preferences.css index 5f535d002e14..5f3c966fe130 100644 --- a/browser/themes/winstripe/browser/preferences/preferences.css +++ b/browser/themes/winstripe/browser/preferences/preferences.css @@ -45,59 +45,59 @@ } radio[pane=paneMain] { - -moz-image-region: rect(0px, 32px, 32px, 0px) + -moz-image-region: rect(0, 32px, 32px, 0); } -radio[pane=paneMain]:hover, -radio[pane=paneMain][selected="true"] { - -moz-image-region: rect(32px, 32px, 64px, 0px) +radio[pane=paneMain]:hover, +radio[pane=paneMain][selected="true"] { + -moz-image-region: rect(32px, 32px, 64px, 0); } radio[pane=paneTabs] { - -moz-image-region: rect(0px, 64px, 32px, 32px) + -moz-image-region: rect(0, 64px, 32px, 32px); } -radio[pane=paneTabs]:hover, +radio[pane=paneTabs]:hover, radio[pane=paneTabs][selected="true"] { - -moz-image-region: rect(32px, 64px, 64px, 32px) + -moz-image-region: rect(32px, 64px, 64px, 32px); } radio[pane=paneContent] { - -moz-image-region: rect(0px, 96px, 32px, 64px) + -moz-image-region: rect(0, 96px, 32px, 64px); } -radio[pane=paneContent]:hover, -radio[pane=paneContent][selected="true"] { - -moz-image-region: rect(32px, 96px, 64px, 64px) +radio[pane=paneContent]:hover, +radio[pane=paneContent][selected="true"] { + -moz-image-region: rect(32px, 96px, 64px, 64px); } radio[pane=paneApplications] { - -moz-image-region: rect(0px, 128px, 32px, 96px) + -moz-image-region: rect(0, 128px, 32px, 96px); } -radio[pane=paneApplications]:hover, -radio[pane=paneApplications][selected="true"] { - -moz-image-region: rect(32px, 128px, 64px, 96px) +radio[pane=paneApplications]:hover, +radio[pane=paneApplications][selected="true"] { + -moz-image-region: rect(32px, 128px, 64px, 96px); } radio[pane=panePrivacy] { - -moz-image-region: rect(0px, 160px, 32px, 128px) + -moz-image-region: rect(0, 160px, 32px, 128px); } -radio[pane=panePrivacy]:hover, -radio[pane=panePrivacy][selected="true"] { - -moz-image-region: rect(32px, 160px, 64px, 128px) +radio[pane=panePrivacy]:hover, +radio[pane=panePrivacy][selected="true"] { + -moz-image-region: rect(32px, 160px, 64px, 128px); } radio[pane=paneSecurity] { - -moz-image-region: rect(0px, 192px, 32px, 160px) + -moz-image-region: rect(0, 192px, 32px, 160px); } -radio[pane=paneSecurity]:hover, -radio[pane=paneSecurity][selected="true"] { - -moz-image-region: rect(32px, 192px, 64px, 160px) +radio[pane=paneSecurity]:hover, +radio[pane=paneSecurity][selected="true"] { + -moz-image-region: rect(32px, 192px, 64px, 160px); } radio[pane=paneAdvanced] { - -moz-image-region: rect(0px, 224px, 32px, 192px) + -moz-image-region: rect(0, 224px, 32px, 192px); } -radio[pane=paneAdvanced]:hover, +radio[pane=paneAdvanced]:hover, radio[pane=paneAdvanced][selected="true"] { - -moz-image-region: rect(32px, 224px, 64px, 192px) + -moz-image-region: rect(32px, 224px, 64px, 192px); } %ifdef MOZ_SERVICES_SYNC @@ -130,28 +130,28 @@ radio[pane=paneSync] { /* Modeless Window Dialogs */ .windowDialog, .windowDialog prefpane { - padding: 0px; + padding: 0; } .contentPane { - margin: 9px 8px 5px 8px; + margin: 9px 8px 5px; } .actionButtons { - margin: 0px 3px 6px 3px !important; + margin: 0 3px 6px !important; } /* Cookies Manager */ #cookiesChildren::-moz-tree-image(domainCol) { width: 16px; height: 16px; - margin: 0px 2px; + margin: 0 2px; list-style-image: url("chrome://global/skin/icons/folder-item.png") !important; - -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-image-region: rect(0, 16px, 16px, 0); } #cookiesChildren::-moz-tree-image(domainCol, container) { - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(0, 32px, 16px, 16px); } #cookiesChildren::-moz-tree-image(domainCol, container, open) { @@ -160,9 +160,9 @@ radio[pane=paneSync] { #cookieInfoBox { border: 1px solid ThreeDShadow; - -moz-border-radius: 0px; + -moz-border-radius: 0; margin: 4px; - padding: 0px; + padding: 0; } /* Advanced Pane */ diff --git a/toolkit/themes/pinstripe/global/customizeToolbar.css b/toolkit/themes/pinstripe/global/customizeToolbar.css index f45da400a0da..0631b944ea9f 100644 --- a/toolkit/themes/pinstripe/global/customizeToolbar.css +++ b/toolkit/themes/pinstripe/global/customizeToolbar.css @@ -37,33 +37,33 @@ ***** END LICENSE BLOCK ***** */ #palette-box { - margin-top: 2px; + margin-top: 2px; } #palette-box > hbox > toolbarpaletteitem { - padding: 2px; - margin: 0px; + padding: 2px; + margin: 0px; } #main-box { - padding: 12px; + padding: 12px; } #main-box > separator { - -moz-appearance: none; - border-bottom: none; + -moz-appearance: none; + border-bottom: none; } #instructions { - font: menu; - font-weight: bold; - line-height: 16pt; + font: menu; + font-weight: bold; + line-height: 16pt; } hbox button { - font: menu; + font: menu; } #main-box > box > button { - min-height: 19px; /* aqua size for small buttons */ - font: message-box; + min-height: 19px; /* aqua size for small buttons */ + font: message-box; } diff --git a/toolkit/themes/pinstripe/global/dialog.css b/toolkit/themes/pinstripe/global/dialog.css index d28701c9bbb0..6c68823a3db1 100644 --- a/toolkit/themes/pinstripe/global/dialog.css +++ b/toolkit/themes/pinstripe/global/dialog.css @@ -60,12 +60,12 @@ dialog { /* ::::: dialog header ::::: */ dialogheader { - margin: 0px 5px 5px 5px; + margin: 0 5px 5px; padding: 5px 8px; } .dialogheader-title { - margin: 0px !important; + margin: 0 !important; font-size: larger; font-weight: bold; display: none; @@ -76,7 +76,9 @@ dialogheader { .header-large { -moz-box-orient: vertical; margin: -14px -14px 0; - padding: 12px 5px 12px 25px; + padding: 12px; + -moz-padding-end: 5px; + -moz-padding-start: 25px; } .header-large > .dialogheader-title { @@ -89,19 +91,21 @@ dialogheader { } .dialogheader-description { - font-weight: bold !important; + font-weight: bold !important; } .dialogheader-title { - font-weight: bold !important; + font-weight: bold !important; } /*XXX - belongs to toolkit/content/finddialog.xul: */ -#findDialog, #findDialog > menu, #findDialog > groupbox { - font: menu !important; +#findDialog, +#findDialog > menu, +#findDialog > groupbox { + font: menu !important; } #dialog\.caseSensitive { - margin-top: 8px; + margin-top: 8px; } diff --git a/toolkit/themes/pinstripe/global/wizard.css b/toolkit/themes/pinstripe/global/wizard.css index ece50e0b2d21..5563e1d0324b 100644 --- a/toolkit/themes/pinstripe/global/wizard.css +++ b/toolkit/themes/pinstripe/global/wizard.css @@ -1,23 +1,23 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); wizard { - padding: 14px; + padding: 14px; } #header { - display: inline !important; + display: inline !important; } .wizard-header { - -moz-appearance: dialog; + -moz-appearance: dialog; } .wizard-header-box-1 { - color: #000000; + color: #000; } .wizard-header-box-text { - padding: 6px 10px 6px 10px; + padding: 6px 10px; font: menu; font-weight: bold; } @@ -28,7 +28,10 @@ wizard { } .wizard-header-box-icon { - margin: 3px 20px 0 3px; + margin-top: 3px; + -moz-margin-end: 20px + margin-bottom: 0; + -moz-margin-start: 3px; } wizard[branded="true"] .wizard-header-icon { @@ -37,16 +40,16 @@ wizard[branded="true"] .wizard-header-icon { .wizard-page-box { padding: 15px 23px; - -moz-appearance: dialog; + -moz-appearance: dialog; } .wizard-buttons-separator { margin: 0 !important; - border-bottom: 1px solid #FFFFFF !important; + border-bottom: 1px solid #fff !important; } .wizard-buttons-btm { - padding: 3px 6px 6px 6px; + padding: 3px 6px 6px; } .wizard-button { diff --git a/toolkit/themes/pinstripe/help/helpFileLayout.css b/toolkit/themes/pinstripe/help/helpFileLayout.css index 89ed081b24cb..82832e6634ee 100644 --- a/toolkit/themes/pinstripe/help/helpFileLayout.css +++ b/toolkit/themes/pinstripe/help/helpFileLayout.css @@ -38,14 +38,17 @@ @import url('chrome://help/content/platformClasses.css'); -body, td, th, input { +body, +td, +th, +input { font-family: verdana, sans-serif; font-size: small; } body { - margin: 2ex; - max-width: 120ex; + margin: 2ex; + max-width: 120ex; } :link:hover, @@ -65,30 +68,67 @@ a[href^="https://"]:after { content: url('chrome://help/skin/Weblink.png'); } -:link { color: #039; } -:visited { color: #636; } -:link:hover, :visited:hover { color: #333; } -:link:active, :link:active { color: #000; } +:link { + color: #039; +} +:visited { + color: #636; +} +:link:hover, +:visited:hover { + color: #333; +} +:link:active, +:link:active { + color: #000; +} -h1 { font-size: 160%; font-weight: normal; } -h2 { font-size: 150%; font-weight: normal; } -h3 { font-size: 120%; } -h4 { font-size: 100%; } -h5 { font-size: 90%; } -h6 { font-size: 90%; border: 0; } +h1 { + font-size: 160%; + font-weight: normal; +} +h2 { + font-size: 150%; + font-weight: normal; +} +h3 { + font-size: 120%; +} +h4 { + font-size: 100%; +} +h5 { + font-size: 90%; +} +h6 { + font-size: 90%; + border: 0; +} -h1, h2, h3, h4, h5, h6 { - margin: 1em 0 0.2em 0; +h1, +h2, +h3, +h4, +h5, +h6 { + margin: 1em 0 .2em; border-bottom: 1px solid #ccc; font-family: arial, verdana, sans-serif; } -li h1, li h2, li h3, li h4, li h5, li h6 { +li h1, +li h2, +li h3, +li h4, +li h5, +li h6 { border: none; } -dt { font-weight: bold; } +dt { + font-weight: bold; +} sup { font-size: 70%; @@ -102,21 +142,21 @@ sup { .contentsBox, .contentsBox > ul, li { - text-indent: 0px; + text-indent: 0; } .contentsBox > ul, -.contentsBox ul > ul{ - margin: 0 0 0 0; - list-style-type: none; +.contentsBox ul > ul { + margin: 0; + list-style-type: none; } .contentsBox { - margin-top: 12px; - background-color: #eee; - border: 1px solid #ccc; - width: 300px; - padding: 1em; + margin-top: 12px; + background-color: #eee; + border: 1px solid #ccc; + width: 300px; + padding: 1em; } .menuPath { @@ -130,14 +170,15 @@ table { border-collapse: collapse; } -td, th { - border: 1px solid #ddd; /* grey */ +td, +th { + border: 1px solid #ddd; padding: 6px; vertical-align: top; } th { - background-color: #eee; /* light grey */ + background-color: #eee; font-weight: bold; text-align: start; } @@ -145,6 +186,6 @@ th { .noTableBorder, .noTableBorder td, .noTableBorder th { - background-color: transparent; - border: 0px solid transparent; + background-color: transparent; + border: none; } diff --git a/toolkit/themes/pinstripe/mozapps/downloads/unknownContentType.css b/toolkit/themes/pinstripe/mozapps/downloads/unknownContentType.css index 33ee9b204959..70dd54a192bc 100644 --- a/toolkit/themes/pinstripe/mozapps/downloads/unknownContentType.css +++ b/toolkit/themes/pinstripe/mozapps/downloads/unknownContentType.css @@ -1,26 +1,26 @@ #unknownContentType { - font: menu; + font: menu; } description { - font-weight: bold; + font-weight: bold; } .plain { - background-color: transparent; - background-image: none; - border: none; + background-color: transparent; + background-image: none; + border: none; } #contentTypeImage { - margin-right: 3px; - width: 16px; + margin-right: 3px; + width: 16px; } #container > .small-indent { - margin-left: 0px; + margin-left: 0px; } .small-indent label { - margin-left: 0px; + margin-left: 0px; } diff --git a/toolkit/themes/winstripe/help/helpFileLayout.css b/toolkit/themes/winstripe/help/helpFileLayout.css index 89ed081b24cb..82832e6634ee 100644 --- a/toolkit/themes/winstripe/help/helpFileLayout.css +++ b/toolkit/themes/winstripe/help/helpFileLayout.css @@ -38,14 +38,17 @@ @import url('chrome://help/content/platformClasses.css'); -body, td, th, input { +body, +td, +th, +input { font-family: verdana, sans-serif; font-size: small; } body { - margin: 2ex; - max-width: 120ex; + margin: 2ex; + max-width: 120ex; } :link:hover, @@ -65,30 +68,67 @@ a[href^="https://"]:after { content: url('chrome://help/skin/Weblink.png'); } -:link { color: #039; } -:visited { color: #636; } -:link:hover, :visited:hover { color: #333; } -:link:active, :link:active { color: #000; } +:link { + color: #039; +} +:visited { + color: #636; +} +:link:hover, +:visited:hover { + color: #333; +} +:link:active, +:link:active { + color: #000; +} -h1 { font-size: 160%; font-weight: normal; } -h2 { font-size: 150%; font-weight: normal; } -h3 { font-size: 120%; } -h4 { font-size: 100%; } -h5 { font-size: 90%; } -h6 { font-size: 90%; border: 0; } +h1 { + font-size: 160%; + font-weight: normal; +} +h2 { + font-size: 150%; + font-weight: normal; +} +h3 { + font-size: 120%; +} +h4 { + font-size: 100%; +} +h5 { + font-size: 90%; +} +h6 { + font-size: 90%; + border: 0; +} -h1, h2, h3, h4, h5, h6 { - margin: 1em 0 0.2em 0; +h1, +h2, +h3, +h4, +h5, +h6 { + margin: 1em 0 .2em; border-bottom: 1px solid #ccc; font-family: arial, verdana, sans-serif; } -li h1, li h2, li h3, li h4, li h5, li h6 { +li h1, +li h2, +li h3, +li h4, +li h5, +li h6 { border: none; } -dt { font-weight: bold; } +dt { + font-weight: bold; +} sup { font-size: 70%; @@ -102,21 +142,21 @@ sup { .contentsBox, .contentsBox > ul, li { - text-indent: 0px; + text-indent: 0; } .contentsBox > ul, -.contentsBox ul > ul{ - margin: 0 0 0 0; - list-style-type: none; +.contentsBox ul > ul { + margin: 0; + list-style-type: none; } .contentsBox { - margin-top: 12px; - background-color: #eee; - border: 1px solid #ccc; - width: 300px; - padding: 1em; + margin-top: 12px; + background-color: #eee; + border: 1px solid #ccc; + width: 300px; + padding: 1em; } .menuPath { @@ -130,14 +170,15 @@ table { border-collapse: collapse; } -td, th { - border: 1px solid #ddd; /* grey */ +td, +th { + border: 1px solid #ddd; padding: 6px; vertical-align: top; } th { - background-color: #eee; /* light grey */ + background-color: #eee; font-weight: bold; text-align: start; } @@ -145,6 +186,6 @@ th { .noTableBorder, .noTableBorder td, .noTableBorder th { - background-color: transparent; - border: 0px solid transparent; + background-color: transparent; + border: none; }