Commit 66278e5e authored by dpapad's avatar dpapad Committed by Commit Bot

CrOS Network Settings: Apply shared styling to a few unstyled buttons.

Bug: 840591
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I6fdde8fc17af9592cb2bb6d52a6ef476c50309ab
Reviewed-on: https://chromium-review.googlesource.com/1048884
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557055}
parent a67e4c54
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<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">
...@@ -9,7 +10,7 @@ ...@@ -9,7 +10,7 @@
<dom-module id="network-apnlist"> <dom-module id="network-apnlist">
<template> <template>
<style include="network-shared md-select"> <style include="network-shared md-select paper-button-style">
paper-button { paper-button {
margin: 4px 0; margin: 4px 0;
} }
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<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/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
...@@ -9,13 +10,7 @@ ...@@ -9,13 +10,7 @@
<dom-module id="network-choose-mobile"> <dom-module id="network-choose-mobile">
<template> <template>
<style include="network-shared md-select iron-flex"> <style include="network-shared md-select iron-flex paper-button-style">
paper-button {
margin: 0;
}
paper-button[disabled] {
background: none;
}
/* Align select with button and scan messages */ /* Align select with button and scan messages */
select { select {
margin-top: 4px; margin-top: 4px;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
<dom-module id="network-siminfo"> <dom-module id="network-siminfo">
<template> <template>
<style include="network-shared iron-flex"> <style include="network-shared iron-flex paper-button-style">
:host { :host {
cursor: default cursor: default
} }
...@@ -132,7 +133,8 @@ ...@@ -132,7 +133,8 @@
</div> </div>
</div> </div>
<div slot="button-container"> <div slot="button-container">
<paper-button on-tap="sendChangePin_" disabled="[[inProgress_]]"> <paper-button class="action-button" on-tap="sendChangePin_"
disabled="[[inProgress_]]">
[[i18n('networkSimChange')]] [[i18n('networkSimChange')]]
</paper-button> </paper-button>
</div> </div>
......
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