Commit 3ba1fe2e authored by khorimoto's avatar khorimoto Committed by Commit bot

Convert *.css files to *_style.html files for the following custom elements:...

Convert *.css files to *_style.html files for the following custom elements: date_time_page, settings_drawer, settings_main, settings_menu, settings_page_header, and settings_ui. See http://goo.gl/vIGSCO for more information.

BUG=477154

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

Cr-Commit-Position: refs/heads/master@{#325353}
parent 1eaed7d1
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
<link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html"> <link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html">
<link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html"> <link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html">
<link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html"> <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html">
<link rel="import" href="date_time_page_style.html">
<polymer-element name="cr-settings-date-time-page"> <polymer-element name="cr-settings-date-time-page">
<template> <template>
<link rel="stylesheet" href="chrome://md-settings/settings_page/settings_page.css"> <link rel="stylesheet" href="chrome://md-settings/settings_page/settings_page.css">
<link rel="stylesheet" href="date_time_page.css"> <core-style ref="dateTimePageStyle"></core-style>
<paper-shadow layout vertical cross-fade> <paper-shadow layout vertical cross-fade>
<div horizontal layout center> <div horizontal layout center>
<core-label horizontal layout center> <core-label horizontal layout center>
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="dateTimePageStyle">
core-label { core-label {
margin: 10px; margin: 10px;
} }
...@@ -13,3 +13,4 @@ core-label { ...@@ -13,3 +13,4 @@ core-label {
#setAutomatically { #setAutomatically {
margin: 10px; margin: 10px;
} }
</core-style>
<link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
<link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html"> <link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html">
<link rel="import" href="settings_drawer_style.html">
<polymer-element name="cr-settings-drawer" layout vertical> <polymer-element name="cr-settings-drawer" layout vertical>
<template> <template>
<link rel="stylesheet" href="settings_drawer.css"> <core-style ref="settingsDrawerStyle"></core-style>
<!-- TODO(michaelpg): Create a new user card component. --> <!-- TODO(michaelpg): Create a new user card component. -->
<div id="user-card" class="medium" layout horizontal center> <div id="user-card" class="medium" layout horizontal center>
<img src="{{user.iconUrl}}"> <img src="{{user.iconUrl}}">
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="settingsDrawerStyle">
:host { :host {
background-color: rgb(38, 50, 56); background-color: rgb(38, 50, 56);
color: white; color: white;
...@@ -29,3 +29,4 @@ ...@@ -29,3 +29,4 @@
#user-card .email { #user-card .email {
font-size: 14px; font-size: 14px;
} }
</core-style>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html"> <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html">
<link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
<link rel="import" href="chrome://md-settings/routing/more_routing/more_routing.html"> <link rel="import" href="chrome://md-settings/routing/more_routing/more_routing.html">
<link rel="import" href="settings_main_style.html">
<!-- Drivers manage how the URL is read, and how to navigate to URLs. "path" <!-- Drivers manage how the URL is read, and how to navigate to URLs. "path"
based driver means URLs like /a11y are generated. For more details, see based driver means URLs like /a11y are generated. For more details, see
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
<more-routing-config driver="path"></more-routing-config> <more-routing-config driver="path"></more-routing-config>
<polymer-element name="cr-settings-main"> <polymer-element name="cr-settings-main">
<template> <template>
<link rel="stylesheet" href="settings_main.css"> <core-style ref="settingsMainStyle"></core-style>
<div id="mainContainer"> <div id="mainContainer">
<content select="core-icon-button"></content> <content select="core-icon-button"></content>
<more-route-selector> <more-route-selector>
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="settingsMainStyle">
:host { :host {
background-color: rgb(219, 222, 224); background-color: rgb(219, 222, 224);
color: black; color: black;
...@@ -29,3 +29,4 @@ ...@@ -29,3 +29,4 @@
::content core-icon-button { ::content core-icon-button {
position: absolute; position: absolute;
} }
</core-style>
<link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html"> <link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html">
<link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html"> <link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html">
<link rel="import" href="settings_menu_style.html">
<polymer-element name="cr-settings-menu"> <polymer-element name="cr-settings-menu">
<template> <template>
<link rel="stylesheet" href="settings_menu.css"> <core-style ref="settingsMenuStyle"></core-style>
<!-- TODO(jlklein): selectedAttribute here is a workaround for <!-- TODO(jlklein): selectedAttribute here is a workaround for
https://github.com/Polymer/polymer/issues/946. Remove when core-menu https://github.com/Polymer/polymer/issues/946. Remove when core-menu
is updated. --> is updated. -->
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="settingsMenuStyle">
:host { :host {
display: block; display: block;
} }
...@@ -25,3 +25,4 @@ paper-item.core-selected { ...@@ -25,3 +25,4 @@ paper-item.core-selected {
paper-item core-icon { paper-item core-icon {
-webkit-margin-end: 10px; -webkit-margin-end: 10px;
} }
</core-style>
<link rel="import" href="chrome://resources/polymer/core-icon/core-icon.html"> <link rel="import" href="chrome://resources/polymer/core-icon/core-icon.html">
<link rel="import" href="chrome://resources/polymer/core-icons/device-icons.html"> <link rel="import" href="chrome://resources/polymer/core-icons/device-icons.html">
<link rel="import" href="settings_page_header_style.html">
<polymer-element name="cr-settings-page-header" layout horizontal center> <polymer-element name="cr-settings-page-header" layout horizontal center>
<template> <template>
<link rel="stylesheet" href="settings_page_header.css"> <core-style ref="settingsPageHeaderStyle"></core-style>
<div class="icon-container"> <div class="icon-container">
<core-icon icon="{{page.icon}}"></core-icon> <core-icon icon="{{page.icon}}"></core-icon>
</div> </div>
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="settingsPageHeaderStyle">
h1 { h1 {
font-size: 18px; font-size: 18px;
margin: 0; margin: 0;
...@@ -11,3 +11,4 @@ h1 { ...@@ -11,3 +11,4 @@ h1 {
-webkit-margin-start: -40px; -webkit-margin-start: -40px;
width: 40px; width: 40px;
} }
</core-style>
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<structure name="IDR_SETTINGS_CHECKBOX_STYLE_HTML" <structure name="IDR_SETTINGS_CHECKBOX_STYLE_HTML"
file="checkbox/checkbox_style.html" file="checkbox/checkbox_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_STYLE_HTML"
file="settings_drawer/settings_drawer.css" file="settings_drawer/settings_drawer_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_HTML" <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_HTML"
file="settings_drawer/settings_drawer.html" file="settings_drawer/settings_drawer.html"
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_JS" <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_JS"
file="settings_drawer/settings_drawer.js" file="settings_drawer/settings_drawer.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_STYLE_HTML"
file="settings_main/settings_main.css" file="settings_main/settings_main_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML" <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"
file="settings_main/settings_main.html" file="settings_main/settings_main.html"
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS" <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS"
file="settings_main/settings_main.js" file="settings_main/settings_main.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_MENU_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_STYLE_HTML"
file="settings_menu/settings_menu.css" file="settings_menu/settings_menu_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML" <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML"
file="settings_menu/settings_menu.html" file="settings_menu/settings_menu.html"
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS"
file="settings_page/settings_page.css" file="settings_page/settings_page.css"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_STYLE_HTML"
file="settings_page/settings_page_header.css" file="settings_page/settings_page_header_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_HTML" <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_HTML"
file="settings_page/settings_page_header.html" file="settings_page/settings_page_header.html"
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_JS" <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_HEADER_JS"
file="settings_page/settings_page_header.js" file="settings_page/settings_page_header.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_UI_CSS" <structure name="IDR_SETTINGS_CR_SETTINGS_UI_STYLE_HTML"
file="settings_ui/settings_ui.css" file="settings_ui/settings_ui_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML" <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"
file="settings_ui/settings_ui.html" file="settings_ui/settings_ui.html"
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS" <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
file="settings_ui/settings_ui.js" file="settings_ui/settings_ui.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DATE_TIME_PAGE_CSS" <structure name="IDR_SETTINGS_DATE_TIME_PAGE_STYLE_HTML"
file="date_time_page/date_time_page.css" file="date_time_page/date_time_page_style.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML" <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"
file="date_time_page/date_time_page.html" file="date_time_page/date_time_page.html"
......
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<link rel="import" href="chrome://resources/polymer/core-icon-button/core-icon-button.html"> <link rel="import" href="chrome://resources/polymer/core-icon-button/core-icon-button.html">
<link rel="import" href="chrome://md-settings/settings_drawer/settings_drawer.html"> <link rel="import" href="chrome://md-settings/settings_drawer/settings_drawer.html">
<link rel="import" href="chrome://md-settings/settings_main/settings_main.html"> <link rel="import" href="chrome://md-settings/settings_main/settings_main.html">
<link rel="import" href="settings_ui_style.html">
<polymer-element name="cr-settings-ui"> <polymer-element name="cr-settings-ui">
<template> <template>
<link rel="stylesheet" href="settings_ui.css"> <core-style ref="settingsUiStyle"></core-style>
<core-drawer-panel drawerWidth="280px"> <core-drawer-panel drawerWidth="280px">
<cr-settings-drawer drawer id="drawer" pages="{{pages}}" <cr-settings-drawer drawer id="drawer" pages="{{pages}}"
selectedId="{{selectedPageId}}"> selectedId="{{selectedPageId}}">
......
/* Copyright 2015 The Chromium Authors. All rights reserved. <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
* Use of this source code is governed by a BSD-style license that can be <link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
* found in the LICENSE file. */
<core-style id="settingsUiStyle">
:host { :host {
-webkit-user-select: none; -webkit-user-select: none;
background-color: rgb(219, 222, 224); background-color: rgb(219, 222, 224);
...@@ -13,3 +13,4 @@ ...@@ -13,3 +13,4 @@
cr-settings-main core-icon-button { cr-settings-main core-icon-button {
z-index: 10; z-index: 10;
} }
</core-style>
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