Skip to content

Commit

Permalink
Settings WebUI: fix rows dividers for brave items
Browse files Browse the repository at this point in the history
  • Loading branch information
petemill committed Jul 1, 2020
1 parent 7b772c8 commit 3435743
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 7 deletions.
21 changes: 14 additions & 7 deletions browser/resources/settings/brave_appearance_page/toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,36 @@
<template>
<style include="settings-shared md-select iron-flex">
</style>
<settings-toggle-button pref="{{prefs.brave.location_bar_is_wide}}"
label="$i18n{appearanceSettingsLocationBarIsWide}">
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.location_bar_is_wide}}"
label="$i18n{appearanceSettingsLocationBarIsWide}">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.autocomplete_enabled}}"
label="$i18n{appearanceSettingsShowAutocompleteInAddressBar}">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.top_site_suggestions_enabled}}"
label="$i18n{appearanceSettingsUseTopSiteSuggestions}">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.brave_suggested_site_suggestions_enabled}}"
label="$i18n{appearanceSettingsUseBraveSuggestedSiteSuggestions}">
</settings-toggle-button>
<settings-toggle-button pref="{{prefs.brave.hide_brave_rewards_button}}"
label="$i18n{appearanceSettingsHideBraveRewardsButtonLabel}"
sub-label="$i18n{appearanceSettingsHideBraveRewardsButtonDesc}">
<settings-toggle-button
pref="{{prefs.brave.hide_brave_rewards_button}}"
class="cr-row"
label="$i18n{appearanceSettingsHideBraveRewardsButtonLabel}"
sub-label="$i18n{appearanceSettingsHideBraveRewardsButtonDesc}">
</settings-toggle-button>
<settings-toggle-button
pref="{{prefs.brave.always_show_bookmark_bar_on_ntp}}"
label="$i18n{appearanceSettingsAlwaysShowBookmarkBarOnNTP}"
>
class="cr-row"
label="$i18n{appearanceSettingsAlwaysShowBookmarkBarOnNTP}">
</settings-toggle-button>
</template>
<script src="toolbar.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,34 @@
</settings-dropdown-menu>
</div>
<settings-toggle-button id="ipfsCompanionEnabled"
class="cr-row"
pref="{{prefs.brave.wallet.load_on_startup}}"
label="$i18n{loadCryptoWalletsOnStartupDesc}">
</settings-toggle-button>
<settings-toggle-button id="hangoutsEnabled"
class="cr-row"
pref="{{prefs.brave.hangouts_enabled}}"
label="Hangouts"
sub-label="$i18n{hangoutsEnabledDesc}"
on-settings-boolean-control-change="onHangoutsEnabledChange_">
</settings-toggle-button>
<settings-toggle-button id="ipfsCompanionEnabled"
class="cr-row"
pref="{{prefs.brave.ipfs_companion_enabled}}"
label="IPFS Companion"
sub-label="$i18n{ipfsCompanionEnabledDesc}"
on-settings-boolean-control-change="onIPFSCompanionEnabledChange_">
</settings-toggle-button>
<settings-toggle-button id="mediaRouterEnabled"
class="cr-row"
pref="{{prefs.brave.enable_media_router}}"
label="Media Router"
sub-label="$i18n{mediaRouterEnabledDesc}"
on-settings-boolean-control-change="onMediaRouterEnabledChange_">
</settings-toggle-button>
<if expr="enable_tor">
<settings-toggle-button id="torEnabled"
class="cr-row"
pref=""
checked="[[torEnabled_]]"
label="$i18n{torEnabledLabel}"
Expand All @@ -106,12 +111,14 @@
</settings-toggle-button>
</if>
<settings-toggle-button id="webTorrentEnabled"
class="cr-row"
pref="{{prefs.brave.webtorrent_enabled}}"
label="WebTorrent"
sub-label="$i18n{webTorrentEnabledDesc}"
on-settings-boolean-control-change="onWebTorrentEnabledChange_">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.ask_widevine_install}}"
label="Widevine"
sub-label="$i18n{appearanceSettingsAskWidevineInstallDesc}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,36 @@
</div>
<div class="flex">
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_stats}}"
label="$i18n{braveNewTabStats}">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_rewards}}"
label="$i18n{braveNewTabBraveRewards}">
</settings-toggle-button>
<template is="dom-if" if="[[isBraveTogetherSupported_]]">
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_together}}"
label="$i18n{braveNewTabTogether}">
</settings-toggle-button>
</template>
<template is="dom-if" if="[[isBinanceSupported_]]">
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_binance}}"
label="$i18n{braveNewTabBinance}">
</settings-toggle-button>
</template>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_top_sites}}"
label="$i18n{braveNewTabTopSites}">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.new_tab_page.show_clock}}"
label="$i18n{braveNewTabClock}">
</settings-toggle-button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@
</select>
</div>
<settings-toggle-button id="p3aEnabled"
class="cr-row"
pref=""
checked="[[p3aEnabled_]]"
label="$i18n{p3aEnableTitle}"
sub-label="$i18n{p3aEnabledDesc}"
on-settings-boolean-control-change="onP3AEnabledChange_">
</settings-toggle-button>
<settings-toggle-button id="pushMessagingEnabled"
class="cr-row"
pref="{{prefs.brave.gcm.channel_status}}"
label="$i18n{pushMessagingLabel}">
<template is="dom-if" if="[[shouldShowRestart_(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@
</select>
</div>
<settings-toggle-button id="httpsEverywhereControlType"
class="cr-row"
pref="{{prefs.brave.https_everywhere_default}}"
label="$i18n{httpsEverywhereControlLabel}"
on-settings-boolean-control-change="onHTTPSEverywhereControlChange_">
</settings-toggle-button>
<settings-toggle-button id="noScriptControlType"
class="cr-row"
pref="{{prefs.brave.no_script_default}}"
label="$i18n{noScriptControlLabel}"
on-settings-boolean-control-change="onNoScriptControlChange_">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@
<style include="settings-shared md-select iron-flex">
</style>
<settings-toggle-button id="googleLoginControlType"
class="cr-row"
pref="{{prefs.brave.google_login_default}}"
label="$i18n{googleLoginControlLabel}">
</settings-toggle-button>
<settings-toggle-button id="fbEmbedControlType"
class="cr-row"
pref="{{prefs.brave.fb_embed_default}}"
label="$i18n{fbEmbedControlLabel}">
</settings-toggle-button>
<settings-toggle-button id="twitterEmbedControlType"
class="cr-row"
pref="{{prefs.brave.twitter_embed_default}}"
label="$i18n{twitterEmbedControlLabel}">
</settings-toggle-button>
<settings-toggle-button id="linkedInEmbedControlType"
class="cr-row"
pref="{{prefs.brave.linkedin_embed_default}}"
label="$i18n{linkedInEmbedControlLabel}">
</settings-toggle-button>
Expand Down

0 comments on commit 3435743

Please sign in to comment.