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

Wmwragg/mention state menu #1900

Merged
merged 45 commits into from
Aug 3, 2016
Merged

Wmwragg/mention state menu #1900

merged 45 commits into from
Aug 3, 2016

Conversation

wmwragg
Copy link
Contributor

@wmwragg wmwragg commented Jul 29, 2016

This closes #1841 and closes #1746. A companion branch matrix-org/matrix-react-sdk:wmwragg/mention-state-menu also needs to be merged.

Signed-off-by: William Wragg wm.wragg@gmail.com

…ention-state-menu

# resolved Conflicts:
#	src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
…as they were causeing untraceable react errros for some reason
… it pasues breifly before closing, so that the user can see their state change has taken place.
@matrixbot
Copy link

Can one of the admins verify this patch?

@@ -94,7 +94,7 @@ limitations under the License.
background-color: #eaf5f0;

-webkit-flex: 0 0 210px;
flex: 0 0 210px;
flex: 0 0 235px;
Copy link
Member

@ara4n ara4n Aug 3, 2016

Choose a reason for hiding this comment

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

hm, the -webkit-flex is now out of sync with the flex

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think that the -webkit-flex is used anymore, but I've corrected anyway

@ara4n
Copy link
Member

ara4n commented Aug 3, 2016

LGTM modulo comment - thanks :)

@ara4n ara4n merged commit 70754db into develop Aug 3, 2016
@t3chguy t3chguy deleted the wmwragg/mention-state-menu branch May 12, 2022 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mention State Indicator Design Reworking Left panel "mention states" (notification volume control) restyle
3 participants