summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 15:24:23 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 15:24:23 +0000
commit5b1904ab3db049a58ce5d319742ba79861a83910 (patch)
treef60f634de1dd9407facc58b30165a8a31fff4821
parent44fde4a48d27645d567b3b1558d15de08105b8dc (diff)
downloadchromium_src-5b1904ab3db049a58ce5d319742ba79861a83910.zip
chromium_src-5b1904ab3db049a58ce5d319742ba79861a83910.tar.gz
chromium_src-5b1904ab3db049a58ce5d319742ba79861a83910.tar.bz2
Fixing CSS to match the mocks
BUG=none TEST=none Review URL: http://codereview.chromium.org/2881013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/browser/resources/options.html17
-rw-r--r--chrome/browser/resources/options/advanced_options.html34
-rw-r--r--chrome/browser/resources/options/chromeos_labs.html13
-rw-r--r--chrome/browser/resources/options/options_page.css88
-rw-r--r--chrome/browser/resources/shared/js/cr.js7
5 files changed, 120 insertions, 39 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index a969992..965dce0 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -31,17 +31,21 @@
*/
function load() {
localStrings = new LocalStrings();
-
- const isChromeOS = /CrOS/.test(navigator.platform);
- if (isChromeOS) {
+ if (cr.isChromeOS) {
OptionsPage.register(SystemOptions.getInstance());
}
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance());
+ if (cr.isChromeOS) {
+ var labsOptions = new OptionsPage('labs',
+ templateData.labsPage,
+ 'labsPage');
+ OptionsPage.register(labsOptions);
+ }
Preferences.getInstance().initialize();
- if (isChromeOS) {
+ if (cr.isChromeOS) {
OptionsPage.showPageByName(SystemOptions.getInstance().name);
} else {
OptionsPage.showPageByName(BrowserOptions.getInstance().name);
@@ -56,6 +60,7 @@ window.onpopstate = function(e) {
</script>
<link rel="stylesheet" href="dom_ui.css">
+<!-- TODO(zelidrag) just a temp style placeholder until redesign -->
<link rel="stylesheet" href="options/options_page.css">
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
@@ -63,15 +68,17 @@ window.onpopstate = function(e) {
</div>
<div id="main-content">
<div id="navbar-container">
+ <h1 id="settings-title" i18n-content="title"></h1>
<ul id="navbar">
</ul>
- <hr>
+ <hr/>
<ul class="hidden">
</ul>
</div>
<div id="mainview">
<if expr="pp_ifdef('chromeos')">
<include src="options/chromeos_system_options.html">
+ <include src="options/chromeos_labs.html">
</if>
<include src="options/browser_options.html">
<include src="options/personal_options.html">
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 410f590..8ef2162 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -3,19 +3,19 @@
<section>
<h3 i18n-content="advancedSectionTitlePrivacy"></h3>
<table class="option-control-table">
- <tr>
+ <tr><td>
<button id="privacyContentSettingsButton"
i18n-content="privacyContentSettingsButton"></button>
<button id="privacyClearDataButton"
i18n-content="privacyClearDataButton"></button>
- </tr>
- <tr>
+ </td></tr>
+ <tr><td>
<div class="section-text"
i18n-content="disableServices"></div>
<div id="privacyLearnMore">
<a target="_blank" i18n-content="privacyLearnMoreLabel"
i18n-values="href:privacyLearnMoreURL"></a></div>
- </tr>
+ </td></tr>
<tr id="linkDoctorCheckbox">
<td class="option-name"><label><input id="alternateErrorPagesEnabled"
pref="alternate_error_pages.enabled" type="checkbox"><span
@@ -49,14 +49,14 @@
<section>
<h3 i18n-content="advancedSectionTitleNetwork"></h3>
<table class="option-control-table">
- <tr>
+ <tr><td>
<div class="section-text"
i18n-content="proxiesLabel"></div>
- </tr>
- <tr>
+ </td></tr>
+ <tr><td>
<button id="proxiesConfigureButton"
i18n-content="proxiesConfigureButton"></button>
- </tr>
+ </td></tr>
</table>
</section>
<section>
@@ -72,25 +72,25 @@
<section>
<h3 i18n-content="downloadLocationGroupName"></h3>
<table class="option-control-table">
- <tr>
+ <tr><td>
<div class="section_text"
i18n-content="downloadLocationBrowseTitle"></div>
- <input id="downloadLocationPath" type="text" size="80" disabled>
+ <input id="downloadLocationPath" type="text" size="60" disabled>
<button id="downloadLocationBrowseButton"
i18n-content="downloadLocationBrowseButton"></button>
- </tr>
+ </td></tr>
<tr id="promptForDownloadCheckbox">
<td class="option-name"><label><input id="promptForDownload"
pref="download.prompt_for_download" type="checkbox"><span
i18n-content="downloadLocationAskForSaveLocation"></span></label>
</td>
</tr>
- <tr>
+ <tr><td>
<div class="section-text"
i18n-content="autoOpenFileTypesInfo"></div>
<button id="autoOpenFileTypesResetToDefault"
i18n-content="autoOpenFileTypesResetToDefault"></button>
- </tr>
+ </td></tr>
</table>
</section>
<section>
@@ -101,21 +101,21 @@
pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
i18n-content="tabsToLinksPref"></span></label></td>
</tr>
- <tr id="promptForDownloadCheckbox">
+ <tr id="promptForDownloadCheckbox"><td>
<button id="fontSettingsConfigureFontsOnlyButton"
i18n-content="fontSettingsConfigureFontsOnlyButton"></button>
- </tr>
+ </td></tr>
</table>
</section>
<section>
<h3 i18n-content="advancedSectionTitleSecurity"></h3>
<table class="option-control-table">
- <tr>
+ <tr><td>
<div class="section_text"
i18n-content="certificatesLabel"></div>
<button id="certificatesManageButton"
i18n-content="certificatesManageButton"></button>
- </tr>
+ </td></tr>
<!-- TODO(csilv): Not supported on all platforms
<tr id="sslCheckRevocationCheckbox">
<td class="option-name"><label><input id="sslCheckRevocation"
diff --git a/chrome/browser/resources/options/chromeos_labs.html b/chrome/browser/resources/options/chromeos_labs.html
index 818f126..cce03b4 100644
--- a/chrome/browser/resources/options/chromeos_labs.html
+++ b/chrome/browser/resources/options/chromeos_labs.html
@@ -1,6 +1,7 @@
<div class="page hidden" id="labsPage">
- <div class="section">
- <div class="section-title" i18n-content="mediaplayer_title"></div>
+ <h1 i18n-content="labsPage"></h1>
+ <section>
+ <h3 i18n-content="mediaplayer_title"></h3>
<div class="option">
<table class="option-control-table">
<tr>
@@ -10,9 +11,9 @@
</tr>
</table>
</div>
- </div>
- <div class="section">
- <div class="section-title" i18n-content="advanced_file_title"></div>
+ </section>
+ <section>
+ <h3 i18n-content="advanced_file_title"></h3>
<div class="option">
<table class="option-control-table">
<tr>
@@ -22,5 +23,5 @@
</tr>
</table>
</div>
- </div>
+ </section>
</div>
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 4bfc707..c3fb05d 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -1,42 +1,108 @@
+#settings-title {
+ height: 30px;
+ padding-right: 15px;
+ padding-top: 20px;
+ text-align: right;
+ font-size: 140%;
+ color: #c7c7c7;
+}
+
#main-content {
display: -webkit-box;
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
}
#navbar-container {
- border: 1px solid black;
- background-color: #dfdfdf;
+ background: -webkit-gradient(linear,
+ left top,
+ left bottom,
+ from(rgba(255,255,255,0)),
+ color-stop(0.7, rgba(255,255,255,0)),
+ to(white)),
+ -webkit-gradient(linear,
+ left top,
+ right top,
+ from(white),
+ color-stop(0.8, white),
+ to(#f3f3f3));
+ border-right: 1px solid #dbdbdb;
cursor: pointer;
- font-weight: bold;
- height: 800px;
- padding: 10px;
position: relative;
- width: 200px;
+ width: 250px;
+}
+
+#navbar-container > hr {
+ border-top: 1px solid #dbdbdb;
+ width: 65%;
+ align: right;
}
.navbar-item, .navbar-item2 {
- margin: 5px;
- padding: 5px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-right: 20px;
+ text-align: right;
+ list-style-type: none;
+ list-style-image: none;
}
.navbar-item-selected {
- background-color: #FFFFFF;
+ background: -webkit-gradient(linear, left top, right top, from(white), to(#d6def3));
+ font-weight: bold;
}
.navbar-item-normal {
background-color: #dfdfdf;
}
+#gradient-cover {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 250px;
+ bottom: 0;
+}
+
+#gradient {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 250px;
+ bottom: 0;
+}
+
#mainview {
-webkit-box-align: stretch;
- border: 1px solid black;
- height: 800px;
width: 600px;
padding: 10px;
position: relative;
}
+.page > h1 {
+ height: 30px;
+ padding-right: 15px;
+ padding-top: 12px;
+ padding-left: 15px;
+ font-size: 140%;
+ color: #7c90d8;
+}
+
section {
margin-top: 10px;
+ border-bottom: 1px solid #ededed;
+ padding-bottom: 10px;
+}
+
+section > h3 {
+ font-weight: bold;
+ float: left;
+ width: 150px;
+ font-size: 75%;
+ padding-left: 15px;
}
.option {
diff --git a/chrome/browser/resources/shared/js/cr.js b/chrome/browser/resources/shared/js/cr.js
index 1bd1b48..8558171 100644
--- a/chrome/browser/resources/shared/js/cr.js
+++ b/chrome/browser/resources/shared/js/cr.js
@@ -11,6 +11,12 @@ const cr = (function() {
const isMac = /Mac/.test(navigator.platform);
/**
+ * Whether this is on chromeOS or not.
+ * @type {boolean}
+ */
+ const isChromeOS = /CrOS/.test(navigator.userAgent);
+
+ /**
* Builds an object structure for the provided namespace path,
* ensuring that names that already exist are not overwritten. For
* example:
@@ -317,6 +323,7 @@ const cr = (function() {
return {
isMac: isMac,
+ isChromeOS: isChromeOS,
define: define,
defineProperty: defineProperty,
PropertyKind: PropertyKind,
generated by cgit v1.1 at 2025-02-05 13:41:29 +0000