-
Notifications
You must be signed in to change notification settings - Fork 900
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1909 from brave/webui-settings-brave
WebUI: Settings & 4 different ways to override
- Loading branch information
Showing
31 changed files
with
913 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<link rel="import" | ||
href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html"> | ||
<!-- | ||
Right now, these icons are only used on the settings page. | ||
If they would be useful on other pages, let's consider moving | ||
them to chrome://brave-resources and having a common "icons" html | ||
--> | ||
<iron-iconset-svg name="brave_settings" size="24"> | ||
<svg> | ||
<defs> | ||
<!-- | ||
Shoutouts to the design crew at Brave Software for these 1337 icons | ||
--> | ||
<g id="get-started" viewBox="0 0 24 24"> | ||
<path | ||
d="M11.994 1c-.2.001-.396.059-.565.165-.17.105-4.194 2.678-4.194 7.742 0 .839.224 2.196.49 3.598h-.164c-.072 0-.143.007-.212.021 0 0-1.081.21-2.15.956A5.118 5.118 0 0 0 3 17.736c0 .578.474 1.046 1.06 1.046h15.88c.586 0 1.06-.468 1.06-1.046a5.117 5.117 0 0 0-2.198-4.254c-1.07-.746-2.15-.956-2.15-.956a1.071 1.071 0 0 0-.213-.02h-.171c.27-1.42.497-2.797.497-3.641 0-5.074-4.034-7.606-4.204-7.71A1.083 1.083 0 0 0 11.994 1zM12 6.23c.879 0 1.588.7 1.588 1.569 0 .868-.71 1.569-1.588 1.569-.879 0-1.588-.701-1.588-1.57 0-.868.71-1.568 1.588-1.568zm-4.277 8.368h.42c.171.778.339 1.523.476 2.093H5.372c.233-.667.588-1.178 1.048-1.5.659-.459 1.26-.583 1.303-.593zm8.13 0h.423c.043.01.645.134 1.303.593.461.322.817.833 1.048 1.5h-3.248c.136-.57.305-1.317.474-2.093zm-5.441 5.3C10.412 21.446 12 23 12 23s1.588-1.552 1.588-3.104h-3.176z" /> | ||
</g> | ||
<g id="extensions" viewBox="0 0 24 24"> | ||
<path | ||
d="M11.095 1a2.38 2.38 0 0 0-2.38 2.381V4.81h-3.81A1.904 1.904 0 0 0 3 6.714v2.857c0 .526.427.953.952.953h.34c1.246 0 2.38.896 2.505 2.135a2.38 2.38 0 0 1-2.368 2.627h-.477a.953.953 0 0 0-.952.952v2.857C3 20.148 3.852 21 4.905 21h2.857a.953.953 0 0 0 .952-.952v-.34c0-1.246.897-2.38 2.136-2.505a2.38 2.38 0 0 1 2.626 2.368v.477c0 .525.427.952.953.952h2.857a1.904 1.904 0 0 0 1.904-1.905v-3.81h1.429a2.38 2.38 0 1 0 0-4.761H19.19v-3.81a1.904 1.904 0 0 0-1.904-1.904h-3.81V3.38A2.38 2.38 0 0 0 11.096 1z" /> | ||
</g> | ||
<g id="sync" viewBox="0 0 24 24"> | ||
<path | ||
d="M10.714 1a.933.933 0 0 0-.656.27L7.272 4.026a.914.914 0 0 0 0 1.3l2.786 2.757a.936.936 0 0 0 1.011.198.92.92 0 0 0 .574-.848V5.596c3.6 0 6.5 2.87 6.5 6.434 0 .912-.198 1.814-.579 2.645a.911.911 0 0 0 .073.934.932.932 0 0 0 1.62-.179 8.184 8.184 0 0 0 .743-3.4c0-4.558-3.752-8.272-8.357-8.272V1.919A.924.924 0 0 0 10.714 1zm-6.11 7a.929.929 0 0 0-.86.553A8.2 8.2 0 0 0 3 11.958c0 4.563 3.752 8.282 8.357 8.282v1.84a.92.92 0 0 0 .573.85.935.935 0 0 0 1.012-.2l2.786-2.76a.915.915 0 0 0 0-1.301l-2.786-2.76a.936.936 0 0 0-1.011-.199.921.921 0 0 0-.574.849v1.84c-3.6 0-6.5-2.874-6.5-6.441 0-.944.209-1.836.579-2.648a.913.913 0 0 0-.055-.88.93.93 0 0 0-.777-.43z" /> | ||
</g> | ||
<g id="shields" viewBox="0 0 24 24"> | ||
<path | ||
d="M11.188 1.361l-7 3.111A1.999 1.999 0 0 0 3 6.3V11c0 7.83 6.439 11.486 9 12 2.561-.514 9-4.17 9-12V6.3a2 2 0 0 0-1.188-1.828l-7-3.111a1.997 1.997 0 0 0-1.624 0zm-.895 14.346l-2.77-2.77a1 1 0 0 1 1.414-1.414L11 13.586l5.085-5.085a1 1 0 0 1 1.414 1.414l-5.792 5.792a1 1 0 0 1-1.414 0z" /> | ||
</g> | ||
<g id="social-permissions" viewBox="0 0 24 24"> | ||
<path | ||
d="M2.75 3c-.414 0-.75.42-.75.938v9.374c0 .518.336.938.75.938h1.5c.414 0 .75-.42.75-.938V3.938C5 3.42 4.664 3 4.25 3h-1.5zm6.125 0A1.866 1.866 0 0 0 7 4.857v9.278c0 .492.197.963.547 1.31l5.185 5.146a1.417 1.417 0 0 0 1.67.239c.548-.297.834-.916.7-1.52l-.932-4.24h5.955A1.866 1.866 0 0 0 22 13.215v-1.855c0-.253-.051-.502-.152-.734l-2.82-6.5A1.876 1.876 0 0 0 17.305 3h-8.43z" /> | ||
</g> | ||
<g id="search-engine" viewBox="0 0 24 24"> | ||
<path | ||
d="M15.31 13.896l1.397 1.397a1 1 0 0 1-1.414 1.414l-1.397-1.397a4.5 4.5 0 1 1 1.414-1.414zM11.5 14a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5zM5 4a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1H5zm0-2h14a3 3 0 0 1 3 3v14a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3V5a3 3 0 0 1 3-3z" /> | ||
</g> | ||
<g id="appearance" viewBox="0 0 24 24"> | ||
<path | ||
d="M3 3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h5v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1h5a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H3zm0 2h18v12H3V5zm3 2a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1H6zm8 0a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1h-4zm-8 5a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1H6zm8 0a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1h-4z" /> | ||
</g> | ||
<g id="privacy-security" viewBox="0 0 24 24"> | ||
<path | ||
d="M12 1C8.676 1 6 3.676 6 7v1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2V7c0-3.324-2.676-6-6-6zm0 2c2.276 0 4 1.724 4 4v1H8V7c0-2.276 1.724-4 4-4zm0 8c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0 2a2 2 0 1 0 2 2c0-.205-.04-.398-.098-.584A.993.993 0 0 1 13 15a1 1 0 0 1-1-1c0-.403.241-.744.584-.902A1.98 1.98 0 0 0 12 13z" /> | ||
</g> | ||
<g id="autofill" viewBox="0 0 24 24"> | ||
<path | ||
d="M4 5a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm6 1a1 1 0 1 0 0 2h11a1 1 0 0 0 0-2H10zm-6 9a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm6 1a1 1 0 0 0 0 2h11a1 1 0 0 0 0-2H10z" /> | ||
</g> | ||
<g id="language" viewBox="0 0 24 24"> | ||
<path | ||
d="M4 2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h14l2.788 2.788A.71.71 0 0 0 22 20.286V4a2 2 0 0 0-2-2H4zm4 4c.491 0 .932.299 1.113.755l2.417 6.066a.86.86 0 1 1-1.609.609l-.389-1.086H6.469l-.39 1.086a.86.86 0 1 1-1.609-.609l2.417-6.066A1.197 1.197 0 0 1 8 6zm8.5 0c.38 0 .688.308.688.687v.656h2.146c.368 0 .666.299.666.667v.646c-.203 1.734-.98 3.027-2.25 3.906.161.026.325.048.494.064.342.033.6.325.6.669a.67.67 0 0 1-.722.672A7.604 7.604 0 0 1 16 13.468c-.7.263-1.545.425-2.283.492a.667.667 0 0 1-.096-1.328c.297-.02.611-.054.848-.102-.554-.497-1.082-1.398-1.327-2.228a.68.68 0 0 1 .66-.865h.017a.69.69 0 0 1 .668.482c.217.732.848 1.664 1.576 2.08 1.324-.633 2.18-1.754 2.438-3.344h-4.844a.656.656 0 0 1-.001-1.311h2.156v-.657c0-.379.308-.687.688-.687zM8 8.031l-1.063 3h2.125L8 8.031z" /> | ||
</g> | ||
<g id="download" viewBox="0 0 24 24"> | ||
<path | ||
d="M11.293 16.707L8 13.414A1 1 0 0 1 9.414 12L11 13.586V8a1 1 0 0 1 2 0v5.586L14.586 12A1 1 0 0 1 16 13.414l-3.293 3.293a1 1 0 0 1-1.414 0zM12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm0 2a8 8 0 1 0 0 16 8 8 0 1 0 0-16z" /> | ||
</g> | ||
<g id="printing" viewBox="0 0 24 24"> | ||
<path | ||
d="M7 3a1 1 0 0 0-1 1v4H5c-1.65 0-3 1.35-3 3v4a2 2 0 0 0 2 2h2v2a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-2h2a2 2 0 0 0 2-2v-4c0-1.65-1.35-3-3-3h-1V4a1 1 0 0 0-2 0v4H8V4a1 1 0 0 0-1-1zm2.879 0a.563.563 0 0 0-.399.96l1.7 1.7a1.16 1.16 0 0 0 1.64 0l1.701-1.7a.564.564 0 0 0-.4-.96H9.879zM19 10c.6 0 1 .4 1 1s-.4 1-1 1-1-.4-1-1 .4-1 1-1zM8.5 14h7a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" /> | ||
</g> | ||
<g id="system" viewBox="0 0 24 24"> | ||
<path | ||
d="M10.038 2c-.478 0-.889.34-.98.809l-.334 1.714c-.82.31-1.58.744-2.246 1.291l-1.645-.566a1 1 0 0 0-1.19.445L2.133 8.307a1 1 0 0 0 .21 1.255l1.317 1.147A8.07 8.07 0 0 0 3.548 12c0 .44.045.87.113 1.291l-1.318 1.146c-.36.315-.448.84-.21 1.256l1.51 2.614a1 1 0 0 0 1.19.447l1.645-.567c.674.55 1.433.985 2.246 1.29l.334 1.714c.092.47.501.809.98.809h3.02c.479 0 .89-.34.98-.809l.334-1.714a7.966 7.966 0 0 0 2.246-1.291l1.645.566a1 1 0 0 0 1.191-.445l1.508-2.616a1 1 0 0 0-.209-1.254l-1.318-1.146A8.07 8.07 0 0 0 19.548 12c0-.44-.045-.87-.113-1.291l1.318-1.146c.361-.315.448-.841.21-1.256l-1.509-2.614a1 1 0 0 0-1.19-.447l-1.646.566a7.984 7.984 0 0 0-2.246-1.289l-.334-1.713a.998.998 0 0 0-.98-.81h-3.02zm1.51 7a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" /> | ||
</g> | ||
<g id="reset-settings" viewBox="0 0 24 24"> | ||
<path | ||
d="M20.292 3.71l-1.234 1.234a9.965 9.965 0 0 0-8.846-2.785c-4.03.704-7.29 3.92-8.035 7.942-1.178 6.346 3.686 11.902 9.822 11.902 5.134 0 9.378-3.89 9.938-8.879a1.009 1.009 0 0 0-1-1.12c-.5 0-.93.367-.985.864-.433 4.005-3.833 7.135-7.953 7.135-4.941 0-8.85-4.5-7.84-9.62.608-3.08 3.074-5.57 6.149-6.204a7.978 7.978 0 0 1 7.334 2.181l-.936.936a1 1 0 0 0 .707 1.707H21a1 1 0 0 0 1-1V4.418a1 1 0 0 0-1.707-.708z" /> | ||
</g> | ||
<g id="full-color-brave-lion" viewBox="0 0 24 24"> | ||
<path fill="#FB542B" | ||
d="M20.856 8.11l-.682-1.84.474-1.057a.36.36 0 0 0-.074-.402l-1.29-1.296a2.093 2.093 0 0 0-2.163-.5l-.361.124L14.876 1H7.95L6.09 3.165l-.35-.123a2.098 2.098 0 0 0-2.184.505l-1.313 1.32a.286.286 0 0 0-.058.32l.495 1.098L2 8.125l.44 1.659 2 7.56a3.85 3.85 0 0 0 1.501 2.158s2.43 1.702 4.828 3.249c.211.136.432.235.668.232.237.003.458-.096.668-.233 2.693-1.754 4.824-3.255 4.824-3.255a3.852 3.852 0 0 0 1.498-2.16l1.992-7.563.437-1.661z" /> | ||
<path fill="#FFF" | ||
d="M12.091 14.75l.262.107c.283.116.737.323 1.01.46l.772.39c.273.137.292.394.044.57l-.66.468c-.248.177-.639.483-.868.682l-.832.72a.646.646 0 0 1-.822.002c-.224-.196-.594-.518-.824-.714-.23-.197-.62-.5-.87-.675l-.658-.461c-.25-.175-.232-.433.04-.573l.777-.402c.27-.14.723-.35 1.005-.466l.262-.108c.283-.116.536-.212.563-.212h.238c.026 0 .28.095.561.211zm6.604-6.176l-.05.177c-.132.164-.411.479-.62.7L16.1 11.483c-.21.22-.327.498-.208.777l.26.635c.119.28.13.74.016 1.05a1.872 1.872 0 0 1-.578.807l-.201.163a.966.966 0 0 1-.932.112l-.887-.418a4.59 4.59 0 0 1-.915-.606l-.838-.748a.384.384 0 0 1-.02-.555l2.041-1.368c.254-.17.388-.484.244-.751l-.726-1.312c-.144-.268-.202-.623-.128-.79.073-.167.367-.392.653-.5l2.37-.874c.286-.108.271-.219-.033-.247l-1.515-.112c-.304-.028-.527.016-.822.097l-1.146.282c-.294.082-.357.393-.301.69l.473 2.548c.055.298.082.598.06.667-.022.069-.284.18-.582.247l-.392.089a3.04 3.04 0 0 1-1.086.007l-.474-.1c-.299-.064-.562-.172-.584-.24-.022-.07.005-.37.06-.669l.47-2.547c.055-.298-.008-.609-.302-.69l-1.147-.28c-.294-.082-.518-.125-.822-.096l-1.514.113c-.305.028-.32.14-.034.246l2.372.873c.286.107.58.331.654.498.074.167.016.522-.127.79l-.725 1.313c-.143.267-.009.581.244.75l2.044 1.367a.384.384 0 0 1-.02.554l-.837.75a4.596 4.596 0 0 1-.915.607l-.885.419c-.276.13-.696.08-.933-.111l-.2-.162a1.897 1.897 0 0 1-.59-.832 1.607 1.607 0 0 1 .025-1.025l.259-.635c.119-.28 0-.557-.21-.778L4.79 9.46c-.209-.22-.489-.535-.622-.699l-.05-.177-.03-.098c-.004-.114.037-.476.083-.574.047-.097.225-.383.396-.634l.412-.605c.171-.251.467-.65.658-.888l.604-.752c.19-.237.353-.43.377-.428.001-.002.248.044.548.1l.915.175.736.14c.104.02.428-.041.719-.135l.658-.211c.29-.094.732-.217.98-.275l.23.004.23-.004c.249.057.69.18.981.273l.659.211c.29.093.614.153.718.134l.736-.141.915-.175c.3-.058.547-.103.564-.102.008-.001.17.19.361.428l.606.751c.19.237.487.636.658.887l.413.605c.172.25.44.708.456.811.017.104.028.282.026.396l-.032.098z" /> | ||
</g> | ||
</defs> | ||
</svg> | ||
</iron-iconset-svg> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.