Skip to content

/riot-web

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

Stickerpacks #6242

Merged
merged 29 commits into from Mar 29, 2018
+221 −28
Merged

Stickerpacks #6242

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f8e00e4
Show / hide sitckers icons
rxl881 Jan 9, 2018
fa1059e
Show / hide stickers icon styling
rxl881 Jan 9, 2018
409bb5f
Improved icons.
rxl881 Jan 9, 2018
50271b7
Remove padding on last component of MessageComposer (sticker toggle i…
rxl881 Jan 10, 2018
a24c3ad
Sticker styling
rxl881 Jan 12, 2018
7924a14
Remove transparent background and fix z-index of popover.
rxl881 Jan 15, 2018
a7f0b11
Add generic element context menu / popover.
rxl881 Jan 16, 2018
f8643e9
Add styling and image for stickerpack placeholder.
rxl881 Jan 16, 2018
56ae96f
Sticker content styling
rxl881 Jan 16, 2018
f4816b9
Add stickerpack manage integration link styling.
rxl881 Jan 17, 2018
854b537
Update sticker toggle icons.
rxl881 Jan 17, 2018
de597d4
Make background lighter.
rxl881 Jan 17, 2018
c340032
Move sticker related CSS to its own file.
rxl881 Jan 17, 2018
738b59f
Call for update on window resize.
rxl881 Jan 18, 2018
095130a
Hide apps drawer
rxl881 Feb 9, 2018
c198dd3
Pull in changes from develop
rxl881 Feb 23, 2018
9fc7435
Correctly position tooltips relative to parent element.
rxl881 Mar 6, 2018
d77ab89
Update tooltip position on scroll.
rxl881 Mar 6, 2018
78ae1ad
Fix tooltip vertical positioning.
rxl881 Mar 6, 2018
6785d75
Remove logging.
rxl881 Mar 6, 2018
fe3f0be
Ignore local config.
rxl881 Mar 7, 2018
38efebb
Split out sticker CSS
rxl881 Mar 8, 2018
351f9b3
Remove broken transitions.
rxl881 Mar 8, 2018
d2f4bb2
Fix spinner position / height.
rxl881 Mar 13, 2018
8d8580a
Cleanup comments. Reduce default app tile height to 280px.
rxl881 Mar 13, 2018
85fca9d
Style sticker content rather than thumbnail.
rxl881 Mar 14, 2018
e36d972
Bind function in constructor.
rxl881 Mar 26, 2018
700515c
Add some comments.
rxl881 Mar 26, 2018
e3a3dec
Move variables out of state.
rxl881 Mar 26, 2018
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Next

Show / hide sitckers icons

  • Loading branch information
@rxl881
rxl881 committed Jan 9, 2018
commit f8e00e43e3613f6c71bb6da024a9cf75b6288337
16 src/skins/vector/img/icons-hide-stickers.svg
View file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="500px" height="500px" viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
<g id="Layer_1_1_">
<path id="Oval-109-Copy" fill="#76CFA6" d="M250,500c138.571,0,250-111.429,250-250S388.571,0,250,0S0,111.429,0,250
S111.429,500,250,500z"/>
</g>
<path fill="#FFFFFF" d="M249,42C133.563,42,41,135.6,41,250c0,114.4,92.563,208,208,208c115.438,0,208-93.6,208-208
C457,135.6,363.401,42,249,42z M249,416.4c-91.518,0-166.404-74.883-166.404-166.4c0-91.518,74.887-166.4,166.404-166.4
c91.517,0,166.404,74.882,166.404,166.4C415.404,341.518,340.518,416.4,249,416.4z M321.8,229.2c17.684,0,31.201-13.518,31.201-31.2
s-13.519-31.2-31.201-31.2c-17.682,0-31.2,13.518-31.2,31.2S304.118,229.2,321.8,229.2z M176.2,229.2
c17.682,0,31.2-13.518,31.2-31.2s-13.519-31.2-31.2-31.2c-17.683,0-31.201,13.518-31.201,31.2S158.518,229.2,176.2,229.2z
M249,364.4c48.883,0,89.436-30.164,106.081-72.801H142.919C159.564,334.236,200.117,364.4,249,364.4z"/>
</svg>
16 src/skins/vector/img/icons-show-stickers.svg
View file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="500px" height="500px" viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
<g id="Layer_1_1_" opacity="0.15">
<path id="Oval-109-Copy" fill="#76CFA6" d="M250,500c138.571,0,250-111.429,250-250S388.571,0,250,0S0,111.429,0,250
S111.429,500,250,500z"/>
</g>
<path fill="#76CFA6" d="M249,42C133.563,42,41,135.6,41,250c0,114.4,92.563,208,208,208c115.438,0,208-93.6,208-208
C457,135.6,363.401,42,249,42z M249,416.4c-91.518,0-166.404-74.883-166.404-166.4c0-91.518,74.887-166.4,166.404-166.4
c91.517,0,166.404,74.882,166.404,166.4C415.404,341.518,340.518,416.4,249,416.4z M321.8,229.2c17.684,0,31.201-13.518,31.201-31.2
s-13.519-31.2-31.201-31.2c-17.682,0-31.2,13.518-31.2,31.2S304.118,229.2,321.8,229.2z M176.2,229.2
c17.682,0,31.2-13.518,31.2-31.2s-13.519-31.2-31.2-31.2c-17.683,0-31.201,13.518-31.201,31.2S158.518,229.2,176.2,229.2z
M249,364.4c48.883,0,89.436-30.164,106.081-72.801H142.919C159.564,334.236,200.117,364.4,249,364.4z"/>
</svg>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.