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.

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

WIP: Style updates to Settings #623

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions browser/resources/settings/brave_settings_menu/icons.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<link rel="import" href="../html/polymer.html">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving a note here to remember to change this path to point at the path in chromium's resources


<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 a better place and having a common "icons" html
-->
<iron-iconset-svg name="brave_settings" size="32">
<svg>
<defs>
<!--
Shoutouts to the design crew at Brave Software for these 1337 icons
-->
<g id="arrows-download" viewBox="0 0 32 32"><path d="M15.25 21.65a1 1 0 0 0 1.5 0l5.89-4.88a1 1 0 1 0-1.28-1.54L17 18.84V4a1 1 0 0 0-2 0v14.84l-4.36-3.61a1 1 0 0 0-1.28 1.54z"/> <path d="M28 20a1 1 0 0 0-1 1v5a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1v-5a1 1 0 0 0-2 0v5a3 3 0 0 0 3 3h20a3 3 0 0 0 3-3v-5a1 1 0 0 0-1-1z"/></g>
<g id="reset" viewBox="0 0 32 32"><path d="M22.75 11.92H6.49l5.22-5.21a1 1 0 1 0-1.42-1.42l-7 7a1 1 0 0 0 0 1.42l7 7a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42l-5.37-5.37h16.41a4.15 4.15 0 0 1 4.25 4V23a1 1 0 0 0 2 0v-5.06a6.14 6.14 0 0 0-6.25-6.02z"/></g>
<g id="circle-accessibility-o" viewBox="0 0 32 32"><path d="M16 3a13 13 0 1 0 13 13A13 13 0 0 0 16 3zm0 24a11 11 0 1 1 11-11 11 11 0 0 1-11 11z"/><circle cx="16" cy="10" r="2"/><path d="M20.38 12.22c-4.3 3.43-8.57.14-8.76 0a1 1 0 0 0-1.24 1.56 9.65 9.65 0 0 0 4.62 1.9v2.11l-2.82 4.7a1 1 0 1 0 1.72 1l2.1-3.55 2.14 3.57A1 1 0 0 0 19 24a1 1 0 0 0 .51-.14 1 1 0 0 0 .35-1.37L17 17.66v-1.93a8.74 8.74 0 0 0 4.66-2 1 1 0 1 0-1.24-1.56z"/></g>
<g id="circle-sync" viewBox="0 0 32 32"><path d="M11.0035 10c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.066 0 1.996.56 2.528 1.397 4.524-.844 9.086 1.096 11.399 5.103.276.479.112 1.09-.366 1.366-.158.091-.33.134-.499.134-.346 0-.682-.179-.868-.5-1.874-3.247-5.578-4.82-9.227-4.167-.168 1.498-1.424 2.667-2.967 2.667zm0 11c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3c0-.332.066-.645.166-.943-1.345-1.285-2.325-2.921-2.818-4.786-.703-2.659-.343-5.418 1.014-7.771.277-.479.889-.642 1.367-.366s.642.887.366 1.366c-1.092 1.892-1.381 4.115-.814 6.26.379 1.434 1.115 2.699 2.12 3.71.464-.294 1.01-.47 1.599-.47zm17-5c0 1.473-1.063 2.692-2.463 2.946-1.265 4.132-5.003 7.054-9.537 7.054-.553 0-1-.448-1-1s.447-1 1-1c3.527 0 6.445-2.223 7.535-5.397-.912-.515-1.535-1.481-1.535-2.603 0-1.657 1.343-3 3-3s3 1.343 3 3z"></path></g>
<g id="full-color-brave-lion" viewBox="0 0 32 32"><g fill-rule="evenodd"><path d="M26.83344 11.40342l-.79013-2.17534.54893-1.24962c.07051-.16088.03659-.34965-.08548-.4745l-1.49344-1.5321c-.6531-.6695-1.62753-.89971-2.50527-.59096l-.4175.14679-2.18125-2.36863h-8.0205L9.73543 5.55829l-.40601-.1449c-.88575-.31606-1.87194-.08341-2.5293.59665l-1.5199 1.56081c-.0975.09994-.1242.24998-.06758.37809l.5735 1.29702-.78612 2.17424.50885 1.96029 2.31749 8.93506c.26684 1.03025.88174 1.9324 1.73704 2.55017 0 0 2.81379 2.0123 5.59044 3.83987.24415.16088.4995.27842.77357.27409.27406.00379.52942-.11321.77303-.2749 3.11856-2.07269 5.5859-3.84719 5.5859-3.84719.8545-.61885 1.46833-1.52208 1.7341-2.5526l2.30654-8.93858.50645-1.963z"></path><path d="M11.89778 3.1632L9.7715 5.5902l-.17559-.12247c-1.41233-.44373-2.02724-.14288-2.93835.71347l-.20173.22009 1.11284-.2201c.30752 0 1.16743.02941 1.34763.09199.759.264.96966.57286 1.45597.89649l.23345.07937 2.26952.46019a.91053.91053 0 0 0 .4283-.02122l1.066-.3539c.96508-.378 2.01648-.39558 3.11144 0l1.0458.3582a1.00453 1.00453 0 0 0 .49648.03115l.18768-.03599 2.29308-.5178.03716-.0932.15787-.12874c.97543-.71752 1.75188-1.06516 3.24892-.91707h.11503l-.0688-.09362c-1.24796-1.00362-2.00886-.70195-2.70987-.4693l-.19157.06628-2.17167-2.37082H11.8978z"></path><path d="M16.68484 19.24904l.30336.1273c.3269.13707.85284.38195 1.16824.5442l.89511.4605c.3154.16198.33814.46536.0503.67393l-.7635.55314c-.28784.20857-.74048.57046-1.00559.80504-.26538.23458-.69848.61733-.96279.8511-.2643.23376-.6926.23485-.95182.00298-.2595-.23214-.68886-.61219-.9545-.84433-.26537-.2324-.71908-.5916-1.00827-.798l-.76081-.54446c-.28919-.20695-.26859-.51169.0452-.6772l.89993-.47457c.3138-.16578.83786-.4139 1.16477-.55097l.30336-.12785c.32664-.13733.61957-.25002.65087-.25002h.275c.03103 0 .32423.11187.65114.2492zm7.64667-7.2978l-.05751.20884c-.15356.19395-.47725.56613-.71962.82753l-2.22787 2.40105c-.24237.26113-.37913.58864-.24082.91857l.30047.75085c.13804.32965.15168.8752.01926 1.24142-.13456.37273-.36623.70212-.66986.95322l-.23247.19205c-.2742.22673-.76001.28632-1.0797.1322l-1.02618-.49355c-.31942-.15358-.79613-.47566-1.05937-.71565l-.97081-.88469c-.1894-.17282-.2001-.4697-.02381-.65552l2.3643-1.61714c.2932-.20045.44842-.57128.28175-.8874l-.84059-1.55049c-.16666-.31638-.23327-.73651-.1482-.93398.08534-.19747.42562-.46293.7568-.58997l2.7445-1.03367c.33092-.12704.31326-.25815-.03905-.29174L19.70905 9.791c-.35259-.0336-.61095.01842-.95177.11485l-1.3273.3329c-.34082.09644-.41289.46402-.34895.81616l.5476 3.00998c.0642.35242.0955.70726.06982.7888-.02568.08153-.32904.2129-.67414.29227l-.45397.1043c-.3451.07936-.91062.08288-1.25652.00839L14.7646 15.14c-.34617-.07477-.65033-.20262-.67628-.28388-.02569-.08154.00535-.43693.06928-.78907l.54413-3.01053c.06394-.3524-.00867-.71944-.34948-.8156l-1.32784-.33129c-.34082-.09616-.59945-.14709-.95177-.1135l-1.75368.13382c-.35232.03386-.3697.16496-.03879.29146l2.7461 1.03069c.33093.12677.67174.39169.75708.58916.0856.1972.01926.61732-.14687.9337l-.83897 1.55104c-.16613.31639-.01065.68722.28282.8874l2.36644 1.6147c.17656.18555.16613.4827-.023.65552l-.97002.88604c-.2627.24027-.73914.56261-1.05856.71701l-1.02539.4949c-.31941.15412-.80549.09534-1.0797-.13084l-.23246-.19178c-.30417-.25083-.53637-.57995-.68217-.9822-.12199-.3367-.10914-.8817.02836-1.2119l.29994-.75085c.13777-.3302.00048-.65771-.24216-.91857L8.23106 12.9971c-.24237-.26086-.5666-.63277-.72015-.82618l-.05805-.20911-.03611-.11648c-.00348-.13409.04387-.56153.09764-.6772.05377-.11512.25976-.45263.45799-.74951l.47724-.71539c.19823-.29688.54092-.76902.76136-1.04937l.69955-.88848c.22043-.28009.4085-.50817.43685-.50627.00134-.0019.28678.052.63428.11946l1.05963.20613c.3475.06745.73086.14167.85204.1647.12092.0233.49544-.04822.83224-.15874l.76216-.25002c.33653-.11079.84749-.25652 1.13507-.32424l.26644.00407.26645-.00434c.28758.06718.79853.21237 1.13534.32262l.76269.2492c.3368.11025.71132.18122.83224.15793.12118-.0233.50427-.09833.85177-.16632l1.05936-.20695c.3475-.068.63294-.12217.65328-.12054.00936-.00163.19742.22564.4184.506l.70061.88766c.22097.27981.56393.75141.7627 1.0483l.47804.71457c.1985.2966.50855.83646.52781.95917.0198.1227.0329.33291.0297.467l-.03612.11647z"></path></g></g>
<g id="illo-advanced-view" viewBox="0 0 50 82"><path d="M39.1707 70H36c-.55228 0-1 .44772-1 1s.44772 1 1 1h3.1707c.41184 1.1652 1.52308 2 2.8293 2 1.65685 0 3-1.34315 3-3s-1.34315-3-3-3c-1.30622 0-2.41746.8348-2.8293 2zm0-15H36c-.55228 0-1 .44772-1 1s.44772 1 1 1h3.1707c.41184 1.1652 1.52308 2 2.8293 2 1.65685 0 3-1.34315 3-3s-1.34315-3-3-3c-1.30622 0-2.41746.8348-2.8293 2zm0-15H36c-.55228 0-1 .44772-1 1s.44772 1 1 1h3.1707c.41184 1.1652 1.52308 2 2.8293 2 1.65685 0 3-1.34315 3-3s-1.34315-3-3-3c-1.30622 0-2.41746.8348-2.8293 2zm0-15H36c-.55228 0-1 .44772-1 1s.44772 1 1 1h3.1707c.41184 1.1652 1.52308 2 2.8293 2 1.65685 0 3-1.34315 3-3s-1.34315-3-3-3c-1.30622 0-2.41746.8348-2.8293 2zm0-15H36c-.55228 0-1 .44772-1 1s.44772 1 1 1h3.1707c.41184 1.1652 1.52308 2 2.8293 2 1.65685 0 3-1.34315 3-3s-1.34315-3-3-3c-1.30622 0-2.41746.8348-2.8293 2zM2 0h46c1.10457 0 2 .89543 2 2v78c0 1.10457-.89543 2-2 2H2c-1.10457 0-2-.89543-2-2V2C0 .89543.89543 0 2 0zm4 10v2h18v-2H6zm0 15v2h22v-2H6zm0 15v2h18v-2H6zm0 15v2h22v-2H6zm0 15v2h12v-2H6z"></path></g>
<g id="illo-simple-view" viewBox="0 0 50 82"><path d="M49.5 42.11113V2c0-.82843-.67157-1.5-1.5-1.5H2C1.17157.5.5 1.17157.5 2v40.11115c6.42286 1.41252 14.6494 2.63861 24.23118 2.66113 9.82317.02304 18.2399-1.22537 24.76882-2.66115zM2-.5h46c1.38071 0 2.5 1.11929 2.5 2.5v78c0 1.38071-1.11929 2.5-2.5 2.5H2C.61929 82.5-.5 81.38071-.5 80V2C-.5.61929.61929-.5 2-.5zM15 12h27v6H15v-6zm0 17h27v6H15v-6zM9 17c-1.10457 0-2-.89543-2-2s.89543-2 2-2 2 .89543 2 2-.89543 2-2 2zm0 17c-1.10457 0-2-.89543-2-2s.89543-2 2-2 2 .89543 2 2-.89543 2-2 2z"></path></g>
<g id="logos-product" viewBox="0 0 32 32"><path fill-rule="evenodd" d="M21.773 15.46a.786.786 0 0 0-.14.778l.452 1.065c.102.24.111.635.021.878 0 0-.494 1.005-.828 1.275l-.435.351a.825.825 0 0 1-.797.095s-2.13-1.076-2.324-1.25l-1.237-1.109a.49.49 0 0 1-.024-.707l2.79-1.869a.534.534 0 0 0 .17-.68l-1.083-2.022c-.123-.229-.146-.59-.052-.803.093-.212 4.005-1.826 4.005-1.826.244-.092.231-.187-.029-.212l-1.99-.187a3.101 3.101 0 0 0-.93.082l-1.734.48a.528.528 0 0 0-.372.591l.681 3.697c.047.255.062.536.034.624-.029.088-.26.204-.516.258l-1.056.224a2.084 2.084 0 0 1-.363.037 2.094 2.094 0 0 1-.363-.037l-1.056-.224c-.256-.054-.487-.17-.515-.258-.029-.088-.013-.369.034-.624l.68-3.697a.528.528 0 0 0-.372-.59l-1.733-.48a3.097 3.097 0 0 0-.93-.083l-1.99.187c-.26.025-.273.12-.029.212 0 0 3.911 1.614 4.005 1.826.093.213.07.574-.053.803l-1.082 2.022a.535.535 0 0 0 .171.68l2.79 1.87c.193.2.181.52-.026.706l-1.237 1.11c-.193.173-2.324 1.25-2.324 1.25a.825.825 0 0 1-.797-.096l-.435-.35c-.333-.27-.828-1.276-.828-1.276a1.368 1.368 0 0 1 .022-.878l.452-1.065a.784.784 0 0 0-.14-.778l-3.5-3.993c-.005-.145.047-.606.106-.73.06-.124.227-.402.373-.617 0 0 2.705-3.598 2.716-3.596.01.002.02.002.02 0 .002-.002 3.24.51 3.487.43 0 0 2.294-.688 2.554-.687.26 0 3.114.811 3.247.786.133-.025 2.792-.53 2.794-.529.001.002.011.002.021 0 .01-.002 3.03 4.09 3.09 4.213.058.124.11.585.106.73l-3.5 3.993zm-2.12 6.074l-3.34 2.631a.532.532 0 0 1-.313.126.533.533 0 0 1-.314-.126l-3.34-2.63c-.214-.15-.198-.372.033-.492 0 0 3.582-1.619 3.621-1.619.038 0 3.62 1.62 3.62 1.62.231.12.247.34.033.49zm7.482-12.803l.631-1.397a.368.368 0 0 0-.074-.408l-1.67-1.682a2.668 2.668 0 0 0-2.78-.643l-.448.156-2.506-2.723L16.005 2h-.011l-4.283.034-2.506 2.723-.447-.156a2.668 2.668 0 0 0-2.78.643l-1.67 1.682a.368.368 0 0 0-.075.408l.631 1.397L4 11.075l.56 2.113 2.546 9.63a4.909 4.909 0 0 0 1.91 2.748s3.093 2.17 6.145 4.14c.265.17.542.295.84.294.295.001.572-.124.837-.295 3.052-1.97 6.145-4.139 6.145-4.139a4.909 4.909 0 0 0 1.91-2.749l2.547-9.629.56-2.113-.865-2.344z"/></g>
<g id="logos-thumbs-up" viewBox="0 0 32 32"><path d="M24.7012 25.4531c-.031.281-.34.547-.635.547h-8.066c-.579 0-1.514-.333-1.959-.698l-3.041-2.497v-7.805h2.066c.477 0 .888-.337.981-.804.517-2.593 1.404-6.912 1.58-7.466.13-.409.616-.73 1.107-.73.674 0 1.266.561 1.266 1.2v6.471c-.037.104-.067.212-.067.329 0 .552.448 1 1 1h6.754c.107 0 .193.033.248.095.052.057.074.137.065.214l-1.299 10.144zm-18.701-.453h3v-11h-3v11zm21.427-11.238c-.434-.484-1.068-.762-1.74-.762h-5.687v-5.8c0-1.765-1.465-3.2-3.266-3.2-1.356 0-2.624.894-3.013 2.126-.221.693-1.097 5.001-1.474 6.874h-1.247c0-.552-.447-1-1-1h-5c-.553 0-1 .448-1 1v13c0 .552.447 1 1 1h5c.553 0 1-.448 1-1v-.607l1.773 1.456c.802.656 2.19 1.151 3.227 1.151h8.066c1.325 0 2.478-1.022 2.621-2.31l1.299-10.143c.072-.656-.131-1.306-.559-1.785z"></path></g>
<g id="search" viewBox="0 0 32 32"><path d="M28.71 27.29l-8.83-8.82a9.52 9.52 0 1 0-1.41 1.41l8.82 8.83a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM12.5 20a7.5 7.5 0 1 1 7.5-7.5 7.5 7.5 0 0 1-7.5 7.5z"/></g>
<g id="misc-extensions" viewBox="0 0 32 32"><path d="M25 15V9a2 2 0 0 0-2-2h-4a4 4 0 0 0-8 0H6a2 2 0 0 0-2 2v5a1 1 0 0 0 1 1 2 2 0 0 1 0 4 1 1 0 0 0-1 1v6a2 2 0 0 0 2 2h5a1 1 0 0 0 1-1 2 2 0 0 1 4 0 1 1 0 0 0 1 1h6a2 2 0 0 0 2-2v-3a4 4 0 0 0 0-8zm0 6a1.89 1.89 0 0 1-.67-.13 1 1 0 0 0-1.33.95V26h-5.13a4 4 0 0 0-7.74 0H6v-5.13a4 4 0 0 0 0-7.74V9h6.18a1 1 0 0 0 1-1.33A1.89 1.89 0 0 1 13 7a2 2 0 0 1 4 0 1.89 1.89 0 0 1-.13.67A1 1 0 0 0 17.82 9H23v7.18a1 1 0 0 0 1.33.95A1.89 1.89 0 0 1 25 17a2 2 0 0 1 0 4z"/></g>
<g id="language" viewBox="0 0 32 32"><<path d="M23.2 9H8.8a1 1 0 0 0 0 2h14.4a1 1 0 1 0 0-2zM23.2 13H8.8a1 1 0 0 0 0 2h14.4a1 1 0 1 0 0-2zM18.4 17H8.8a1 1 0 0 0 0 2h9.6a1 1 0 0 0 0-2z"/><path d="M25.63 5H6.37A3.38 3.38 0 0 0 3 8.39V27a1 1 0 0 0 .66.94 1 1 0 0 0 1.11-.3l3.7-4.49h17.16A3.38 3.38 0 0 0 29 19.76V8.39A3.38 3.38 0 0 0 25.63 5zM27 19.76a1.38 1.38 0 0 1-1.37 1.39H7.8a.85.85 0 0 0-.17.06.49.49 0 0 0-.15.1.51.51 0 0 0-.16.13L5 24.22V8.39A1.39 1.39 0 0 1 6.37 7h19.26A1.39 1.39 0 0 1 27 8.39z"/></g>
<g id="passwords" viewBox="0 0 32 32"><path d="M24 12h-1V9.6A6.82 6.82 0 0 0 16 3a6.82 6.82 0 0 0-7 6.6V12H8a3 3 0 0 0-3 3v11a3 3 0 0 0 3 3h16a3 3 0 0 0 3-3V15a3 3 0 0 0-3-3zM11 9.6A4.81 4.81 0 0 1 16 5a4.81 4.81 0 0 1 5 4.6V12H11zM25 26a1 1 0 0 1-1 1H8a1 1 0 0 1-1-1V15a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1z"/><path d="M16 16.4a2 2 0 0 0-1 3.72v2.38a1 1 0 0 0 2 0v-2.38a2 2 0 0 0-1-3.72z"/></g>
<g id="printer" viewBox="0 0 32 32"><path d="M27.2 9H24V4a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v5H4.8A1.81 1.81 0 0 0 3 10.81v11.38A1.81 1.81 0 0 0 4.8 24H8v4a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-4h3.2a1.81 1.81 0 0 0 1.8-1.81V10.81A1.81 1.81 0 0 0 27.2 9zM10 5h12v4H10zm12 22H10v-8h12zm5-5h-3v-4a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v4H5V11h22z"/><path d="M22 14a1 1 0 0 0 1 1h1a1 1 0 0 0 0-2h-1a1 1 0 0 0-1 1z"/></g>
<g id="shields-success-o" viewBox="0 0 32 32"><path d="M26 6.2h-2.47c-4.8 0-6.59-2.63-6.66-2.74a1.1 1.1 0 0 0-1.74 0c-.07.11-1.86 2.74-6.68 2.74H6a1 1 0 0 0-1 1v5.59c0 .13 0 12.43 10.67 16.15a.94.94 0 0 0 .66 0C27 25.22 27 12.92 27 12.8V7.2a1 1 0 0 0-1-1zm-1 6.61c0 .44 0 10.75-9 14.13-9-3.38-9-13.69-9-14.14V8.2h1.47A10.47 10.47 0 0 0 16 5.49a10.49 10.49 0 0 0 7.53 2.71H25z"/><path d="M19.19 11.42l-4.32 6-2.16-2.17a1 1 0 0 0-1.42 1.42l3 3A1 1 0 0 0 15 20h.08a1 1 0 0 0 .73-.42l5-7a1 1 0 1 0-1.62-1.16z"/></g>
<g id="square-launch" viewBox="0 0 32 32"><path d="M26 26v-8.9773c0-.55228.44772-1 1-1s1 .44772 1 1V27c0 .55228-.44772 1-1 1H5c-.55228 0-1-.44772-1-1V5c0-.55228.44772-1 1-1h9.37476c.55228 0 1 .44772 1 1s-.44772 1-1 1H6v20h20zM24.5867 6H18.999c-.55228 0-1-.44772-1-1s.44772-1 1-1h8.002c.55228 0 1 .44772 1 1v8c0 .55228-.44772 1-1 1s-1-.44772-1-1V7.41412L12.70708 20.70713c-.39053.39051-1.0237.39049-1.41421-.00005-.39051-.39053-.39049-1.0237.00005-1.41421L24.58669 6z"></g>
<g id="square-monitor" viewBox="0 0 32 32"><path d="M26 5H6a3 3 0 0 0-3 3v12a3 3 0 0 0 3 3h20a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3zm1 15a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V8a1 1 0 0 1 1-1h20a1 1 0 0 1 1 1zM22 25H10a1 1 0 0 0 0 2h12a1 1 0 0 0 0-2z"/></g>
<g id="square-tab-settings" viewBox="0 0 32 32"><path d="M26 3H6a3 3 0 0 0-3 3v20a3 3 0 0 0 3 3h20a3 3 0 0 0 3-3V6a3 3 0 0 0-3-3zM6 5h20a1 1 0 0 1 1 1v3H5V6a1 1 0 0 1 1-1zm-1 8v-2h8v2zm10-2h6v2h-6zm11 16H6a1 1 0 0 1-1-1V15h17a1 1 0 0 0 1-1v-3h4v15a1 1 0 0 1-1 1z"/></g>
</defs>
</svg>
</iron-iconset-svg>
1 change: 1 addition & 0 deletions browser/resources/settings/settings_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<structure name="IDR_SETTINGS_BRAVE_DEFAULT_EXTENSIONS_BROWSER_PROXY_JS" file="brave_default_extensions_page/brave_default_extensions_browser_proxy.js" type="chrome_html" preprocess="true" />
<structure name="IDR_SETTINGS_BRAVE_DEFAULT_EXTENSIONS_PAGE_JS" file="brave_default_extensions_page/brave_default_extensions_page.js" type="chrome_html" preprocess="true" />
<structure name="IDR_SETTINGS_BRAVE_DEFAULT_EXTENSIONS_PAGE_HTML" file="brave_default_extensions_page/brave_default_extensions_page.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
<structure name="IDR_SETTINGS_BRAVE_SETTINGS_MENU_ICONS_HTML" file="brave_settings_menu/icons.html" type="chrome_html" />
</structures>
<includes>
<include name="IDR_SETTINGS_BRAVE_STAMP" file="brave_unpack.stamp" type="BINDATA" />
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/chrome/browser/resources/settings/settings_icons_css.html b/chrome/browser/resources/settings/settings_icons_css.html
index 7a4e72d47e8e79a89aacd2f84fa47575d122e0a8..5a4c8832a7b91499f19b4d08468639f1dc453383 100644
--- a/chrome/browser/resources/settings/settings_icons_css.html
+++ b/chrome/browser/resources/settings/settings_icons_css.html
@@ -4,14 +4,14 @@
<dom-module id="settings-icons">
<template>
<style>
-<if expr="chromeos">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused about this patch. This only applies to chromeos

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like just an indentation thing? I can fix it

- paper-icon-button-light.icon-add-circle {
- background-image: url(./images/settings_icon_add_circle.svg);
- }
- paper-icon-button-light.icon-add-wifi {
- background-image: url(./images/settings_icon_add_wifi.svg);
- }
-</if>
+ <if expr="chromeos">
+ paper-icon-button-light.icon-add-circle {
+ background-image: url(./images/settings_icon_add_circle.svg);
+ }
+ paper-icon-button-light.icon-add-wifi {
+ background-image: url(./images/settings_icon_add_wifi.svg);
+ }
+ </if>
</style>
</template>
</dom-module>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index 87bd32f2d53f3a7d5c0f1576e268a574d54aa1e9..6313f1eaf84b3767f423286587d489e80df63477 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -18,6 +18,10 @@
<dom-module id="settings-main">
<template>
<style include="cr-hidden-style">
+ :host {
+ display: inline-block;
+ }
+
#overscroll {
margin-top: 64px;
}
Loading