Try CarbonAds (#629)

* Try CarbonAds

* Move location

* add border, fix adblock msg

* Fix advertisement label look (#636)

Ever since changes for Carbon ads were introduced, the label did not
match the appearance of the card, leaving the bottom right corner of the
card not round. With more recent changes, where border was added, that
became even more apparent - now the border covers the label, which does
not look good; this effect only becomes worse when zooming.

This commit attempts to mitigate these issues with the following:

- To fix the border issues, label's absolute position is now calculated
  from the card wrapper, where the border is applied. This allows label
  to cover the border for seamless look. That is done by changing
  position of the card wrapper to relative instead of doing so for the
  ad contents container.

- The label now tries to take over the border, to do so the bottom and
  right relative positions have been changed to -3px.

- To account for the position change, the label is now a bit more
  padded, to make text content of it to look more or less as before,
  otherwise it would shift a bit. Not sure if the padding changes are
  accurate, but it does look close to how it looked before.

* Fix message again

* Update user ads position

* Remove privacy toggles (placebo and didn't do anything)

* Remove other code

* Link docs page

Co-authored-by: Sasha Sorokin <10401817+Brawaru@users.noreply.github.com>
This commit is contained in:
GeometricallyandSasha Sorokin authored and GitHub committed 2022-09-08 17:33:13 -07:00
1 parent 4bfab89292
commit cd2f2d42a3
14 files changed
+184 -642

No files matched your search

+1
View File
@@ -0,0 +1 @@
{"lastGenerated":"2022-09-07T18:29:05.482Z","categories":[{"icon":"","name":"128x","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"16x","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"256x","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"32x","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"512x+","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"64x","project_type":"resourcepack","header":"resolutions"},{"icon":"","name":"8x-","project_type":"resourcepack","header":"resolutions"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><circle cx=\"12\" cy=\"12\" r=\"10\"/><polygon points=\"16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76\"/></svg>","name":"adventure","project_type":"mod","header":"categories"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><circle cx=\"12\" cy=\"12\" r=\"10\"/><polygon points=\"16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76\"/></svg>","name":"adventure","project_type":"modpack","header":"categories"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M3 18v-6a9 9 0 0 1 18 0v6\"/><path d=\"M21 19a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2h3zM3 19a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2H3z\"/></svg>","name":"audio","project_type":"resourcepack","header":"features"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z\"/><polyline points=\"3.27 6.96 12 12.01 20.73 6.96\"/><line x1=\"12\" y1=\"22.08\" x2=\"12\" y2=\"12\"/></svg>","name":"blocks","project_type":"resourcepack","header":"features"},{"icon":"<svg fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z\" /></svg>","name":"challenging","project_type":"modpack","header":"categories"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M17.573 20.038L3.849 7.913 2.753 2.755 7.838 4.06 19.47 18.206l-1.898 1.832z\"/><path d=\"M7.45 14.455l-3.043 3.661 1.887 1.843 3.717-3.25\"/><path d=\"M16.75 10.82l3.333-2.913 1.123-5.152-5.091 1.28-2.483 2.985\"/><path d=\"M21.131 16.602l-5.187 5.01 2.596-2.508 2.667 2.761\"/><path d=\"M2.828 16.602l5.188 5.01-2.597-2.508-2.667 2.761\"/></svg>","name":"combat","project_type":"modpack","header":"categories"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M17.573 20.038L3.849 7.913 2.753 2.755 7.838 4.06 19.47 18.206l-1.898 1.832z\"/><path d=\"M7.45 14.455l-3.043 3.661 1.887 1.843 3.717-3.25\"/><path d=\"M16.75 10.82l3.333-2.913 1.123-5.152-5.091 1.28-2.483 2.985\"/><path d=\"M21.131 16.602l-5.187 5.01 2.596-2.508 2.667 2.761\"/><path d=\"M2.828 16.602l5.188 5.01-2.597-2.508-2.667 2.761\"/></svg>","name":"combat","project_type":"resourcepack","header":"categories"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><rect x=\"4\" y=\"4\" width=\"16\" height=\"16\" rx=\"2\" ry=\"2\"/><rect x=\"9\" y=\"9\" width=\"6\" height=\"6\"/><line x1=\"9\" y1=\"1\" x2=\"9\" y2=\"4\"/><line x1=\"15\" y1=\"1\" x2=\"15\" y2=\"4\"/><line x1=\"9\" y1=\"20\" x2=\"9\" y2=\"23\"/><line x1=\"15\" y1=\"20\" x2=\"15\" y2=\"23\"/><line x1=\"20\" y1=\"9\" x2=\"23\" y2=\"9\"/><line x1=\"20\" y1=\"14\" x2=\"23\" y2=\"14\"/><line x1=\"1\" y1=\"9\" x2=\"4\" y2=\"9\"/><line x1=\"1\" y1=\"14\" x2=\"4\" y2=\"14\"/></svg>","name":"core-shaders","project_type":"resourcepack","header":"features"},{"icon":"<svg viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><rect x=\"7\" y=\"7.5\" width=\"10\" height=\"14\" rx=\"5\"/><polyline points=\"2 12.5 4 14.5 7 14.5\"/><polyline points=\"22 12.5 20 14.5 17 14.5\"/><polyline points=\"3 21.5 5 18.5 7 17.5\"/><polyline points=\"21 21.5 19 18.5 17 17.5\"/><polyline points=\"3 8.5 5 10.5 7 11.5\"/><polyline points=\"21 8.5 19 10.5 17 11.5\"/><line x1=\"12\" y1=\"7.5\" x2=\"12\" y2=\"21.5\"/><path d=\"M15.38,8.82A3,3,0,0,0,16,7h0a3,3,0,0,0-3-3H11A3,3,0,0,0,8,7H8a3,3,0,0,0,.61,1.82\"/><linLine truncated