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="chrome://md-settings/icons.html"> | 6 <link rel="import" href="chrome://md-settings/icons.html"> |
| 7 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 7 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 8 | 8 |
| 9 <dom-module id="settings-menu"> | 9 <dom-module id="settings-menu"> |
| 10 <template> | 10 <template> |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 | 64 |
| 65 .separator { | 65 .separator { |
| 66 /* Per Alan@, this line is different from the other separator lines. */ | 66 /* Per Alan@, this line is different from the other separator lines. */ |
| 67 border-bottom: 1px solid rgba(0, 0, 0, 0.08); | 67 border-bottom: 1px solid rgba(0, 0, 0, 0.08); |
| 68 margin-top: 8px; | 68 margin-top: 8px; |
| 69 } | 69 } |
| 70 </style> | 70 </style> |
| 71 <paper-menu name="root-menu"> | 71 <paper-menu name="root-menu"> |
| 72 <paper-submenu data-page="basic" id="basicPage" opened="{{basicOpened_}}"> | 72 <paper-submenu data-page="basic" id="basicPage" opened="{{basicOpened_}}"> |
| 73 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 73 <div class="menu-trigger" data-section="" on-tap="openPage_"> |
| 74 <span i18n-content="basicPageTitle"></span> | 74 <span>$i18n{basicPageTitle}</span> |
| 75 <iron-icon icon="[[arrowState_(basicOpened_)]]"></iron-icon> | 75 <iron-icon icon="[[arrowState_(basicOpened_)]]"></iron-icon> |
| 76 </div> | 76 </div> |
| 77 <paper-menu attr-for-selected="data-section" class="menu-content" | 77 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 78 data-page="basic" id="basicMenu"> | 78 data-page="basic" id="basicMenu"> |
| 79 <if expr="chromeos"> | 79 <if expr="chromeos"> |
| 80 <div data-section="internet" on-tap="openPage_"> | 80 <div data-section="internet" on-tap="openPage_"> |
| 81 <iron-icon icon="settings:network-wifi"></iron-icon> | 81 <iron-icon icon="settings:network-wifi"></iron-icon> |
| 82 <span i18n-content="internetPageTitle"></span> | 82 $i18n{internetPageTitle} |
| 83 </div> | 83 </div> |
| 84 </if> | 84 </if> |
| 85 <div data-section="people" on-tap="openPage_"> | 85 <div data-section="people" on-tap="openPage_"> |
| 86 <iron-icon icon="settings:people"></iron-icon> | 86 <iron-icon icon="settings:people"></iron-icon> |
| 87 <span i18n-content="peoplePageTitle"></span> | 87 $i18n{peoplePageTitle} |
| 88 </div> | 88 </div> |
| 89 <div data-section="appearance" on-tap="openPage_"> | 89 <div data-section="appearance" on-tap="openPage_"> |
| 90 <iron-icon icon="settings:palette"></iron-icon> | 90 <iron-icon icon="settings:palette"></iron-icon> |
| 91 <span i18n-content="appearancePageTitle"></span> | 91 $i18n{appearancePageTitle} |
| 92 </div> | 92 </div> |
| 93 <if expr="chromeos"> | 93 <if expr="chromeos"> |
| 94 <div data-section="device" on-tap="openPage_"> | 94 <div data-section="device" on-tap="openPage_"> |
| 95 <iron-icon icon="settings:laptop-chromebook"></iron-icon> | 95 <iron-icon icon="settings:laptop-chromebook"></iron-icon> |
| 96 <span i18n-content="devicePageTitle"></span> | 96 $i18n{devicePageTitle} |
| 97 </div> | 97 </div> |
| 98 </if> | 98 </if> |
| 99 <div data-section="search" on-tap="openPage_"> | 99 <div data-section="search" on-tap="openPage_"> |
| 100 <iron-icon icon="cr:search"></iron-icon> | 100 <iron-icon icon="cr:search"></iron-icon> |
| 101 <span i18n-content="searchPageTitle"></span> | 101 $i18n{searchPageTitle} |
| 102 </div> | 102 </div> |
| 103 <if expr="not chromeos"> | 103 <if expr="not chromeos"> |
| 104 <div data-section="defaultBrowser" on-tap="openPage_"> | 104 <div data-section="defaultBrowser" on-tap="openPage_"> |
| 105 <iron-icon icon="settings:web"></iron-icon> | 105 <iron-icon icon="settings:web"></iron-icon> |
| 106 <span i18n-content="defaultBrowser"></span> | 106 $i18n{defaultBrowser} |
| 107 </div> | 107 </div> |
| 108 </if> | 108 </if> |
| 109 <div data-section="onStartup" on-tap="openPage_"> | 109 <div data-section="onStartup" on-tap="openPage_"> |
| 110 <iron-icon icon="settings:power-settings-new"></iron-icon> | 110 <iron-icon icon="settings:power-settings-new"></iron-icon> |
| 111 <span i18n-content="onStartup"></span> | 111 $i18n{onStartup} |
| 112 </div> | 112 </div> |
| 113 </paper-menu> | 113 </paper-menu> |
| 114 </paper-submenu> | 114 </paper-submenu> |
| 115 <paper-submenu id="advancedPage" data-page="advanced" | 115 <paper-submenu id="advancedPage" data-page="advanced" |
| 116 opened="{{advancedOpened_}}"> | 116 opened="{{advancedOpened_}}"> |
| 117 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 117 <div class="menu-trigger" data-section="" on-tap="openPage_"> |
| 118 <span i18n-content="advancedPageTitle"></span> | 118 <span>$i18n{advancedPageTitle}</span> |
|
tommycli
2016/05/12 00:06:30
Is this span still needed?
dschuyler
2016/05/12 00:09:13
I believe so. The span allows the title to
flex e
| |
| 119 <iron-icon icon="[[arrowState_(advancedOpened_)]]"> | 119 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
| 120 </iron-icon> | |
| 121 </div> | 120 </div> |
| 122 <paper-menu attr-for-selected="data-section" class="menu-content" | 121 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 123 data-page="advanced" id="advancedMenu"> | 122 data-page="advanced" id="advancedMenu"> |
| 124 <if expr="chromeos"> | 123 <if expr="chromeos"> |
| 125 <div data-section="dateTime" on-tap="openPage_"> | 124 <div data-section="dateTime" on-tap="openPage_"> |
| 126 <iron-icon icon="settings:access-time"></iron-icon> | 125 <iron-icon icon="settings:access-time"></iron-icon> |
| 127 <span i18n-content="dateTimePageTitle"></span> | 126 $i18n{dateTimePageTitle} |
| 128 </div> | 127 </div> |
| 129 </if> | 128 </if> |
| 130 <div data-section="privacy" on-tap="openPage_"> | 129 <div data-section="privacy" on-tap="openPage_"> |
| 131 <iron-icon icon="settings:security"></iron-icon> | 130 <iron-icon icon="settings:security"></iron-icon> |
| 132 <span i18n-content="privacyPageTitle"></span> | 131 $i18n{privacyPageTitle} |
| 133 </div> | 132 </div> |
| 134 <if expr="chromeos"> | 133 <if expr="chromeos"> |
| 135 <div data-section="bluetooth" on-tap="openPage_"> | 134 <div data-section="bluetooth" on-tap="openPage_"> |
| 136 <iron-icon icon="settings:bluetooth"></iron-icon> | 135 <iron-icon icon="settings:bluetooth"></iron-icon> |
| 137 <span i18n-content="bluetoothPageTitle"></span> | 136 $i18n{bluetoothPageTitle} |
| 138 </div> | 137 </div> |
| 139 </if> | 138 </if> |
| 140 <div data-section="passwordsAndForms" on-tap="openPage_"> | 139 <div data-section="passwordsAndForms" on-tap="openPage_"> |
| 141 <iron-icon icon="settings:assignment"></iron-icon> | 140 <iron-icon icon="settings:assignment"></iron-icon> |
| 142 <span i18n-content="passwordsAndAutofillPageTitle"></span> | 141 $i18n{passwordsAndAutofillPageTitle} |
| 143 </div> | 142 </div> |
| 144 <div data-section="languages" on-tap="openPage_"> | 143 <div data-section="languages" on-tap="openPage_"> |
| 145 <iron-icon icon="settings:language"></iron-icon> | 144 <iron-icon icon="settings:language"></iron-icon> |
| 146 <span i18n-content="languagesPageTitle"></span> | 145 $i18n{languagesPageTitle} |
| 147 </div> | 146 </div> |
| 148 <div data-section="downloads" on-tap="openPage_"> | 147 <div data-section="downloads" on-tap="openPage_"> |
| 149 <iron-icon icon="settings:file-download"> | 148 <iron-icon icon="settings:file-download"> |
| 150 </iron-icon> | 149 </iron-icon> |
| 151 <span i18n-content="downloadsPageTitle"></span> | 150 $i18n{downloadsPageTitle} |
| 152 </div> | 151 </div> |
| 153 <div data-section="a11y" on-tap="openPage_"> | 152 <div data-section="a11y" on-tap="openPage_"> |
| 154 <iron-icon icon="settings:accessibility"> | 153 <iron-icon icon="settings:accessibility"> |
| 155 </iron-icon> | 154 </iron-icon> |
| 156 <span i18n-content="a11yPageTitle"></span> | 155 $i18n{a11yPageTitle} |
| 157 </div> | 156 </div> |
| 158 <if expr="not chromeos"> | 157 <if expr="not chromeos"> |
| 159 <div data-section="system" on-tap="openPage_"> | 158 <div data-section="system" on-tap="openPage_"> |
| 160 <iron-icon icon="settings:build"></iron-icon> | 159 <iron-icon icon="settings:build"></iron-icon> |
| 161 <span i18n-content="systemPageTitle"></span> | 160 $i18n{systemPageTitle} |
| 162 </div> | 161 </div> |
| 163 </if> | 162 </if> |
| 164 <div data-section="reset" on-tap="openPage_"> | 163 <div data-section="reset" on-tap="openPage_"> |
| 165 <iron-icon icon="settings:restore"></iron-icon> | 164 <iron-icon icon="settings:restore"></iron-icon> |
| 166 <span i18n-content="resetPageTitle"></span> | 165 $i18n{resetPageTitle} |
| 167 </div> | 166 </div> |
| 168 </paper-menu> | 167 </paper-menu> |
| 169 </paper-submenu> | 168 </paper-submenu> |
| 170 <div class="separator"></div> | 169 <div class="separator"></div> |
| 171 <paper-submenu data-page="about"> | 170 <paper-submenu data-page="about"> |
| 172 <div class="menu-trigger" on-tap="openPage_" data-section=""> | 171 <div class="menu-trigger" on-tap="openPage_" data-section=""> |
| 173 <span i18n-content="aboutPageTitle"></span> | 172 $i18n{aboutPageTitle} |
| 174 </div> | 173 </div> |
| 175 </paper-submenu> | 174 </paper-submenu> |
| 176 </paper-menu> | 175 </paper-menu> |
| 177 </template> | 176 </template> |
| 178 <script src="settings_menu.js"></script> | 177 <script src="settings_menu.js"></script> |
| 179 </dom-module> | 178 </dom-module> |
| OLD | NEW |