Commit 677d4cfc authored by dbeam's avatar dbeam Committed by Commit bot

MD Settings: move appeal into flow to unhide Advanced toggle

R=dpapad@chromium.org
BUG=619715
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2108863004
Cr-Commit-Position: refs/heads/master@{#402682}
parent fa6b1daa
...@@ -19,51 +19,8 @@ ...@@ -19,51 +19,8 @@
:host { :host {
color: var(--paper-grey-800); color: var(--paper-grey-800);
} }
#appeal {
align-items: center;
background: rgb(123, 170, 247);
bottom: 0;
display: flex;
left: 0;
position: fixed;
right: 0;
z-index: 9999;
}
#request {
flex: 1;
font-size: .8125rem;
font-weight: bold;
padding: 8px 24px;
}
#request h1 {
font-size: 1rem;
margin: 0;
}
#request a {
color: rgb(100, 100, 255);
}
#close {
padding: 20px;
}
</style> </style>
<settings-prefs id="prefs" prefs="{{prefs_}}"></settings-prefs> <settings-prefs id="prefs" prefs="{{prefs_}}"></settings-prefs>
<!-- TODO(dbeam): remove before launching ;). -->
<div id="appeal" hidden="[[appealClosed_]]">
<span id="request">
<h1>Please read: A personal appeal from the Chrome settings team.</h1>
<a href="https://goo.gl/btju6c">Please file bugs</a>
before you
<a href="chrome://settings-frame">go back to the old settings</a>.
</span>
<span id="close" tabindex=0 on-tap="onCloseAppealTap_">&#x2715;</span>
</div>
<settings-ui id="ui" prefs="{{prefs_}}"></settings-ui> <settings-ui id="ui" prefs="{{prefs_}}"></settings-ui>
</template> </template>
<script src="/settings.js"></script> <script src="/settings.js"></script>
......
...@@ -16,18 +16,4 @@ Polymer({ ...@@ -16,18 +16,4 @@ Polymer({
ready: function() { ready: function() {
this.$.ui.directionDelegate = new settings.DirectionDelegateImpl; this.$.ui.directionDelegate = new settings.DirectionDelegateImpl;
}, },
properties: {
appealClosed_: {
type: Boolean,
value: function() {
return !!(sessionStorage.appealClosed_ || localStorage.appealClosed_);
},
},
},
/** @private */
onCloseAppealTap_: function(e) {
sessionStorage.appealClosed_ = this.appealClosed_ = true;
},
}); });
...@@ -17,6 +17,33 @@ ...@@ -17,6 +17,33 @@
<dom-module id="settings-ui"> <dom-module id="settings-ui">
<template> <template>
<style include="settings-shared"> <style include="settings-shared">
/* TODO(dbeam): remove appeal before launch. */
#appeal {
align-items: center;
background: rgb(123, 170, 247);
display: flex;
}
#request {
flex: 1;
font-size: .8125rem;
font-weight: bold;
padding: 8px 24px;
}
#request h1 {
font-size: 1rem;
margin: 0;
}
#request a {
color: rgb(100, 100, 255);
}
#close {
padding: 20px;
}
:host { :host {
@apply(--layout-fit); @apply(--layout-fit);
-webkit-user-select: none; -webkit-user-select: none;
...@@ -29,6 +56,7 @@ ...@@ -29,6 +56,7 @@
--paper-header-panel-shadow: { --paper-header-panel-shadow: {
z-index: 2; z-index: 2;
}; };
flex: 1;
} }
.heading { .heading {
...@@ -106,6 +134,18 @@ ...@@ -106,6 +134,18 @@
<settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}">
</settings-main> </settings-main>
</paper-header-panel> </paper-header-panel>
<!-- TODO(dbeam): remove before launch. -->
<div id="appeal" hidden="[[appealClosed_]]">
<span id="request">
<h1>Please read: A personal appeal from the Chrome settings team.</h1>
<a href="https://goo.gl/btju6c">Please file bugs</a>
before you
<a href="chrome://settings-frame">go back to the old settings</a>.
</span>
<span id="close" tabindex=0 on-tap="onCloseAppealTap_">&#x2715;</span>
</div>
</template> </template>
<script src="settings_ui.js"></script> <script src="settings_ui.js"></script>
</dom-module> </dom-module>
...@@ -25,12 +25,24 @@ Polymer({ ...@@ -25,12 +25,24 @@ Polymer({
observer: 'directionDelegateChanged_', observer: 'directionDelegateChanged_',
type: Object, type: Object,
}, },
appealClosed_: {
type: Boolean,
value: function() {
return !!(sessionStorage.appealClosed_ || localStorage.appealClosed_);
},
},
}, },
listeners: { listeners: {
'sideNav.iron-activate': 'onIronActivate_', 'sideNav.iron-activate': 'onIronActivate_',
}, },
/** @private */
onCloseAppealTap_: function() {
sessionStorage.appealClosed_ = this.appealClosed_ = true;
},
/** /**
* @param {Event} event * @param {Event} event
* @private * @private
......
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