Merge branch 'master' of github.com:3dmol/3Dmol.js

3dmol · Oct 23, 2018 · 19c1732 · 19c1732
2 parents 54e02bc + 3d2a7e3
commit 19c1732
Showing 1 changed file with 159 additions and 2 deletions.
diff --git a/3Dmol/colors.js b/3Dmol/colors.js
@@ -272,11 +272,15 @@ $3Dmol.elementColors.Jmol = {
         'HE': 0xD9FFFF,
         'Li': 0xCC80FF,
         'LI': 0xCC80FF,
+        'Be': 0xC2FF00,
+        'BE': 0xC2FF00,
         'B': 0xFFB5B5,
         'C': 0x909090,
         'N': 0x3050F8,
         'O': 0xFF0D0D,
         'F': 0x90E050,
+        'Ne': 0xB3E3F5,
+        'NE': 0xB3E3F5,
         'Na': 0xAB5CF2,
         'NA': 0xAB5CF2,
         'Mg': 0x8AFF00,
@@ -289,31 +293,184 @@ $3Dmol.elementColors.Jmol = {
         'S': 0xFFFF30,
         'Cl': 0x1FF01F,
         'CL': 0x1FF01F,
-        'Ca': 0x3DFF00, 
+        'Ar': 0x80D1E3,
+        'AR': 0x80D1E3,
+        'K': 0x8F40D4,
+        'Ca': 0x3DFF00,
         'CA': 0x3DFF00,
+        'Sc': 0xE6E6E6,
+        'SC': 0xE6E6E6,
         'Ti': 0xBFC2C7,
         'TI': 0xBFC2C7,
+        'V': 0xA6A6AB,
         'Cr': 0x8A99C7,
         'CR': 0x8A99C7,
         'Mn': 0x9C7AC7,
         'MN': 0x9C7AC7,
         'Fe': 0xE06633,
         'FE': 0xE06633,
+        'Co': 0xF090A0,
+        'CO': 0xF090A0,
         'Ni': 0x50D050,
         'NI': 0x50D050,
         'Cu': 0xC88033,
         'CU': 0xC88033,
         'Zn': 0x7D80B0,
         'ZN': 0x7D80B0,
+        'Ga': 0xC28F8F,
+        'GA': 0xC28F8F,
+        'Ge': 0x668F8F,
+        'GE': 0x668F8F,
+        'As': 0xBD80E3,
+        'AS': 0xBD80E3,
+        'Se': 0xFFA100,
+        'SE': 0xFFA100,
         'Br': 0xA62929,
         'BR': 0xA62929,
+        'Kr': 0x5CB8D1,
+        'KR': 0x5CB8D1,
+        'Rb': 0x702EB0,
+        'RB': 0x702EB0,
+        'Sr': 0x00FF00,
+        'SR': 0x00FF00,
+        'Y': 0x94FFFF,
+        'Zr': 0x94E0E0,
+        'ZR': 0x94E0E0,
+        'Nb': 0x73C2C9,
+        'NB': 0x73C2C9,
+        'Mo': 0x54B5B5,
+        'MO': 0x54B5B5,
+        'Tc': 0x3B9E9E,
+        'TC': 0x3B9E9E,
+        'Ru': 0x248F8F,
+        'RU': 0x248F8F,
+        'Rh': 0x0A7D8C,
+        'RH': 0x0A7D8C,
+        'Pd': 0x006985,
+        'PD': 0x006985,
         'Ag': 0xC0C0C0,
         'AG': 0xC0C0C0,
+        'Cd': 0xFFD98F,
+        'CD': 0xFFD98F,
+        'In': 0xA67573,
+        'IN': 0xA67573,
+        'Sn': 0x668080,
+        'SN': 0x668080,
+        'Sb': 0x9E63B5,
+        'SB': 0x9E63B5,
+        'Te': 0xD47A00,
+        'TE': 0xD47A00,
         'I': 0x940094,
+        'Xe': 0x429EB0,
+        'XE': 0x429EB0,
+        'Cs': 0x57178F,
+        'CS': 0x57178F,
         'Ba': 0x00C900,
         'BA': 0x00C900,
+        'La': 0x70D4FF,
+        'LA': 0x70D4FF,
+        'Ce': 0xFFFFC7,
+        'CE': 0xFFFFC7,
+        'Pr': 0xD9FFC7,
+        'PR': 0xD9FFC7,
+        'Nd': 0xC7FFC7,
+        'ND': 0xC7FFC7,
+        'Pm': 0xA3FFC7,
+        'PM': 0xA3FFC7,
+        'Sm': 0x8FFFC7,
+        'SM': 0x8FFFC7,
+        'Eu': 0x61FFC7,
+        'EU': 0x61FFC7,
+        'Gd': 0x45FFC7,
+        'GD': 0x45FFC7,
+        'Tb': 0x30FFC7,
+        'TB': 0x30FFC7,
+        'Dy': 0x1FFFC7,
+        'DY': 0x1FFFC7,
+        'Ho': 0x00FF9C,
+        'HO': 0x00FF9C,
+        'Er': 0x00E675,
+        'ER': 0x00E675,
+        'Tm': 0x00D452,
+        'TM': 0x00D452,
+        'Yb': 0x00BF38,
+        'YB': 0x00BF38,
+        'Lu': 0x00AB24,
+        'LU': 0x00AB24,
+        'Hf': 0x4DC2FF,
+        'HF': 0x4DC2FF,
+        'Ta': 0x4DA6FF,
+        'TA': 0x4DA6FF,
+        'W': 0x2194D6,
+        'Re': 0x267DAB,
+        'RE': 0x267DAB,
+        'Os': 0x266696,
+        'OS': 0x266696,
+        'Ir': 0x175487,
+        'IR': 0x175487,
+        'Pt': 0xD0D0E0,
+        'PT': 0xD0D0E0,
         'Au': 0xFFD123,
-        'AU': 0xFFD123
+        'AU': 0xFFD123,
+        'Hg': 0xB8B8D0,
+        'HG': 0xB8B8D0,
+        'Tl': 0xA6544D,
+        'TL': 0xA6544D,
+        'Pb': 0x575961,
+        'PB': 0x575961,
+        'Bi': 0x9E4FB5,
+        'BI': 0x9E4FB5,
+        'Po': 0xAB5C00,
+        'PO': 0xAB5C00,
+        'At': 0x754F45,
+        'AT': 0x754F45,
+        'Rn': 0x428296,
+        'RN': 0x428296,
+        'Fr': 0x420066,
+        'FR': 0x420066,
+        'Ra': 0x007D00,
+        'RA': 0x007D00,
+        'Ac': 0x70ABFA,
+        'AC': 0x70ABFA,
+        'Th': 0x00BAFF,
+        'TH': 0x00BAFF,
+        'Pa': 0x00A1FF,
+        'PA': 0x00A1FF,
+        'U': 0x008FFF,
+        'Np': 0x0080FF,
+        'NP': 0x0080FF,
+        'Pu': 0x006BFF,
+        'PU': 0x006BFF,
+        'Am': 0x545CF2,
+        'AM': 0x545CF2,
+        'Cm': 0x785CE3,
+        'CM': 0x785CE3,
+        'Bk': 0x8A4FE3,
+        'BK': 0x8A4FE3,
+        'Cf': 0xA136D4,
+        'CF': 0xA136D4,
+        'Es': 0xB31FD4,
+        'ES': 0xB31FD4,
+        'Fm': 0xB31FBA,
+        'FM': 0xB31FBA,
+        'Md': 0xB30DA6,
+        'MD': 0xB30DA6,
+        'No': 0xBD0D87,
+        'NO': 0xBD0D87,
+        'Lr': 0xC70066,
+        'LR': 0xC70066,
+        'Rf': 0xCC0059,
+        'RF': 0xCC0059,
+        'Db': 0xD1004F,
+        'DB': 0xD1004F,
+        'Sg': 0xD90045,
+        'SG': 0xD90045,
+        'Bh': 0xE00038,
+        'BH': 0xE00038,
+        'Hs': 0xE6002E,
+        'HS': 0xE6002E,
+        'Mt': 0xEB0026,
+        'MT': 0xEB0026
 };
 
 /** @property rasmol-like element colors */