Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> |
| 6 <link rel="import" href="/icons.html"> | 6 <link rel="import" href="/icons.html"> |
| 7 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
| 8 | 8 |
| 9 <dom-module id="settings-menu"> | 9 <dom-module id="settings-menu"> |
| 10 <template> | 10 <template> |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 }; | 29 }; |
| 30 --paper-menu-focused-item-after: { | 30 --paper-menu-focused-item-after: { |
| 31 background: none; | 31 background: none; |
| 32 }; | 32 }; |
| 33 background: none; /* Overrides <paper-menu> default. */ | 33 background: none; /* Overrides <paper-menu> default. */ |
| 34 color: var(--settings-nav-grey); | 34 color: var(--settings-nav-grey); |
| 35 font-size: 13px; | 35 font-size: 13px; |
| 36 padding: 0; | 36 padding: 0; |
| 37 } | 37 } |
| 38 | 38 |
| 39 paper-submenu > div { | 39 #basicPage { |
| 40 margin-top: 8px; | 40 margin-top: 8px; |
| 41 } | 41 } |
| 42 | 42 |
| 43 paper-submenu { | 43 .page-menu > div { |
| 44 margin-top: 8px; | |
| 45 } | |
| 46 | |
| 47 .page-menu { | |
| 44 --paper-menu-selected-item: { | 48 --paper-menu-selected-item: { |
| 45 font-weight: 500; | 49 font-weight: 500; |
| 46 }; | 50 }; |
| 47 } | 51 } |
| 48 | 52 |
| 49 paper-submenu paper-menu { | 53 .page-menu paper-menu { |
| 50 --paper-menu-selected-item: { | 54 --paper-menu-selected-item: { |
| 51 color: var(--google-blue-500); | 55 color: var(--google-blue-500); |
| 52 font-weight: 500; | 56 font-weight: 500; |
| 53 }; | 57 }; |
| 54 } | 58 } |
| 55 | 59 |
| 56 paper-submenu div { | 60 .page-menu div { |
| 57 @apply(--layout-center); | 61 @apply(--layout-center); |
| 58 -webkit-margin-start: 24px; | 62 -webkit-margin-start: 24px; |
| 59 display: flex; | 63 display: flex; |
| 60 font-size: 13px; | 64 font-size: 13px; |
| 61 font-weight: 500; | 65 font-weight: 500; |
| 62 min-height: 40px; | 66 min-height: 40px; |
| 63 } | 67 } |
| 64 | 68 |
| 65 .separator { | 69 .separator { |
| 66 /* Per Alan@, this line is different from the other separator lines. */ | 70 /* Per Alan@, this line is different from the other separator lines. */ |
| 67 border-bottom: 1px solid rgba(0, 0, 0, 0.08); | 71 border-bottom: 1px solid rgba(0, 0, 0, 0.08); |
| 68 margin-top: 8px; | 72 margin-top: 8px; |
| 69 } | 73 } |
| 70 </style> | 74 </style> |
| 71 <paper-menu name="root-menu"> | 75 <paper-menu name="root-menu"> |
| 72 <paper-submenu data-page="basic" id="basicPage" opened="{{basicOpened_}}"> | 76 <div class="page-menu" data-page="basic" id="basicPage" |
| 73 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 77 hidden$="!basicOpened_"> |
|
Dan Beam
2016/05/31 23:28:24
where is basicOpened_ defined? also, why would we
dschuyler
2016/06/02 01:05:37
Done.
| |
| 74 <span>$i18n{basicPageTitle}</span> | |
| 75 <iron-icon icon="[[arrowState_(basicOpened_)]]"></iron-icon> | |
| 76 </div> | |
| 77 <paper-menu attr-for-selected="data-section" class="menu-content" | 78 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 78 data-page="basic" id="basicMenu"> | 79 data-page="basic" id="basicMenu"> |
| 79 <if expr="chromeos"> | 80 <if expr="chromeos"> |
| 80 <div data-section="internet" on-tap="openPage_"> | 81 <div data-section="internet" on-tap="openPage_"> |
| 81 <iron-icon icon="settings:network-wifi"></iron-icon> | 82 <iron-icon icon="settings:network-wifi"></iron-icon> |
| 82 $i18n{internetPageTitle} | 83 $i18n{internetPageTitle} |
| 83 </div> | 84 </div> |
| 84 </if> | 85 </if> |
| 85 <div data-section="people" on-tap="openPage_"> | 86 <div data-section="people" on-tap="openPage_"> |
| 86 <iron-icon icon="settings:people"></iron-icon> | 87 <iron-icon icon="settings:people"></iron-icon> |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 104 <div data-section="defaultBrowser" on-tap="openPage_"> | 105 <div data-section="defaultBrowser" on-tap="openPage_"> |
| 105 <iron-icon icon="settings:web"></iron-icon> | 106 <iron-icon icon="settings:web"></iron-icon> |
| 106 $i18n{defaultBrowser} | 107 $i18n{defaultBrowser} |
| 107 </div> | 108 </div> |
| 108 </if> | 109 </if> |
| 109 <div data-section="onStartup" on-tap="openPage_"> | 110 <div data-section="onStartup" on-tap="openPage_"> |
| 110 <iron-icon icon="settings:power-settings-new"></iron-icon> | 111 <iron-icon icon="settings:power-settings-new"></iron-icon> |
| 111 $i18n{onStartup} | 112 $i18n{onStartup} |
| 112 </div> | 113 </div> |
| 113 </paper-menu> | 114 </paper-menu> |
| 114 </paper-submenu> | 115 </div> |
| 115 <paper-submenu id="advancedPage" data-page="advanced" | 116 <paper-submenu class="page-menu" id="advancedPage" data-page="advanced" |
| 116 opened="{{advancedOpened_}}"> | 117 opened="{{advancedOpened_}}"> |
| 117 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 118 <div class="menu-trigger" data-section="" on-tap="toggleAdvancedPage_"> |
| 118 <span>$i18n{advancedPageTitle}</span> | 119 <span>$i18n{advancedPageTitle}</span> |
| 119 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> | 120 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
| 120 </div> | 121 </div> |
| 121 <paper-menu attr-for-selected="data-section" class="menu-content" | 122 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 122 data-page="advanced" id="advancedMenu"> | 123 data-page="advanced" id="advancedMenu"> |
| 123 <if expr="chromeos"> | 124 <if expr="chromeos"> |
| 124 <div data-section="dateTime" on-tap="openPage_"> | 125 <div data-section="dateTime" on-tap="openPage_"> |
| 125 <iron-icon icon="settings:access-time"></iron-icon> | 126 <iron-icon icon="settings:access-time"></iron-icon> |
| 126 $i18n{dateTimePageTitle} | 127 $i18n{dateTimePageTitle} |
| 127 </div> | 128 </div> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 $i18n{systemPageTitle} | 161 $i18n{systemPageTitle} |
| 161 </div> | 162 </div> |
| 162 </if> | 163 </if> |
| 163 <div data-section="reset" on-tap="openPage_"> | 164 <div data-section="reset" on-tap="openPage_"> |
| 164 <iron-icon icon="settings:restore"></iron-icon> | 165 <iron-icon icon="settings:restore"></iron-icon> |
| 165 $i18n{resetPageTitle} | 166 $i18n{resetPageTitle} |
| 166 </div> | 167 </div> |
| 167 </paper-menu> | 168 </paper-menu> |
| 168 </paper-submenu> | 169 </paper-submenu> |
| 169 <div class="separator"></div> | 170 <div class="separator"></div> |
| 170 <paper-submenu data-page="about"> | 171 <paper-submenu class="page-menu" data-page="about"> |
| 171 <div class="menu-trigger" on-tap="openPage_" data-section=""> | 172 <div class="menu-trigger" on-tap="openPage_" data-section=""> |
| 172 $i18n{aboutPageTitle} | 173 $i18n{aboutPageTitle} |
| 173 </div> | 174 </div> |
| 174 </paper-submenu> | 175 </paper-submenu> |
| 175 </paper-menu> | 176 </paper-menu> |
| 176 </template> | 177 </template> |
| 177 <script src="settings_menu.js"></script> | 178 <script src="settings_menu.js"></script> |
| 178 </dom-module> | 179 </dom-module> |
| OLD | NEW |