Update some webui question mark icons to SVG.
BUG=505953
Review URL: https://codereview.chromium.org/1228163005
Cr-Commit-Position: refs/heads/master@{#339193}
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index a2b99f64..61c2270f 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -17,7 +17,7 @@
<if expr="is_win">
<structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="chrome_html" />
</if>
- <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" type="chrome_html" />
+ <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" flattenhtml="true" type="chrome_html" />
<structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
<if expr="enable_app_list">
<structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\start_page.css" flattenhtml="true" type="chrome_html" />
diff --git a/chrome/browser/resources/about_memory.css b/chrome/browser/resources/about_memory.css
index 688c7e62..5bb2535 100644
--- a/chrome/browser/resources/about_memory.css
+++ b/chrome/browser/resources/about_memory.css
@@ -50,17 +50,29 @@
color: white;
margin-bottom: 0.75em;
overflow: hidden;
- padding: 0.6em 1em 0.75em 0;
+ padding: 0.5em 0;
position: relative;
text-shadow: 0 0 2px black;
}
div#header h1 {
- background: url(chrome://resources/images/gear.png) 12px 60% no-repeat;
color: white;
display: inline;
- margin: 0;
- padding-left: 37px;
+}
+
+div#header h1::before {
+ /* grit doesn't flatten -webkit-mask, so define the properties separately
+ * for now. */
+ -webkit-mask-image: url(../../../ui/webui/resources/images/settings.svg);
+ -webkit-mask-position: center;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-size: 24px;
+ background-color: white;
+ content: '';
+ display: inline-block;
+ height: 20px;
+ vertical-align: middle;
+ width: 37px;
}
div#header p {
@@ -258,12 +270,14 @@
}
div.help {
- background: url(chrome://resources/images/help.png) center bottom no-repeat;
+ -webkit-mask-box-image: url(../../../ui/webui/resources/images/help.svg);
+ background-color: rgb(66, 133, 244);
display: inline-block;
- height: 14px;
- margin: -1px 0;
+ height: 16px;
+ margin: -1px 0 0 0;
opacity: 0.33;
- width: 14px;
+ vertical-align: bottom;
+ width: 16px;
}
div.help:hover {
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 6b670a19..9cfc1f0 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -30,9 +30,7 @@
</head>
<body>
<div id="header">
- <h1>
- About memory
- </h1>
+ <h1>About memory</h1>
<p>
Measuring memory usage in a multi-process browser
</p>
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html
index 9ea8ac9..da7870e 100644
--- a/chrome/browser/resources/about_memory_linux.html
+++ b/chrome/browser/resources/about_memory_linux.html
@@ -19,9 +19,7 @@
</head>
<body>
<div id="header">
- <h1>
- About memory
- </h1>
+ <h1>About memory</h1>
<p>
Measuring memory usage in a multi-process browser
</p>
diff --git a/chrome/browser/resources/about_memory_mac.html b/chrome/browser/resources/about_memory_mac.html
index 6662ee0..e947f30 100644
--- a/chrome/browser/resources/about_memory_mac.html
+++ b/chrome/browser/resources/about_memory_mac.html
@@ -27,9 +27,7 @@
</head>
<body>
<div id="header">
- <h1>
- About memory
- </h1>
+ <h1>About memory</h1>
<p>
Measuring memory usage in a multi-process browser
</p>
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.css b/chrome/browser/resources/options/reset_profile_settings_overlay.css
index 62ceed9..c20f8220 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.css
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.css
@@ -47,12 +47,16 @@
white-space: pre-line;
}
+#feedback-bar span {
+ vertical-align: middle;
+}
+
#expand-feedback {
- background: url(chrome://theme/IDR_QUESTION_MARK) no-repeat center;
+ -webkit-mask-box-image: url(../../../../ui/webui/resources/images/help.svg);
+ background-color: #828282;
display: inline-block;
height: 14px;
opacity: 0.33;
- vertical-align: bottom;
width: 14px;
}
diff --git a/ui/webui/resources/images/help.png b/ui/webui/resources/images/help.png
deleted file mode 100644
index 6eb2c6e..0000000
--- a/ui/webui/resources/images/help.png
+++ /dev/null
Binary files differ
diff --git a/ui/webui/resources/images/help.svg b/ui/webui/resources/images/help.svg
new file mode 100644
index 0000000..dcd0c3f1
--- /dev/null
+++ b/ui/webui/resources/images/help.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 48 48" fill="#000000">
+ <path d="M0 0h48v48H0z" fill="none"/>
+ <path d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm2 34h-4v-4h4v4zm4.13-15.49l-1.79 1.84C26.9 25.79 26 27 26 30h-4v-1c0-2.21.9-4.21 2.34-5.66l2.49-2.52C27.55 20.1 28 19.1 28 18c0-2.21-1.79-4-4-4s-4 1.79-4 4h-4c0-4.42 3.58-8 8-8s8 3.58 8 8c0 1.76-.71 3.35-1.87 4.51z"/>
+</svg>
diff --git a/ui/webui/resources/images/settings.svg b/ui/webui/resources/images/settings.svg
new file mode 100644
index 0000000..6cffa62
--- /dev/null
+++ b/ui/webui/resources/images/settings.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 48 48" fill="#000000">
+ <path d="M0 0h48v48H0z" fill="none"/>
+ <path d="M38.86 25.95c.08-.64.14-1.29.14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3.49-.84.24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97L29 4.84c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91.37-.99.84l-.75 5.3c-1.22.51-2.35 1.17-3.38 1.97L9.9 10.1c-.45-.17-.97 0-1.22.43l-4 6.93c-.25.43-.14.97.24 1.28l4.22 3.31C9.06 22.69 9 23.34 9 24s.06 1.31.14 1.95l-4.22 3.31c-.38.3-.49.84-.24 1.28l4 6.93c.25.43.77.61 1.22.43l4.98-2.01c1.03.79 2.16 1.46 3.38 1.97l.75 5.3c.08.47.49.84.99.84h8c.5 0 .91-.37.99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45.17.97 0 1.22-.43l4-6.93c.25-.43.14-.97-.24-1.28l-4.22-3.31zM24 31c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/>
+</svg>
diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd
index 6138e22..cfa8366d 100644
--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
@@ -189,8 +189,6 @@
file="images/gear.png" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_GOOGLE_TRANSPARENT"
file="images/google-transparent.png" type="BINDATA" />
- <include name="IDR_WEBUI_IMAGES_HELP"
- file="images/help.png" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_QUESTION_MARK"
file="images/question_mark.png" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_SELECT"
