merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-12 14:55:45 -05:00
parent 9e1a2cf66a
commit 189942e289
298 changed files with 53049 additions and 5413 deletions

View file

@ -1,6 +1,6 @@
{
"name": "paper-styles",
"version": "1.1.1",
"version": "1.1.2",
"description": "Common (global) styles for Material Design elements.",
"authors": [
"The Polymer Authors"
@ -29,11 +29,11 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "polymerelements/iron-component-page#^1.0.0"
},
"_release": "1.1.1",
"_release": "1.1.2",
"_resolution": {
"type": "version",
"tag": "v1.1.1",
"commit": "fc3ca8dcfc69b9c7a7261e51eefc9741d0f113f8"
"tag": "v1.1.2",
"commit": "7b97fa9d2c190bec9ef2d771d91f47b40a27f3be"
},
"_source": "git://github.com/PolymerElements/paper-styles.git",
"_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{
"name": "paper-styles",
"version": "1.1.1",
"version": "1.1.2",
"description": "Common (global) styles for Material Design elements.",
"authors": [
"The Polymer Authors"

View file

@ -16,24 +16,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
:root {
/*
* Light background theme
* You can use these generic variables in your elements for easy theming.
* For example, if all your elements use `--primary-text-color` as its main
* color, then switching from a light to a dark theme is just a matter of
* changing the value of `--primary-text-color` in your application.
*/
--light-theme-background-color: #ffffff;
--light-theme-base-color: #000000;
--light-theme-text-color: #212121;
--light-theme-secondary-color: #737373; /* for secondary text and icons */
--light-theme-disabled-color: #9b9b9b; /* disabled/hint text */
--light-theme-divider-color: #dbdbdb;
/*
* Dark background theme
*/
--dark-theme-background-color: #212121;
--dark-theme-base-color: #ffffff;
--dark-theme-text-color: #ffffff;
--dark-theme-secondary-color: #bcbcbc; /* for secondary text and icons */
--dark-theme-disabled-color: #646464; /* disabled/hint text */
--dark-theme-divider-color: #3c3c3c;
--primary-text-color: var(--light-theme-text-color);
--primary-background-color: var(--light-theme-background-color);
--secondary-text-color: var(--light-theme-secondary-color);
--disabled-text-color: var(--light-theme-disabled-color);
--divider-color: var(--light-theme-divider-color);
/*
* Primary and accent colors. Also see color.html for more colors.
@ -46,16 +38,32 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--light-accent-color: #ff80ab; /* --paper-pink-a100 */
--dark-accent-color: #f50057; /* --paper-pink-a400 */
/*
* Material Design Light background theme
*/
--light-theme-background-color: #ffffff;
--light-theme-base-color: #000000;
--light-theme-text-color: #212121;
--light-theme-secondary-color: #737373; /* for secondary text and icons */
--light-theme-disabled-color: #9b9b9b; /* disabled/hint text */
--light-theme-divider-color: #dbdbdb;
/*
* Material Design Dark background theme
*/
--dark-theme-background-color: #212121;
--dark-theme-base-color: #ffffff;
--dark-theme-text-color: #ffffff;
--dark-theme-secondary-color: #bcbcbc; /* for secondary text and icons */
--dark-theme-disabled-color: #646464; /* disabled/hint text */
--dark-theme-divider-color: #3c3c3c;
/*
* Deprecated values because of their confusing names.
*/
--primary-text-color: var(--light-theme-text-color);
--text-primary-color: var(--dark-theme-text-color);
--primary-background-color: var(--light-theme-background-color);
--secondary-text-color: var(--light-theme-secondary-color);
--disabled-text-color:var(--light-theme-disabled-color);
--divider-color: var(--light-theme-divider-color);
--default-primary-color: var(--primary-color);
}
</style>