Skip to content

GitLab

T
tangled
Commit df8bf739 authored by estade@chromium.org's avatar estade@chromium.org
Browse files
Options

deprecate webui.css 

This file is really only useful to downloads and history. All other includes of the file are senseless copy-pasta as far as I can tell. There is also the problem that due to its poor name, it became a dumping ground for generic stuff like displaytable, and then was included into chrome://settings because of it. Move out the bits that should live elsewhere, remove the rules that are not used anywhere, rename the file to head off re-use.

Also move gpu_internals stuff into gpu_internals/, and remove completely duplicated file webui2.css.

BUG=103688
TEST=manually checking gpu internals, media internals, policy, tracing, options, history, downloads

Review URL: http://codereview.chromium.org/8511046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109765 0039d316-1c4b-4281-b951-d872f2087c98
parent 2a5390f3
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 126 deletions
chrome/browser/browser_resources.grd
View file @ df8bf739
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
<include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\software_rendering_list.json" type="BINDATA" /> <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list.json" type="BINDATA" />
<include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" />
......
chrome/browser/resources/bug_report.html
View file @ df8bf739
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<!-- We want to keep our style in sync with the options page. --> <!-- We want to keep our style in sync with the options page. -->
<link rel="stylesheet" href="chrome://resources/css/button.css"> <link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="chrome://resources/css/select.css"> <link rel="stylesheet" href="chrome://resources/css/select.css">
<link rel="stylesheet" href="webui.css">
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="bug_report.css"> <link rel="stylesheet" href="bug_report.css">
......
chrome/browser/resources/chromeos/proxy_settings.html
View file @ df8bf739
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<link rel="stylesheet" href="chrome://resources/css/button.css"> <link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="chrome://resources/css/list.css"> <link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/select.css"> <link rel="stylesheet" href="chrome://resources/css/select.css">
<link rel="stylesheet" href="../webui.css">
<link rel="stylesheet" href="../options/options_page.css"> <link rel="stylesheet" href="../options/options_page.css">
<link rel="stylesheet" href="../options/chromeos/proxy.css"> <link rel="stylesheet" href="../options/chromeos/proxy.css">
......
chrome/browser/resources/downloads.html
View file @ df8bf739
...@@ -4,31 +4,8 @@ ...@@ -4,31 +4,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title i18n-content="title"></title> <title i18n-content="title"></title>
<link rel="icon" href="../../app/theme/downloads_favicon.png"> <link rel="icon" href="../../app/theme/downloads_favicon.png">
<link rel="stylesheet" href="old_webui.css">
<style> <style>
body {
background-color: white;
color: black;
margin: 10px;
}
.header {
overflow: auto;
clear: both;
}
.header .logo {
float: left;
}
.header .form {
float: left;
margin-top: 22px;
-webkit-margin-start: 12px;
}
html[dir=rtl] .logo, html[dir=rtl] .form {
float: right;
}
#downloads-summary { #downloads-summary {
margin-top: 12px; margin-top: 12px;
...@@ -175,16 +152,6 @@ html[dir=rtl] .progress { ...@@ -175,16 +152,6 @@ html[dir=rtl] .progress {
margin-left: 18px; margin-left: 18px;
} }
.page-navigation {
padding: 8px;
background-color: #ebeff9;
margin-right: 4px;
}
.footer {
height: 24px;
}
</style> </style>
<script src="chrome://resources/js/local_strings.js"></script> <script src="chrome://resources/js/local_strings.js"></script>
</head> </head>
...@@ -210,8 +177,6 @@ html[dir=rtl] .progress { ...@@ -210,8 +177,6 @@ html[dir=rtl] .progress {
</div> </div>
<div id="downloads-display"></div> <div id="downloads-display"></div>
</div> </div>
<div class="footer">
</div>
<script src="chrome://downloads/downloads.js"></script> <script src="chrome://downloads/downloads.js"></script>
<script src="chrome://downloads/strings.js"></script> <script src="chrome://downloads/strings.js"></script>
<script src="chrome://resources/js/i18n_template.js"></script> <script src="chrome://resources/js/i18n_template.js"></script>
......
chrome/browser/resources/gpu_internals.html → chrome/browser/resources/gpu_internals/gpu_internals.html
View file @ df8bf739
...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be ...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<head i18n-values="dir:textdirection;"> <head i18n-values="dir:textdirection;">
<link rel="stylesheet" href="webui.css">
<style> <style>
* { * {
box-sizing: border-box; box-sizing: border-box;
...@@ -37,8 +36,9 @@ tabbox tabpanels { ...@@ -37,8 +36,9 @@ tabbox tabpanels {
} }
</style> </style>
<link rel="stylesheet" href="gpu_internals/info_view.css"> <link rel="stylesheet" href="info_view.css">
<link rel="stylesheet" href="chrome://resources/css/tabs.css"> <link rel="stylesheet" href="chrome://resources/css/tabs.css">
<link rel="stylesheet" href="chrome://resources/css/button.css">
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
...@@ -58,7 +58,7 @@ tabbox tabpanels { ...@@ -58,7 +58,7 @@ tabbox tabpanels {
<tab>Profiling</tab> <tab>Profiling</tab>
</tabs> </tabs>
<tabpanels> <tabpanels>
<include src="gpu_internals/info_view.html"> <include src="info_view.html">
<tabpanel id="profiling-view-link"> <tabpanel id="profiling-view-link">
<div> <div>
Profiling view has moved to <a Profiling view has moved to <a
......
chrome/browser/resources/gpu_internals.js → chrome/browser/resources/gpu_internals/gpu_internals.js
View file @ df8bf739
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="gpu_internals/browser_bridge.js"/> <include src="browser_bridge.js"/>
<include src="gpu_internals/info_view.js"/> <include src="info_view.js"/>
var browserBridge; var browserBridge;
......
chrome/browser/resources/history.html
View file @ df8bf739
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<script src="chrome://history/history.js"></script> <script src="chrome://history/history.js"></script>
<script src="chrome://history/strings.js"></script> <script src="chrome://history/strings.js"></script>
<link rel="stylesheet" href="webui.css"> <link rel="stylesheet" href="old_webui.css">
<style> <style>
#results-separator { #results-separator {
margin-top:12px; margin-top:12px;
...@@ -143,8 +143,6 @@ html[dir='rtl'] .entry .title > a { ...@@ -143,8 +143,6 @@ html[dir='rtl'] .entry .title > a {
<div id="results-display"></div> <div id="results-display"></div>
<div id="results-pagination"></div> <div id="results-pagination"></div>
</div> </div>
<div class="footer">
</div>
<script src="chrome://resources/js/i18n_template.js"></script> <script src="chrome://resources/js/i18n_template.js"></script>
<script src="chrome://resources/js/i18n_process.js"></script> <script src="chrome://resources/js/i18n_process.js"></script>
</body> </body>
......
chrome/browser/resources/history2.html
View file @ df8bf739
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<script src="chrome://history2/history2.js"></script> <script src="chrome://history2/history2.js"></script>
<script src="chrome://history2/strings.js"></script> <script src="chrome://history2/strings.js"></script>
<link rel="stylesheet" href="webui2.css"> <link rel="stylesheet" href="old_webui.css">
<style> <style>
#results-separator { #results-separator {
......
chrome/browser/resources/media_internals.html
View file @ df8bf739
...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be ...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<head> <head>
<link rel="stylesheet" href="webui.css" />
<link rel="stylesheet" href="media_internals/media_internals.css" /> <link rel="stylesheet" href="media_internals/media_internals.css" />
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
......
chrome/browser/resources/webui.css → chrome/browser/resources/old_webui.css
View file @ df8bf739
/* Copyright (c) 2011 The Chromium Authors. All rights reserved. /* Copyright (c) 2011 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be * Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. * found in the LICENSE file.
*
* This file contains CSS shared by history and downloads. NOTE: These pages are
* overdue for a revamp so it's more or less deprecated to use or edit this
* file, or copy its contents.
*/ */
body { body {
background-color: white; background-color: white;
color: black; color: black;
margin: 10px; margin: 10px 10px 34px 10px;
} }
.header { .header {
...@@ -18,7 +22,8 @@ body { ...@@ -18,7 +22,8 @@ body {
float: left; float: left;
} }
html[dir='rtl'] .logo { html[dir='rtl'] .logo,
html[dir='rtl'] .form {
float: right; float: right;
} }
...@@ -28,34 +33,8 @@ html[dir='rtl'] .logo { ...@@ -28,34 +33,8 @@ html[dir='rtl'] .logo {
margin-top: 22px; margin-top: 22px;
} }
html[dir='rtl'] .form {
float: right;
}
.page-navigation { .page-navigation {
-webkit-margin-end: 4px; -webkit-margin-end: 4px;
background-color: #ebeff9; background-color: #ebeff9;
padding: 8px; padding: 8px;
} }
.footer {
height: 24px;
}
/* TODO(jhawkins): Refactor button styling and remove !important here. This is
* currently necessary because individual page button element selectors have
* higher specificity.
*/
.link-button,
.link-button:focus,
.link-button:hover {
-webkit-box-shadow: none !important;
background: transparent none !important;
border: none !important;
cursor: pointer;
text-decoration: underline;
}
.displaytable {
display: table;
}
chrome/browser/resources/options/options.html
View file @ df8bf739
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<link rel="stylesheet" href="chrome://resources/css/select.css"> <link rel="stylesheet" href="chrome://resources/css/select.css">
<link rel="stylesheet" href="chrome://resources/css/throbber.css"> <link rel="stylesheet" href="chrome://resources/css/throbber.css">
<link rel="stylesheet" href="chrome://resources/css/tree.css"> <link rel="stylesheet" href="chrome://resources/css/tree.css">
<link rel="stylesheet" href="../webui.css">
<link rel="stylesheet" href="options_page.css"> <link rel="stylesheet" href="options_page.css">
<link rel="stylesheet" href="advanced_options.css"> <link rel="stylesheet" href="advanced_options.css">
<link rel="stylesheet" href="alert_overlay.css"> <link rel="stylesheet" href="alert_overlay.css">
...@@ -80,8 +79,6 @@ ...@@ -80,8 +79,6 @@
<script src="chrome://settings/options_bundle.js"></script> <script src="chrome://settings/options_bundle.js"></script>
</head> </head>
<body i18n-values=".style.fontFamily:fontfamily;"> <body i18n-values=".style.fontFamily:fontfamily;">
<div class="header">
</div>
<div id="overlay" class="overlay transparent" hidden> <div id="overlay" class="overlay transparent" hidden>
<include src="alert_overlay.html"> <include src="alert_overlay.html">
<include src="autofill_edit_address_overlay.html"> <include src="autofill_edit_address_overlay.html">
......
chrome/browser/resources/options/options_page.css
View file @ df8bf739
...@@ -577,10 +577,10 @@ html[flashPluginSupportsClearSiteData] .clear-plugin-lso-data-disabled { ...@@ -577,10 +577,10 @@ html[flashPluginSupportsClearSiteData] .clear-plugin-lso-data-disabled {
/* Display a collection of sections as a table in order to display nicely /* Display a collection of sections as a table in order to display nicely
* in multiple locales. This is a further refinement of the displaytable class * in multiple locales.
* in webui.css.
*/ */
.displaytable { .displaytable {
display: table;
width: 100%; width: 100%;
} }
......
chrome/browser/resources/policy.html
View file @ df8bf739
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<title i18n-content="policyTitle"></title> <title i18n-content="policyTitle"></title>
<link rel="stylesheet" href="chrome://resources/css/button.css"> <link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="policy.css"> <link rel="stylesheet" href="policy.css">
<link rel="stylesheet" href="webui.css">
<script src="chrome://policy/strings.js"></script> <script src="chrome://policy/strings.js"></script>
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
...@@ -16,9 +15,7 @@ ...@@ -16,9 +15,7 @@
<script src="policy.js"></script> <script src="policy.js"></script>
</head> </head>
<body i18n-values=".style.fontFamily:fontfamily; .style.fontSize:fontsize"> <body i18n-values=".style.fontFamily:fontfamily; .style.fontSize:fontsize">
<div class="header"> <h1 id="about-policy-title" i18n-content="policyTitle"></h1>
<h1 id="about-policy-title" i18n-content="policyTitle"></h1>
</div>
<div id="main-content"> <div id="main-content">
<div id="data-template"> <div id="data-template">
<section id="status-section" jsselect="status" hidden <section id="status-section" jsselect="status" hidden
......
chrome/browser/resources/print_preview/print_preview.html
View file @ df8bf739
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<link rel="stylesheet" href="../shared/css/chrome_shared.css"> <link rel="stylesheet" href="../shared/css/chrome_shared.css">
<link rel="stylesheet" href="../shared/css/select.css"> <link rel="stylesheet" href="../shared/css/select.css">
<link rel="stylesheet" href="../shared/css/throbber.css"> <link rel="stylesheet" href="../shared/css/throbber.css">
<link rel="stylesheet" href="../webui.css">
<script src="chrome://resources/js/event_tracker.js"></script> <script src="chrome://resources/js/event_tracker.js"></script>
<script src="chrome://resources/js/local_strings.js"></script> <script src="chrome://resources/js/local_strings.js"></script>
......
chrome/browser/resources/shared/css/button.css
View file @ df8bf739
...@@ -63,14 +63,20 @@ html[os='mac'] input[type='submit']:not(.custom-appearance):focus { ...@@ -63,14 +63,20 @@ html[os='mac'] input[type='submit']:not(.custom-appearance):focus {
outline-offset: -2px; outline-offset: -2px;
} }
.link-button { /* TODO(jhawkins): Refactor button styling and remove !important here. This is
margin: 0; * currently necessary because individual page button element selectors have
} * higher specificity.
*/
.link-button, .link-button,
.link-button:hover, .link-button:focus,
.link-button:focus { .link-button:hover {
-webkit-box-shadow: none !important;
background: transparent none !important;
border: none !important;
color: rgb(63, 110, 194); color: rgb(63, 110, 194);
cursor: pointer;
margin: 0;
text-decoration: underline;
} }
.link-button:active { .link-button:active {
......
chrome/browser/resources/sync_promo.html
View file @ df8bf739
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<script src="sync_promo.js"></script> <script src="sync_promo.js"></script>
<link rel="stylesheet" href="shared/css/button.css"> <link rel="stylesheet" href="shared/css/button.css">
<link rel="stylesheet" href="shared/css/throbber.css"> <link rel="stylesheet" href="shared/css/throbber.css">
<link rel="stylesheet" href="webui.css">
<link rel="stylesheet" href="sync_setup_overlay.css"> <link rel="stylesheet" href="sync_setup_overlay.css">
<link rel="stylesheet" href="sync_promo.css"> <link rel="stylesheet" href="sync_promo.css">
</head> </head>
......
chrome/browser/resources/tracing.html
View file @ df8bf739
...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be ...@@ -6,7 +6,6 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<head i18n-values="dir:textdirection;"> <head i18n-values="dir:textdirection;">
<link rel="stylesheet" href="webui.css">
<style> <style>
* { * {
box-sizing: border-box; box-sizing: border-box;
...@@ -44,6 +43,7 @@ body { ...@@ -44,6 +43,7 @@ body {
<link rel="stylesheet" href="tracing/timeline_view.css"> <link rel="stylesheet" href="tracing/timeline_view.css">
<link rel="stylesheet" href="tracing/timeline.css"> <link rel="stylesheet" href="tracing/timeline.css">
<link rel="stylesheet" href="tracing/tracing_controller.css"> <link rel="stylesheet" href="tracing/tracing_controller.css">
<link rel="stylesheet" href="chrome://resources/css/button.css">
<link rel="stylesheet" href="chrome://resources/css/tabs.css"> <link rel="stylesheet" href="chrome://resources/css/tabs.css">
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
......
chrome/browser/resources/webui2.css deleted 100644 → 0
View file @ 2a5390f3
body {
background-color:white;
color:black;
margin:10px;
}
.header {
overflow:auto;
clear:both;
}
.header .logo {
float:left;
}
.header .form {
float:left;
margin-top:22px;
-webkit-margin-start:12px;
}
html[dir='rtl'] .logo {
float:right;
}
html[dir='rtl'] .form {
float:right;
}
.page-navigation {
padding:8px;
background-color:#ebeff9;
margin-right:4px;
}
.footer {
height:24px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment