Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_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/iron-icons/av-icons.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons .html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons .html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 } | 59 } |
| 60 | 60 |
| 61 paper-submenu div { | 61 paper-submenu div { |
| 62 @apply(--layout-center); | 62 @apply(--layout-center); |
| 63 -webkit-margin-start: 24px; | 63 -webkit-margin-start: 24px; |
| 64 display: flex; | 64 display: flex; |
| 65 font-size: 13px; | 65 font-size: 13px; |
| 66 font-weight: 500; | 66 font-weight: 500; |
| 67 min-height: 40px; | 67 min-height: 40px; |
| 68 } | 68 } |
| 69 | |
| 70 .menu-top-margin { | |
| 71 margin-top: 8px; | |
|
tommycli
2016/05/06 18:23:48
Does it work if you put margin-bottom on every "pa
dschuyler
2016/05/06 23:58:24
Done.
| |
| 72 } | |
| 73 | |
| 74 .underbar { | |
| 75 border-bottom: 1px solid rgba(0, 0, 0, 0.08); | |
|
tommycli
2016/05/06 18:23:48
Alan really doesn't want to use the default --sett
dschuyler
2016/05/06 23:58:24
Done.
| |
| 76 } | |
| 69 </style> | 77 </style> |
| 70 <paper-menu name="root-menu"> | 78 <paper-menu name="root-menu"> |
| 71 <paper-submenu data-page="basic" id="basicPage"> | 79 <paper-submenu data-page="basic" id="basicPage"> |
| 72 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 80 <div class="menu-trigger" data-section="" on-tap="openPage_"> |
| 73 <span i18n-content="basicPageTitle"></span> | 81 <span i18n-content="basicPageTitle"></span> |
| 74 <iron-icon icon="[[arrowState_(basicOpened_)]]" item-icon></iron-icon> | 82 <iron-icon icon="[[arrowState_(basicOpened_)]]" item-icon></iron-icon> |
| 75 </div> | 83 </div> |
| 76 <paper-menu attr-for-selected="data-section" class="menu-content" | 84 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 77 data-page="basic" id="basicMenu"> | 85 data-page="basic" id="basicMenu"> |
| 78 <if expr="chromeos"> | 86 <if expr="chromeos"> |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 105 <span i18n-content="defaultBrowser"></span> | 113 <span i18n-content="defaultBrowser"></span> |
| 106 </div> | 114 </div> |
| 107 </if> | 115 </if> |
| 108 <div data-section="onStartup" on-tap="openPage_"> | 116 <div data-section="onStartup" on-tap="openPage_"> |
| 109 <iron-icon icon="icons:power-settings-new" item-icon></iron-icon> | 117 <iron-icon icon="icons:power-settings-new" item-icon></iron-icon> |
| 110 <span i18n-content="onStartup"></span> | 118 <span i18n-content="onStartup"></span> |
| 111 </div> | 119 </div> |
| 112 </paper-menu> | 120 </paper-menu> |
| 113 </paper-submenu> | 121 </paper-submenu> |
| 114 <paper-submenu id="advancedPage" data-page="advanced"> | 122 <paper-submenu id="advancedPage" data-page="advanced"> |
| 115 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 123 <div class="menu-top-margin menu-trigger" data-section="" |
| 124 on-tap="openPage_"> | |
| 116 <span i18n-content="advancedPageTitle"></span> | 125 <span i18n-content="advancedPageTitle"></span> |
| 117 <iron-icon icon="[[arrowState_(advancedOpened_)]]" item-icon> | 126 <iron-icon icon="[[arrowState_(advancedOpened_)]]" item-icon> |
| 118 </iron-icon> | 127 </iron-icon> |
| 119 </div> | 128 </div> |
| 120 <paper-menu attr-for-selected="data-section" class="menu-content" | 129 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 121 data-page="advanced" id="advancedMenu"> | 130 data-page="advanced" id="advancedMenu"> |
| 122 <if expr="chromeos"> | 131 <if expr="chromeos"> |
| 123 <div data-section="dateTime" on-tap="openPage_"> | 132 <div data-section="dateTime" on-tap="openPage_"> |
| 124 <iron-icon icon="device:access-time" item-icon></iron-icon> | 133 <iron-icon icon="device:access-time" item-icon></iron-icon> |
| 125 <span i18n-content="dateTimePageTitle"></span> | 134 <span i18n-content="dateTimePageTitle"></span> |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 156 <iron-icon icon="icons:build" item-icon></iron-icon> | 165 <iron-icon icon="icons:build" item-icon></iron-icon> |
| 157 <span i18n-content="systemPageTitle"></span> | 166 <span i18n-content="systemPageTitle"></span> |
| 158 </div> | 167 </div> |
| 159 </if> | 168 </if> |
| 160 <div data-section="reset" on-tap="openPage_"> | 169 <div data-section="reset" on-tap="openPage_"> |
| 161 <iron-icon icon="icons:restore" item-icon></iron-icon> | 170 <iron-icon icon="icons:restore" item-icon></iron-icon> |
| 162 <span i18n-content="resetPageTitle"></span> | 171 <span i18n-content="resetPageTitle"></span> |
| 163 </div> | 172 </div> |
| 164 </paper-menu> | 173 </paper-menu> |
| 165 </paper-submenu> | 174 </paper-submenu> |
| 175 <div class="menu-top-margin underbar"></div> | |
| 166 <paper-submenu on-tap="openPage_"> | 176 <paper-submenu on-tap="openPage_"> |
| 167 <div class="menu-trigger"> | 177 <div class="menu-top-margin menu-trigger"> |
| 168 <span i18n-content="aboutProgram"></span> | 178 <span i18n-content="aboutProgram"></span> |
| 169 </div> | 179 </div> |
| 170 </paper-submenu> | 180 </paper-submenu> |
| 171 </paper-menu> | 181 </paper-menu> |
| 172 </template> | 182 </template> |
| 173 <script src="settings_menu.js"></script> | 183 <script src="settings_menu.js"></script> |
| 174 </dom-module> | 184 </dom-module> |
| OLD | NEW |