mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 137ad88e786c (bug 1365133)

This commit is contained in:
Sebastian Hengst 2017-06-28 06:23:09 +02:00
Родитель 639f52cf67
Коммит d8870d0e57
6 изменённых файлов: 17 добавлений и 96 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

53
browser/components/preferences/in-content-new/main.xul
Просмотреть файл

@ -267,8 +267,8 @@
type="bool"/>
</preferences>
<hbox id="generalCategory"
class="subcategory"
<hbox id="header-general"
class="header"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&paneGeneral.title;</label>
@ -440,13 +440,6 @@
</hbox>
</groupbox>
<hbox id="languageAndAppearanceCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&languageAndAppearance.label;</label>
</hbox>
<!-- Fonts and Colors -->
<groupbox id="fontsGroup" data-category="paneGeneral" hidden="true">
<caption><label>&fontsAndColors.label;</label></caption>
@ -628,13 +621,6 @@
<key key="&focusSearch2.key;" modifiers="accel" id="focusSearch2" oncommand=";"/>
</keyset>
<hbox id="filesAndApplicationsCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&filesAndApplications.label;</label>
</hbox>
<!--Downloads-->
<groupbox id="downloadsGroup" data-category="paneGeneral" hidden="true">
<caption><label>&downloads.label;</label></caption>
@ -721,15 +707,9 @@
<stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
#endif
<hbox id="updatesCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&updateApplication.label;</label>
</hbox>
<!-- Update -->
<groupbox id="updateApp" data-category="paneGeneral" hidden="true">
<caption><label>&updateApplication.label;</label></caption>
<hbox align="start">
<vbox flex="1">
<description>
@ -868,15 +848,10 @@
preference="browser.search.update"/>
</groupbox>
<hbox id="performanceCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&performance.label;</label>
</hbox>
<!-- Performance -->
<groupbox id="performanceGroup" data-category="paneGeneral" hidden="true">
<caption><label>&performance.label;</label></caption>
<hbox align="center">
<checkbox id="useRecommendedPerformanceSettings"
label="&useRecommendedPerformanceSettings2.label;"
@ -910,15 +885,10 @@
</vbox>
</groupbox>
<hbox id="browsingCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&browsing.label;</label>
</hbox>
<!-- Browsing -->
<groupbox id="browsingGroup" data-category="paneGeneral" hidden="true">
<caption><label>&browsing.label;</label></caption>
<checkbox id="useAutoScroll"
label="&useAutoScroll.label;"
accesskey="&useAutoScroll.accesskey;"
@ -945,15 +915,10 @@
preference="accessibility.typeaheadfind"/>
</groupbox>
<hbox id="networkProxyCategory"
class="subcategory"
hidden="true"
data-category="paneGeneral">
<label class="header-name" flex="1">&networkProxy.label;</label>
</hbox>
<!-- Network Proxy-->
<groupbox id="connectionGroup" data-category="paneGeneral" hidden="true">
<caption><label>&networkProxy.label;</label></caption>
<hbox align="center">
<description flex="1" control="connectionSettings">&connectionDesc.label;</description>
<button id="connectionSettings"

28
browser/components/preferences/in-content-new/privacy.xul
Просмотреть файл

@ -171,11 +171,11 @@
<stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
<stringbundle id="signonBundle" src="chrome://passwordmgr/locale/passwordmgr.properties"/>
<hbox id="browserPrivacyCategory"
class="subcategory"
<hbox id="header-privacy"
class="header"
hidden="true"
data-category="panePrivacy">
<label class="header-name" flex="1">&browserPrivacy.label;</label>
<label class="header-name" flex="1">&panePrivacySecurity.title;</label>
</hbox>
<!-- Passwords -->
@ -504,13 +504,6 @@
</vbox>
</groupbox>
<hbox id="permissionsCategory"
class="subcategory"
hidden="true"
data-category="panePrivacy">
<label class="header-name" flex="1">&permissions.label;</label>
</hbox>
<!-- Permissions -->
<groupbox id="permissionsGroup" data-category="panePrivacy" hidden="true">
<grid>
@ -578,16 +571,10 @@
</hbox>
</groupbox>
<hbox id="dataCollectionCategory"
class="subcategory"
hidden="true"
data-category="panePrivacy">
<label class="header-name" flex="1">&dataCollection.label;</label>
</hbox>
<!-- Firefox Data Collection and Use -->
#ifdef MOZ_DATA_REPORTING
<groupbox id="dataCollectionGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
<caption><label>&dataCollection.label;</label></caption>
<description>
&dataCollectionDesc.label;<label id="dataCollectionLearnMore" class="learnMore text-link">&dataCollectionLearnMore.label;</label>
</description>
@ -626,13 +613,6 @@
</groupbox>
#endif
<hbox id="securityCategory"
class="subcategory"
hidden="true"
data-category="panePrivacy">
<label class="header-name" flex="1">&security.label;</label>
</hbox>
<!-- addons, forgery (phishing) UI Security -->
<groupbox id="addonsPhishingGroup" data-category="panePrivacy" hidden="true">
<caption><label>&phishingProtection.label;</label></caption>

4
browser/components/preferences/in-content-new/search.xul
Просмотреть файл

@ -19,8 +19,8 @@
<stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>
<hbox id="searchCategory"
class="subcategory"
<hbox id="header-search"
class="header"
hidden="true"
data-category="paneSearch">
<label class="header-name" flex="1">&paneSearch.title;</label>

4
browser/components/preferences/in-content-new/sync.xul
Просмотреть файл

@ -28,8 +28,8 @@
<script type="application/javascript"
src="chrome://browser/content/preferences/in-content-new/sync.js"/>
<hbox id="firefoxAccountCategory"
class="searchCategory"
<hbox id="header-sync"
class="header"
hidden="true"
data-category="paneSync">
<label class="header-name" flex="1">&paneSync1.title;</label>

4
browser/locales/en-US/chrome/browser/preferences/preferences.dtd
Просмотреть файл

@ -21,10 +21,6 @@
<!ENTITY paneContainers.title "Container Tabs">
<!ENTITY paneUpdates.title "Updates">
<!ENTITY languageAndAppearance.label "Language and Appearance">
<!ENTITY filesAndApplications.label "Files and Applications">
<!ENTITY browserPrivacy.label "Browser Privacy">
<!-- LOCALIZATION NOTE (paneSync1.title): This should match syncBrand.fxAccount.label in ../syncBrand.dtd -->
<!ENTITY paneSync1.title "Firefox Account">

20
browser/themes/shared/incontentprefs/preferences.inc.css
Просмотреть файл

@ -57,26 +57,6 @@ treecol {
min-width: 145px;
}
/* Subcategory title */
/**
* The first subcategory title for each category should not have margin-top.
*/
#generalCategory,
#searchCategory,
#browserPrivacyCategory,
#firefoxAccountCategory {
margin-top: 0;
}
.header-name {
font-size: 2rem;
}
.subcategory {
margin-top: 48px;
}
/* Category List */
#categories {