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.

Sign up for GitHub

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

Jump to bottom

Colourbar transparency #5550

Merged
merged 9 commits into from
Dec 14, 2023
Merged

Colourbar transparency #5550

merged 9 commits into from
Dec 14, 2023

Commits on Nov 29, 2023

  1. Add alpha to set colourbar/steps transparency

    @teunbrand
    teunbrand committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    dba6805 View commit details
    Browse the repository at this point in the history

  2. incorporate alpha in tests

    @teunbrand
    teunbrand committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6a8ba3d View commit details
    Browse the repository at this point in the history

  3. document alpha

    @teunbrand
    teunbrand committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    0878143 View commit details
    Browse the repository at this point in the history

  4. add news bullet

    @teunbrand
    teunbrand committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6c1f117 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. resolve merge conflict

    @teunbrand
    teunbrand committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    33cb91a View commit details
    Browse the repository at this point in the history

  2. add alpha to coloursteps (constructors were separated)

    @teunbrand
    teunbrand committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7614e87 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'colourbar_alpha' of https://github.com/teunbrand/ggplot2 … 

    …into colourbar_alpha
    @teunbrand
    teunbrand committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    505a3ee View commit details
    Browse the repository at this point in the history

  4. resolve more merge conflicts? 

    Merge branch 'main' into colourbar_alpha

# Conflicts:
#	R/guide-colorbar.R
#	R/guide-colorsteps.R
#	man/guide_colourbar.Rd
#	man/guide_coloursteps.Rd
#	tests/testthat/test-guides.R
    @teunbrand
    teunbrand committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    55cffa4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into colourbar_alpha

    @teunbrand
    teunbrand authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    32427f1 View commit details
    Browse the repository at this point in the history