Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Apply new design to highlighted tags and add toggle mechanic #3755

Merged
merged 7 commits into from
Dec 23, 2019
Merged

Apply new design to highlighted tags and add toggle mechanic #3755

merged 7 commits into from
Dec 23, 2019

Commits on Dec 19, 2019

  1. Apply new design to highlighted tags and add toggle mechanic

    @t3chguy
    t3chguy committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    1c31fd3 View commit details
    Browse the repository at this point in the history

  2. Initial rejig

    @t3chguy
    t3chguy committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    b2249d0 View commit details
    Browse the repository at this point in the history

  3. Iterate to match design on Zeplin

    @t3chguy
    t3chguy committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    d9ea9b4 View commit details
    Browse the repository at this point in the history

  4. delint

    @t3chguy
    t3chguy committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    3a36d61 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2019

  1. Merge branches 'develop' and 't3chguy/tags_changes' of https://github… 

    ….com/matrix-org/matrix-react-sdk into t3chguy/tags_changes

� Conflicts:
�	src/components/views/elements/TagTile.js
    @t3chguy
    t3chguy committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    661701f View commit details
    Browse the repository at this point in the history

  2. match padding on CustomRoomTagPanel and fix colour of Communities btn

    @t3chguy
    t3chguy committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    afcbb21 View commit details
    Browse the repository at this point in the history

  3. fix alignment

    @t3chguy
    t3chguy committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    84eb72b View commit details
    Browse the repository at this point in the history