Commit 8369a08e authored by Weidong Guo's avatar Weidong Guo Committed by Commit Bot

Fix folder title color issue

Changes:
Change the color of the folder title to be Grey 700.

Bug: 901286
Change-Id: Ie2e4603a6b248976fbdb114533e1c6e90485bd01
Reviewed-on: https://chromium-review.googlesource.com/c/1330833Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607299}
parent 8462afe8
......@@ -69,14 +69,13 @@ FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
IDS_APP_LIST_FOLDER_NAME_PLACEHOLDER)),
delegate_(delegate),
folder_name_visible_(true) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
gfx::FontList font_list = rb.GetFontList(ui::ResourceBundle::MediumFont);
folder_name_view_->set_placeholder_text_color(kFolderTitleHintTextColor);
folder_name_view_->set_placeholder_text(folder_name_placeholder_text_);
folder_name_view_->SetBorder(views::NullBorder());
// Make folder name font size 14px.
folder_name_view_->SetFontList(font_list.DeriveWithSizeDelta(-1));
folder_name_view_->SetFontList(
ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(2));
folder_name_view_->SetBackgroundColor(SK_ColorTRANSPARENT);
folder_name_view_->SetTextColor(kFolderNameColor);
folder_name_view_->set_controller(this);
......
......@@ -36,7 +36,7 @@ const SkColor kPagerSelectedColor = SkColorSetRGB(0x46, 0x8F, 0xFC);
// it includes top 24px padding and bottom 56px padding.
const int kHorizontalPagePreferredHeight = 623;
const SkColor kFolderTitleColor = SkColorSetRGB(0x33, 0x33, 0x33);
const SkColor kFolderTitleColor = gfx::kGoogleGrey700;
const SkColor kFolderTitleHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
// Color of the folder bubble shadow.
const SkColor kFolderShadowColor = SkColorSetRGB(0xBF, 0xBF, 0xBF);
......
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