Commit 87253c9c authored by dschuyler's avatar dschuyler Committed by Commit bot

[MD settings] icon color and sizing centralized

This CL moves the common iron-icon coloring and sizing
to the settings shared style-module.  The variations
and one-offs are now in more specific files (such as
the side nav icons).

BUG=589630

Review URL: https://codereview.chromium.org/1813643002

Cr-Commit-Position: refs/heads/master@{#381772}
parent 8413f9ef
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
iron-icon { iron-icon {
-webkit-padding-start: 10px; -webkit-padding-start: 10px;
color: green;
} }
paper-item:hover { paper-item:hover {
......
...@@ -16,12 +16,8 @@ ...@@ -16,12 +16,8 @@
} }
paper-dropdown-menu { paper-dropdown-menu {
--iron-icon-fill-color: { --iron-icon-fill-color: var(--paper-grey-800);
var(--paper-grey-800); --iron-icon-stroke-color: var(--paper-grey-800);
};
--iron-icon-stroke-color: {
var(--paper-grey-800);
};
--paper-font-subhead: { --paper-font-subhead: {
font-size: inherit; font-size: inherit;
}; };
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#availableIcons iron-icon { #availableIcons iron-icon {
border: 1px solid var(--google-grey-500); border: 1px solid var(--google-grey-500);
height: 32px;
padding: 17px; padding: 17px;
width: 32px;
} }
#availableIcons .iron-selected { #availableIcons .iron-selected {
......
...@@ -2,15 +2,6 @@ ...@@ -2,15 +2,6 @@
* Use of this source code is governed by a BSD-style license that can be * Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */ * found in the LICENSE file. */
.clear-icon {
color: #6e6e6e;
}
.clear-icon::shadow iron-icon {
height: 18px;
width: 18px;
}
.soft-border { .soft-border {
border: 1px solid #c4c4c4; border: 1px solid #c4c4c4;
border-radius: 2px; border-radius: 2px;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submenu.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submenu.html">
<link rel="import" href="chrome://md-settings/settings_shared_css.html">
<if expr="chromeos"> <if expr="chromeos">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons.html">
...@@ -13,11 +14,11 @@ ...@@ -13,11 +14,11 @@
<dom-module id="settings-menu"> <dom-module id="settings-menu">
<template> <template>
<style> <style include="settings-shared">
iron-icon { iron-icon {
--iron-icon-fill-color: var(--settings-side-nav-color);
--iron-icon-stroke-color: var(--settings-side-nav-color);
-webkit-margin-end: 16px; -webkit-margin-end: 16px;
height: 20px;
width: 20px;
} }
.menu-trigger span { .menu-trigger span {
...@@ -26,8 +27,8 @@ ...@@ -26,8 +27,8 @@
} }
paper-menu { paper-menu {
background-color: rgb(236, 239, 241); background-color: var(--settings-background-color);
color: #5a5a5a; color: var(--settings-side-nav-color);
font-size: 13px; font-size: 13px;
--paper-menu-selected-item: { --paper-menu-selected-item: {
font-weight: 500; font-weight: 500;
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
paper-submenu paper-menu { paper-submenu paper-menu {
--paper-menu-selected-item: { --paper-menu-selected-item: {
color: #4285f4; color: var(--google-blue-500);
font-weight: 500; font-weight: 500;
}; };
padding: 0; padding: 0;
......
...@@ -6,10 +6,22 @@ ...@@ -6,10 +6,22 @@
--checkbox-margin-start: 2px; --checkbox-margin-start: 2px;
--checkbox-size: 16px; --checkbox-size: 16px;
--checkbox-spacing: 18px; --checkbox-spacing: 18px;
--iron-icon-fill-color: var(--paper-grey-500);
--iron-icon-height: 20px;
--iron-icon-stroke-color: var(--paper-grey-500);
--iron-icon-width: 20px;
--paper-icon-button: {
width: 36px;
height: 36px;
}
--settings-background-color: var(--paper-blue-grey-50);
--settings-secondary: { --settings-secondary: {
color: var(--paper-grey-500); color: var(--paper-grey-500);
font-weight: 400; font-weight: 400;
} }
--settings-side-nav-color: var(--google-grey-600);
/* TODO(dschuyler): replace this rgb with a --paper color */
--settings-title-bar-color: rgb(52, 73, 94);
} }
h2 { h2 {
...@@ -22,12 +34,10 @@ ...@@ -22,12 +34,10 @@
min-height: 40px; min-height: 40px;
} }
iron-icon { iron-icon[icon=check],
color: var(--paper-grey-300);
}
iron-icon[icon=done] { iron-icon[icon=done] {
color: var(--google-green-500); --iron-icon-fill-color: var(--google-green-500);
--iron-icon-stroke-color: var(--google-green-500);
} }
paper-button { paper-button {
...@@ -138,12 +148,6 @@ ...@@ -138,12 +148,6 @@
border-bottom: 1px solid var(--paper-grey-300); border-bottom: 1px solid var(--paper-grey-300);
} }
.list-item iron-icon {
@apply(--layout-center);
height: 20px;
width: 20px;
}
.list-item select { .list-item select {
-webkit-margin-start: 4px; -webkit-margin-start: 4px;
} }
...@@ -192,12 +196,6 @@ ...@@ -192,12 +196,6 @@
min-height: 52px; min-height: 52px;
} }
.settings-box iron-icon {
@apply(--layout-center);
height: 20px;
width: 20px;
}
.settings-box .secondary { .settings-box .secondary {
@apply(--settings-secondary); @apply(--settings-secondary);
} }
......
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