summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/resources/new_tab_theme.css34
-rw-r--r--chrome/browser/resources/ntp4/new_tab_theme.css26
-rw-r--r--chrome/browser/ui/webui/ntp/ntp_resource_cache.cc39
3 files changed, 45 insertions, 54 deletions
diff --git a/chrome/browser/resources/new_tab_theme.css b/chrome/browser/resources/new_tab_theme.css
index 682cf16..a4b7154 100644
--- a/chrome/browser/resources/new_tab_theme.css
+++ b/chrome/browser/resources/new_tab_theme.css
@@ -23,12 +23,12 @@ body {
/* TODO(aa): Is this still in use? The styling may be incorrect with M7 NTP
rework. */
#notification.first-run {
- background-color: $$1; /* COLOR_NTP_SECTION */
- border-color: $$2; /* COLOR_NTP_SECTION_BORDER */
+ background-color: $10; /* COLOR_NTP_SECTION */
+ border-color: $11; /* COLOR_NTP_SECTION_BORDER */
}
#notification.first-run .link {
- color: $$5; /* COLOR_NTP_LINK_UNDERLINE */
+ color: $14; /* COLOR_NTP_LINK_UNDERLINE */
}
#notification.first-run .link-color {
@@ -36,7 +36,7 @@ body {
}
.thumbnail {
- border-color: $$1; /* COLOR_NTP_SECTION */
+ border-color: $10; /* COLOR_NTP_SECTION */
}
.thumbnail-container,
@@ -61,13 +61,13 @@ body {
}
.filler .thumbnail-wrapper {
- border: 3px solid $$1; /* COLOR_NTP_SECTION */
+ border: 3px solid $10; /* COLOR_NTP_SECTION */
background-color: $2; /* COLOR_NTP_BACKGROUND */
}
.filler .thumbnail {
border: 1px solid $2; /* COLOR_NTP_BACKGROUND */
- background-color: $$1; /* COLOR_NTP_SECTION */
+ background-color: $10; /* COLOR_NTP_SECTION */
}
.miniview {
@@ -75,7 +75,7 @@ body {
}
.miniview > span {
- color: $$5; /* COLOR_NTP_LINK_UNDERLINE */
+ color: $14; /* COLOR_NTP_LINK_UNDERLINE */
text-decoration: underline;
}
@@ -99,35 +99,35 @@ body {
:link,
:visited,
.link {
- color: $$5; /* COLOR_NTP_LINK_UNDERLINE */
+ color: $14; /* COLOR_NTP_LINK_UNDERLINE */
}
.section > h2,
#closed-sections-bar > button {
- color: $$7; /* COLOR_NTP_SECTION_HEADER_TEXT */
+ color: $16; /* COLOR_NTP_SECTION_HEADER_TEXT */
}
.section:not(.hidden) > h2 {
- color: $$8; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
+ color: $17; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
}
.section.hidden:not([noexpand]) > h2:hover,
#closed-sections-bar > button:hover {
- color: $$8; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
+ color: $17; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
}
.section > h2 .back,
#closed-sections-bar[chromeos] {
- border-top: 1px solid $$1; /* COLOR_NTP_SECTION */
+ border-top: 1px solid $10; /* COLOR_NTP_SECTION */
}
.section.hidden > h2 .back {
background: none;
- border-color-top: $$$1; /* COLOR_NTP_SECTION_HEADER_RULE_LIGHT */
+ border-color-top: $19; /* COLOR_NTP_SECTION_HEADER_RULE_LIGHT */
}
.section.hidden:hover > h2 .back {
- border-color-top: $$9; /* COLOR_NTP_SECTION_HEADER_RULE */
+ border-color-top: $18; /* COLOR_NTP_SECTION_HEADER_RULE */
}
.app a {
@@ -136,8 +136,8 @@ body {
.app:hover > a,
.app.dragging > a {
- color: $$3; /* COLOR_NTP_SECTION_TEXT */
- background-color: $$1; /* COLOR_NTP_SECTION */;
+ color: $12; /* COLOR_NTP_SECTION_TEXT */
+ background-color: $10; /* COLOR_NTP_SECTION */;
}
#apps-promo-hide {
@@ -145,5 +145,5 @@ body {
}
#apps-promo-text2 {
- color: $$$3; /* COLOR_NTP_TEXT_LIGHT */
+ color: $21; /* COLOR_NTP_TEXT_LIGHT */
}
diff --git a/chrome/browser/resources/ntp4/new_tab_theme.css b/chrome/browser/resources/ntp4/new_tab_theme.css
index da046e2..cde2dd0 100644
--- a/chrome/browser/resources/ntp4/new_tab_theme.css
+++ b/chrome/browser/resources/ntp4/new_tab_theme.css
@@ -29,35 +29,35 @@ body {
:link,
:visited,
.link {
- color: $$5; /* COLOR_NTP_LINK_UNDERLINE */
+ color: $14; /* COLOR_NTP_LINK_UNDERLINE */
}
.section > h2,
#closed-sections-bar > button {
- color: $$7; /* COLOR_NTP_SECTION_HEADER_TEXT */
+ color: $16; /* COLOR_NTP_SECTION_HEADER_TEXT */
}
.section:not(.hidden) > h2 {
- color: $$8; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
+ color: $17; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
}
.section.hidden:not([noexpand]) > h2:hover,
#closed-sections-bar > button:hover {
- color: $$8; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
+ color: $17; /* COLOR_NTP_SECTION_HEADER_TEXT_HOVER */
}
.section > h2 .back,
#closed-sections-bar[chromeos] {
- border-top: 1px solid $$1; /* COLOR_NTP_SECTION */
+ border-top: 1px solid $10; /* COLOR_NTP_SECTION */
}
.section.hidden > h2 .back {
background: none;
- border-color-top: $$$1; /* COLOR_NTP_SECTION_HEADER_RULE_LIGHT */
+ border-color-top: $19; /* COLOR_NTP_SECTION_HEADER_RULE_LIGHT */
}
.section.hidden:hover > h2 .back {
- border-color-top: $$9; /* COLOR_NTP_SECTION_HEADER_RULE */
+ border-color-top: $18; /* COLOR_NTP_SECTION_HEADER_RULE */
}
.app span,
@@ -67,8 +67,8 @@ body {
.app:hover > a,
.app.dragging > a {
- color: $$3; /* COLOR_NTP_SECTION_TEXT */
- background-color: $$1; /* COLOR_NTP_SECTION */;
+ color: $12; /* COLOR_NTP_SECTION_TEXT */
+ background-color: $10; /* COLOR_NTP_SECTION */;
}
/* Footer *********************************************************************/
@@ -82,7 +82,7 @@ body {
}
.dot {
- border-color: $$2; /* COLOR_NTP_SECTION_BORDER */
+ border-color: $11; /* COLOR_NTP_SECTION_BORDER */
}
.dot.selected {
@@ -90,7 +90,7 @@ body {
}
.dot:hover {
- background-color: $$2; /* COLOR_NTP_SECTION_BORDER */
+ background-color: $11; /* COLOR_NTP_SECTION_BORDER */
}
.dot input:focus {
@@ -100,7 +100,7 @@ body {
.tile-page-title,
#footer-content span,
#footer-content input {
- color: $$$3; /* COLOR_NTP_TEXT_LIGHT */
+ color: $21; /* COLOR_NTP_TEXT_LIGHT */
}
.disclosure-triangle {
@@ -127,7 +127,7 @@ body {
.thumbnail-wrapper {
/* This shows through at the (rounded) thumbnail's corners. */
- background-color: $$2; /* COLOR_NTP_SECTION_BORDER */
+ background-color: $11; /* COLOR_NTP_SECTION_BORDER */
}
.filler .thumbnail {
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 51853ae..072cf19 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -517,10 +517,6 @@ void NTPResourceCache::CreateNewTabCSS() {
// Generate the replacements.
std::vector<std::string> subst;
- // A second list of replacements, each of which must be in $$x format,
- // where x is a digit from 1-9.
- std::vector<std::string> subst2;
- std::vector<std::string> subst3;
// Cache-buster for background.
subst.push_back(
@@ -535,23 +531,21 @@ void NTPResourceCache::CreateNewTabCSS() {
subst.push_back(SkColorToRGBAString(color_header_gradient_light)); // $7
subst.push_back(SkColorToRGBAString(color_text)); // $8
subst.push_back(SkColorToRGBAString(color_link)); // $9
-
- subst2.push_back(SkColorToRGBAString(color_section)); // $$1
- subst2.push_back(SkColorToRGBAString(color_section_border)); // $$2
- subst2.push_back(SkColorToRGBAString(color_section_text)); // $$3
- subst2.push_back(SkColorToRGBAString(color_section_link)); // $$4
- subst2.push_back(SkColorToRGBAString(color_link_underline)); // $$5
- subst2.push_back(SkColorToRGBAString(color_section_link_underline)); // $$6
- subst2.push_back(SkColorToRGBAString(color_section_header_text)); // $$7
- subst2.push_back(SkColorToRGBAString(
- color_section_header_text_hover)); // $$8
- subst2.push_back(SkColorToRGBAString(color_section_header_rule)); // $$9
-
- subst3.push_back(SkColorToRGBAString(
- color_section_header_rule_light)); // $$$1
- subst3.push_back(SkColorToRGBAString(
- SkColorSetA(color_section_header_rule, 0))); // $$$2
- subst3.push_back(SkColorToRGBAString(color_text_light)); // $$$3
+ subst.push_back(SkColorToRGBAString(color_section)); // $10
+ subst.push_back(SkColorToRGBAString(color_section_border)); // $11
+ subst.push_back(SkColorToRGBAString(color_section_text)); // $12
+ subst.push_back(SkColorToRGBAString(color_section_link)); // $13
+ subst.push_back(SkColorToRGBAString(color_link_underline)); // $14
+ subst.push_back(SkColorToRGBAString(color_section_link_underline)); // $15
+ subst.push_back(SkColorToRGBAString(color_section_header_text)); // $16
+ subst.push_back(SkColorToRGBAString(
+ color_section_header_text_hover)); // $17
+ subst.push_back(SkColorToRGBAString(color_section_header_rule)); // $18
+ subst.push_back(SkColorToRGBAString(
+ color_section_header_rule_light)); // $19
+ subst.push_back(SkColorToRGBAString(
+ SkColorSetA(color_section_header_rule, 0))); // $20
+ subst.push_back(SkColorToRGBAString(color_text_light)); // $21
// Get our template.
int ntp_css_resource_id =
@@ -564,9 +558,6 @@ void NTPResourceCache::CreateNewTabCSS() {
// Create the string from our template and the replacements.
std::string css_string;
css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
- css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
- css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
-
new_tab_css_ = new RefCountedBytes;
new_tab_css_->data.resize(css_string.size());
std::copy(css_string.begin(), css_string.end(),
generated by cgit v1.1 at 2025-03-19 19:50:06 +0000