Commit 029a7c42 authored by Scott Chen's avatar Scott Chen Committed by Commit Bot

Settings: moved --paper-input-max-width from cr-shared to settings-shared css

Found the "--paper-input-max-width" is only used within settings/ so moving
it to settings-shared style sheet.

Bug: 832177
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I84f2f8b46f4d2c7a95c32ec57ed4be1339bfa5dd
Reviewed-on: https://chromium-review.googlesource.com/1070932Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Scott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561720}
parent 2327f4ca
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="smb_browser_proxy.html"> <link rel="import" href="smb_browser_proxy.html">
<dom-module id="settings-add-smb-share-dialog"> <dom-module id="settings-add-smb-share-dialog">
<template> <template>
<style include="settings-shared"> <style include="settings-shared">
paper-input { paper-input {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
} }
</style> </style>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../prefs/prefs_behavior.html"> <link rel="import" href="../prefs/prefs_behavior.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<dom-module id="settings-edit-dictionary-page"> <dom-module id="settings-edit-dictionary-page">
<template> <template>
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
} }
#newWord { #newWord {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
} }
iron-list .word { iron-list .word {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
.address-column { .address-column {
-webkit-margin-end: 16px; -webkit-margin-end: 16px;
margin-bottom: 8px; margin-bottom: 8px;
width: calc((var(--paper-input-max-width) - 16px) / 2); width: calc((var(--settings-input-max-width) - 16px) / 2);
} }
#select-row { #select-row {
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
.md-select { .md-select {
--md-select-width: var(--paper-input-max-width); --md-select-width: var(--settings-input-max-width);
} }
#select-label { #select-label {
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
} }
.long { .long {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
} }
#saveButton { #saveButton {
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<link rel="import" href="chrome://resources/html/md_select_css.html"> <link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<dom-module id="settings-credit-card-edit-dialog"> <dom-module id="settings-credit-card-edit-dialog">
<template> <template>
<style include="settings-shared md-select"> <style include="settings-shared md-select">
paper-input { paper-input {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
} }
.md-select-wrapper { .md-select-wrapper {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
<link rel="import" href="../icons.html"> <link rel="import" href="../icons.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="show_password_behavior.html"> <link rel="import" href="show_password_behavior.html">
<dom-module id="password-edit-dialog"> <dom-module id="password-edit-dialog">
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
} }
paper-input { paper-input {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
} }
paper-icon-button-light { paper-icon-button-light {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<link rel="import" href="../privacy_page/personalization_options.html"> <link rel="import" href="../privacy_page/personalization_options.html">
<link rel="import" href="../route.html"> <link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<if expr="not chromeos"> <if expr="not chromeos">
<link rel="import" href="chrome://resources/cr_elements/cr_toast/cr_toast.html"> <link rel="import" href="chrome://resources/cr_elements/cr_toast/cr_toast.html">
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
} }
paper-input { paper-input {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
--paper-input-container-focus-color: var(--google-blue-500); --paper-input-container-focus-color: var(--google-blue-500);
--paper-input-container-input: { --paper-input-container-input: {
font-size: inherit; font-size: inherit;
......
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<dom-module id="settings-users-add-user-dialog"> <dom-module id="settings-users-add-user-dialog">
<template> <template>
<style include="settings-shared"> <style include="settings-shared">
paper-input { paper-input {
width: var(--paper-input-max-width); width: var(--settings-input-max-width);
--paper-input-container-focus-color: var(--google-blue-500); --paper-input-container-focus-color: var(--google-blue-500);
--paper-input-container-input: { --paper-input-container-input: {
font-size: inherit; font-size: inherit;
......
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
/* Spacing between policy (controlledBy) indicator and control. */ /* Spacing between policy (controlledBy) indicator and control. */
--settings-controlled-by-spacing: var(--cr-controlled-by-spacing); --settings-controlled-by-spacing: var(--cr-controlled-by-spacing);
--settings-input-max-width: 264px;
--iron-icon-fill-color: var(--paper-grey-600); --iron-icon-fill-color: var(--paper-grey-600);
--iron-icon-height: var(--cr-icon-size); --iron-icon-height: var(--cr-icon-size);
--iron-icon-width: var(--cr-icon-size); --iron-icon-width: var(--cr-icon-size);
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
line-height: 1.54; line-height: 1.54;
overflow: visible; /* Half-visible error message is not useful at all. */ overflow: visible; /* Half-visible error message is not useful at all. */
}; };
--paper-input-max-width: 264px;
--paper-input-container-underline: { --paper-input-container-underline: {
border-color: var(--paper-grey-300); border-color: var(--paper-grey-300);
}; };
......
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