chrome/browser/resources/settings/device_page/display_layout.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/settings/device_page/display_layout.html

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/device_page/display.html ('k') | chrome/browser/resources/settings/device_page/display_overscan_dialog.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/html/polymer.html">	1 <link rel="import" href="chrome://resources/html/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial.html">

4 <link rel="import" href="/device_page/drag_behavior.html">	4 <link rel="import" href="drag_behavior.html">

5 <link rel="import" href="/device_page/layout_behavior.html">	5 <link rel="import" href="layout_behavior.html">

6 <link rel="import" href="/settings_shared_css.html">	6 <link rel="import" href="../settings_shared_css.html">

7	7

8 <dom-module id="display-layout">	8 <dom-module id="display-layout">

9 <template>	9 <template>

10 <style include="settings-shared">	10 <style include="settings-shared">

11 /* Use relative position with no offset so that display divs (children),	11 /* Use relative position with no offset so that display divs (children),

12 which have absolute positions, are offset from the displayArea div. */	12 which have absolute positions, are offset from the displayArea div. */

13 #displayArea {	13 #displayArea {

14 height: 100%;	14 height: 100%;

15 overflow: hidden;	15 overflow: hidden;

16 position: relative;	16 position: relative;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 draggable="[[dragEnabled]]" on-tap="onSelectDisplayTap_"	64 draggable="[[dragEnabled]]" on-tap="onSelectDisplayTap_"

65 style$="[[getDivStyle_(item.id, item.bounds, visualScale)]]"	65 style$="[[getDivStyle_(item.id, item.bounds, visualScale)]]"

66 selected$="[[isSelected_(item, selectedDisplay)]]">	66 selected$="[[isSelected_(item, selectedDisplay)]]">

67 [[item.name]]	67 [[item.name]]

68 </paper-material>	68 </paper-material>

69 </template>	69 </template>

70 </div>	70 </div>

71 </template>	71 </template>

72 <script src="display_layout.js"></script>	72 <script src="display_layout.js"></script>

73 </dom-module>	73 </dom-module>

OLD	NEW