Skip to content

GitLab

T
tangled
Commit c10d06ba authored by afakhry's avatar afakhry Committed by Commit Bot
Browse files
Options

[MD-Settings][Night Light] String and font changes requests 

Implement the last minute font and string changes request.\

Screenshot: https://bugs.chromium.org/p/chromium/issues/detail?id=735253#c4

BUG=735253
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2951213004
Cr-Commit-Position: refs/heads/master@{#481943}
parent 8c422776
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
chrome/app/settings_strings.grdp
View file @ c10d06ba
...@@ -2990,7 +2990,7 @@ ...@@ -2990,7 +2990,7 @@
Night Light Night Light
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_CUSTOM" desc="In Device Settings > Displays, the label of the option to set a custom schedule of the Night Light feature."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_CUSTOM" desc="In Device Settings > Displays, the label of the option to set a custom schedule of the Night Light feature.">
Custom Schedule Custom
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_LABEL" desc="In Device Settings > Displays, the label for the automatic schedule section of the Night Light feature."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_LABEL" desc="In Device Settings > Displays, the label for the automatic schedule section of the Night Light feature.">
Schedule Schedule
...@@ -3008,16 +3008,16 @@ ...@@ -3008,16 +3008,16 @@
End time End time
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEXT" desc="In Device Settings > Displays, text describing the Night Light feature."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEXT" desc="In Device Settings > Displays, text describing the Night Light feature.">
Makes it easier to look at your screen or read in dim light Make it easier to look at your screen or read in dim light
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMPERATURE_LABEL" desc="In Device Settings > Displays, label of the slider that controls the color temperature of the screen when the Night Light feature is on."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMPERATURE_LABEL" desc="In Device Settings > Displays, label of the slider that controls the color temperature of the screen when the Night Light feature is on.">
Color temperature Color temperature
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MAX_LABEL" desc="In Device Settings > Displays, label of the maximum value settable by the color temperature slider."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MAX_LABEL" desc="In Device Settings > Displays, label of the maximum value settable by the color temperature slider.">
More warm Warmer
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MIN_LABEL" desc="In Device Settings > Displays, label of the minimum value settable by the color temperature slider."> <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MIN_LABEL" desc="In Device Settings > Displays, label of the minimum value settable by the color temperature slider.">
Less warm Cooler
</message> </message>
<message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP" desc="In Device Settings > Displays, the label for the control for the unified desktop feature."> <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP" desc="In Device Settings > Displays, the label for the control for the unified desktop feature.">
Allow windows to span displays Allow windows to span displays
......
chrome/browser/resources/settings/device_page/night_light_slider.html
View file @ c10d06ba
...@@ -3,11 +3,13 @@ ...@@ -3,11 +3,13 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-behaviors/paper-inky-focus-behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-behaviors/paper-inky-focus-behavior.html">
<link rel="import" href="../prefs/prefs_behavior.html"> <link rel="import" href="../prefs/prefs_behavior.html">
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
</head><body><dom-module id="night-light-slider"> </head><body><dom-module id="night-light-slider">
<template> <template>
<style> <style>
:host { :host {
cursor: default; cursor: default;
font-family: 'Roboto', sans-serif;
text-align: center; text-align: center;
user-select: none; user-select: none;
} }
...@@ -79,7 +81,6 @@ ...@@ -79,7 +81,6 @@
background: var(--google-blue-700); background: var(--google-blue-700);
border-radius: 14px; border-radius: 14px;
color: white; color: white;
font-family: Roboto-Bold;
font-size: 12px; font-size: 12px;
left: 0; left: 0;
line-height: 1.5em; line-height: 1.5em;
...@@ -122,7 +123,6 @@ ...@@ -122,7 +123,6 @@
#legendContainer > div { #legendContainer > div {
color: rgb(100, 100, 100); color: rgb(100, 100, 100);
font-family: Roboto-Regular;
font-size: 12px; font-size: 12px;
margin-left: -2.5em; margin-left: -2.5em;
position: absolute; position: absolute;
......
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