Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Look & feel section to Shields prefs page #5964

Merged
merged 1 commit into from
Jul 8, 2020
Merged

Move Look & feel section to Shields prefs page #5964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions browser/resources/settings/default_brave_shields_page/default_brave_shields_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
display: flex;
align-items: center;
}
.default-view-item {
padding-top: 20px;
}
.shields-view-col {
margin: 16px 0 24px;
padding: 0 24px;
Expand All @@ -34,10 +37,10 @@
.shields-view-col:last-of-type {
margin: 16px 0 24px 16px;
}
.shields-view-label {
margin: 0 20px;
cursor: pointer;
}
.shields-view-label {
margin: 0 20px;
cursor: pointer;
}
</style>
<div class="settings-box first">
<div class="flex">
Expand All @@ -49,8 +52,16 @@
</div>
</div>
<div class="settings-box">
<div class="label shields-primary-title">$i18n{shieldsLookFeelTitle}</div>
</div>
<settings-toggle-button
class="continuation"
pref="{{prefs.brave.shields.stats_badge_visible}}"
label="$i18n{showStatsBlockedBadgeLabel}">
</settings-toggle-button>
<div class="settings-box continuation default-view-item">
<div class="flex">
<div class="label shields-primary-title">$i18n{defaultView}</div>
<div class="label">$i18n{defaultView}</div>
<settings-radio-group
pref="{{prefs.brave.shields.advanced_view_enabled}}">
<controlled-radio-button class="shields-view-col" name="false"
Expand Down Expand Up @@ -138,13 +149,6 @@
</template>
</select>
</div>
<div class="settings-box">
<div class="label shields-primary-title">$i18n{shieldsLookFeelTitle}</div>
</div>
<settings-toggle-button
class="continuation"
pref="{{prefs.brave.shields.stats_badge_visible}}"
label="$i18n{showStatsBlockedBadgeLabel}">
</template>
<script src="default_brave_shields_page.js"></script>
</dom-module>