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

Minor tab colour fix #7847

Merged
merged 3 commits into from Jan 16, 2017
Merged

Minor tab colour fix #7847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e89ad40
Remove redundant OrderedDict call.
QuLogic Jan 16, 2017
6b13c0b
Fix one last tc -> tab.
QuLogic Jan 16, 2017
3d3130a
MNT: remove un-used public dictionary
tacaswell Jan 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/matplotlib/_color_data.py
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@


# These colors are from Tableau
TABLEAU_COLORS = OrderedDict((
TABLEAU_COLORS = (
('blue', '#1f77b4'),
('orange', '#ff7f0e'),
('green', '#2ca02c'),
Expand All @@ -26,12 +26,12 @@
('pink', '#e377c2'),
('gray', '#7f7f7f'),
('olive', '#bcbd22'),
('cyan', '#17becf'))
('cyan', '#17becf'),
)

# Normalize name to "tab:<name>" to avoid name collisions.
TABLEAU_COLORS = OrderedDict(
('tab:' + name, value) for name, value in TABLEAU_COLORS.items())
('tab:' + name, value) for name, value in TABLEAU_COLORS)

# This mapping of color names -> hex values is taken from
# a survey run by Randel Monroe see:
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/colors.py
View file
Open in desktop
Expand Up @@ -260,7 +260,6 @@ def to_hex(c, keep_alpha=False):
### Backwards-compatible color-conversion API

cnames = CSS4_COLORS
COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS, 'tc': TABLEAU_COLORS}
hexColorPattern = re.compile("\A#[a-fA-F0-9]{6}\Z")


Expand Down