diff --git a/.idea/runConfigurations/Gemini_gather.xml b/.idea/runConfigurations/Gemini_gather.xml
index 530d1d09fd..da5f9721ee 100644
--- a/.idea/runConfigurations/Gemini_gather.xml
+++ b/.idea/runConfigurations/Gemini_gather.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/package-lock.json b/package-lock.json
index 6597112bd7..03cd46e1ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -202,9 +202,9 @@
"integrity": "sha512-Cc4rNAATqyeGfsfHCaFzuCP7vizQ9/qjnSW4nJIlET0vVe4h5MF86sTLFdh6LshOfdJ0SbhJFxNIYOtdPUYXew=="
},
"@jetbrains/babel-preset-jetbrains": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@jetbrains/babel-preset-jetbrains/-/babel-preset-jetbrains-1.1.0.tgz",
- "integrity": "sha512-5PFukq0nh3At8kBVn1eeSz3oFCDhoN2sq0aS9qKZFWbWZNsZgh0c4MzYzas1ad+ylY5otDUvX8doz39PLXPRpw==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@jetbrains/babel-preset-jetbrains/-/babel-preset-jetbrains-1.1.1.tgz",
+ "integrity": "sha512-u2jGDI4vBlukZO8WFEhouZohtbFo7fs5qlNif3N0/9YQejJxR7tIAyjRDuiYBQQGuwL1iBjvkCe9W4LZDaH8qQ==",
"requires": {
"babel-plugin-transform-strict-mode": "6.24.1",
"babel-preset-env": "1.6.1",
@@ -229,9 +229,9 @@
}
},
"@jetbrains/eslint-config": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@jetbrains/eslint-config/-/eslint-config-4.0.1.tgz",
- "integrity": "sha512-kjHNNIy2yPW1Ejk0V1xT9vIdsyYW4N0UwpQ2lA1+YWTvmnPE6UXYkQ13EE93uYU2SpROxIfsZiIgdVzkxiVUfA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@jetbrains/eslint-config/-/eslint-config-4.0.2.tgz",
+ "integrity": "sha512-CPlgYS9AhXSkIltnP6GKcL+fl+RKuUzv1FJp7fv4qtoSclbYweOzZ9Zi4MSwNp19ScXMs2mIq1GiQOLVw7ox8Q==",
"dev": true,
"requires": {
"eslint-import-resolver-webpack": "0.8.4",
@@ -239,27 +239,6 @@
"eslint-plugin-bdd": "2.1.1",
"eslint-plugin-import": "2.8.0",
"eslint-plugin-react": "7.5.1"
- },
- "dependencies": {
- "eslint-import-resolver-webpack": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.8.4.tgz",
- "integrity": "sha512-b6JxR57ruiMxq2tIu4T/SrYED5RKJfeBEs8u3+JWF+O2RxDmFpUH84c5uS1T5qiP0K4r0SL7CXhvd41hXdDlAg==",
- "dev": true,
- "requires": {
- "array-find": "1.0.0",
- "debug": "2.6.9",
- "enhanced-resolve": "0.9.1",
- "find-root": "0.1.2",
- "has": "1.0.1",
- "interpret": "1.1.0",
- "is-absolute": "0.2.6",
- "lodash.get": "3.7.0",
- "node-libs-browser": "1.1.1",
- "resolve": "1.5.0",
- "semver": "5.4.1"
- }
- }
}
},
"@jetbrains/generator-ring-ui": {
@@ -391,9 +370,9 @@
}
},
"@jetbrains/icons": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/@jetbrains/icons/-/icons-1.14.1.tgz",
- "integrity": "sha512-d+cosQ5KLtX/3gHbHPFOhSE8TlZfI2ADIR4J3yx1dbJUjOfT858zRGQK6sDks+SvGgNQPcSbKVgqQIFdwcglkQ=="
+ "version": "1.14.3",
+ "resolved": "https://registry.npmjs.org/@jetbrains/icons/-/icons-1.14.3.tgz",
+ "integrity": "sha512-14IF4WKeVyEeOPwwFNZbMLh/J1sMFfEM9cm5wPcKMB11v7Cz5G+JxduP2q3yBf1Id3rW+3g/2YnoJxfR/oy2IA=="
},
"@jetbrains/logos": {
"version": "0.1.7",
@@ -406,9 +385,9 @@
"integrity": "sha512-D1PuDUSXqj1PMcFjAURhh4plbZglgRMwhRZhthFR4TmZ8fcZhy6nwFYTV3OaThHjrTUFLussghXUK+jWFlFTIw=="
},
"@jetbrains/stylelint-config": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@jetbrains/stylelint-config/-/stylelint-config-1.3.2.tgz",
- "integrity": "sha512-fuMNB7I1wMzNAG6pFujRGk8iGfMMqIMkMpt0NCY+beG+O6YSqm8RiUbvyosILmLYFhkRVBZudOVebSQFsKuUsw==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/@jetbrains/stylelint-config/-/stylelint-config-1.3.3.tgz",
+ "integrity": "sha512-YprGYWM9NXKYR96gFB0xT4IpRpNXevPpcrwPdhhwmKaVP0hHw67E5iykyR/oAue5RBkCEtSwg+7qkOEPvirmGA==",
"dev": true,
"requires": {
"stylelint-config-css-modules": "1.0.0",
@@ -2372,9 +2351,9 @@
}
},
"browser-stdout": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
- "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
"dev": true
},
"browserify": {
@@ -3381,9 +3360,9 @@
}
},
"colorguard": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
- "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.1.tgz",
+ "integrity": "sha512-qYVKTg626qpDg4/eBnPXidEPXn5+krbYqHVfyyEFBWV5z3IF4p44HKY/eE2t1ohlcrlIkDgHmFJMfQ8qMLnSFw==",
"dev": true,
"requires": {
"chalk": "1.1.3",
@@ -5949,9 +5928,9 @@
}
},
"eslint-import-resolver-node": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz",
- "integrity": "sha512-yUtXS15gIcij68NmXmP9Ni77AQuCN0itXbCc/jWd8C6/yKZaSNXicpC8cgvjnxVdmfsosIXrjpzFq7GcDryb6A==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+ "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
"dev": true,
"requires": {
"debug": "2.6.9",
@@ -6019,7 +5998,7 @@
"contains-path": "0.1.0",
"debug": "2.6.9",
"doctrine": "1.5.0",
- "eslint-import-resolver-node": "0.3.1",
+ "eslint-import-resolver-node": "0.3.2",
"eslint-module-utils": "2.1.1",
"has": "1.0.1",
"lodash.cond": "4.5.2",
@@ -13935,15 +13914,15 @@
}
},
"mocha": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz",
- "integrity": "sha512-SpwyojlnE/WRBNGtvJSNfllfm5PqEDFxcWluSIgLeSBJtXG4DmoX2NNAeEA7rP5kK+79VgtVq8nG6HskaL1ykg==",
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz",
+ "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==",
"dev": true,
"requires": {
- "browser-stdout": "1.3.0",
+ "browser-stdout": "1.3.1",
"commander": "2.11.0",
"debug": "3.1.0",
- "diff": "3.3.1",
+ "diff": "3.5.0",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
"growl": "1.10.3",
@@ -13968,9 +13947,9 @@
}
},
"diff": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
- "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
"dev": true
},
"supports-color": {
@@ -15718,14 +15697,6 @@
"requires": {
"onecolor": "3.0.5",
"synesthesia": "1.0.1"
- },
- "dependencies": {
- "onecolor": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.5.tgz",
- "integrity": "sha1-Nu/zIgE3nv3xGA+0ReUajiQl+fY=",
- "dev": true
- }
}
},
"pixrem": {
@@ -17418,55 +17389,7 @@
"dev": true,
"requires": {
"lodash": "4.17.4",
- "postcss": "6.0.14"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
- "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
- "dev": true,
- "requires": {
- "color-convert": "1.9.1"
- }
- },
- "chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
- "dev": true,
- "requires": {
- "ansi-styles": "3.2.0",
- "escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
- }
- },
- "postcss": {
- "version": "6.0.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
- "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
- "dev": true,
- "requires": {
- "chalk": "2.3.0",
- "source-map": "0.6.1",
- "supports-color": "4.5.0"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
- },
- "supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
- "dev": true,
- "requires": {
- "has-flag": "2.0.0"
- }
- }
+ "postcss": "6.0.19"
}
},
"postcss-svgo": {
@@ -19964,29 +19887,14 @@
}
},
"style-loader": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.2.tgz",
- "integrity": "sha512-FrLMGaOLVhS5pvoez3eJyc0ktchT1inEZziBSjBq1hHQBK3GFkF57Qd825DcrUhjaAWQk70MKrIl5bfjadR/Dg==",
+ "version": "0.20.3",
+ "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz",
+ "integrity": "sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==",
"requires": {
"loader-utils": "1.1.0",
"schema-utils": "0.4.5"
},
"dependencies": {
- "ajv": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz",
- "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=",
- "requires": {
- "fast-deep-equal": "1.0.0",
- "fast-json-stable-stringify": "2.0.0",
- "json-schema-traverse": "0.3.1"
- }
- },
- "ajv-keywords": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
- "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74="
- },
"loader-utils": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -19996,15 +19904,6 @@
"emojis-list": "2.1.0",
"json5": "0.5.1"
}
- },
- "schema-utils": {
- "version": "0.4.5",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
- "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
- "requires": {
- "ajv": "6.1.1",
- "ajv-keywords": "3.1.0"
- }
}
}
},
@@ -20777,38 +20676,38 @@
}
},
"chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+ "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"dev": true,
"requires": {
- "ansi-styles": "3.2.0",
+ "ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
+ "supports-color": "5.3.0"
},
"dependencies": {
"ansi-styles": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
- "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
"color-convert": "1.9.1"
}
},
"has-flag": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
- "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+ "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "3.0.0"
}
}
}
@@ -20837,19 +20736,6 @@
"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
"dev": true
},
- "globby": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
- "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
- "dev": true,
- "requires": {
- "array-union": "1.0.2",
- "glob": "7.1.2",
- "object-assign": "4.1.1",
- "pify": "2.3.0",
- "pinkie-promise": "2.0.1"
- }
- },
"has-flag": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -20912,8 +20798,8 @@
"requires": {
"autoprefixer": "6.7.7",
"balanced-match": "0.4.2",
- "chalk": "2.3.0",
- "colorguard": "1.2.0",
+ "chalk": "2.3.2",
+ "colorguard": "1.2.1",
"cosmiconfig": "2.2.2",
"debug": "2.6.9",
"doiuse": "2.6.0",
diff --git a/package.json b/package.json
index 63824b291d..108b8e8f17 100644
--- a/package.json
+++ b/package.json
@@ -92,9 +92,9 @@
}
},
"devDependencies": {
- "@jetbrains/eslint-config": "4.0.1",
+ "@jetbrains/eslint-config": "4.0.2",
"@jetbrains/generator-ring-ui": "^1.0.0-beta.62",
- "@jetbrains/stylelint-config": "^1.3.1",
+ "@jetbrains/stylelint-config": "^1.3.3",
"angular": "1.6.9",
"angular-mocks": "1.6.9",
"angular-route": "1.6.9",
@@ -140,7 +140,7 @@
"karma-webpack": "2.0.13",
"lerna": "^2.9.0",
"lint-staged": "7.0.0",
- "mocha": "5.0.1",
+ "mocha": "5.0.4",
"octicons": "^7.0.1",
"react": "16.2.0",
"react-dom": "16.2.0",
@@ -165,9 +165,9 @@
"dependencies": {
"@jetbrains/angular-elastic": "2.5.1",
"@jetbrains/babel-plugin-angular-annotate": "2.0.3",
- "@jetbrains/babel-preset-jetbrains": "1.1.0",
+ "@jetbrains/babel-preset-jetbrains": "1.1.1",
"@jetbrains/babel-runtime": "6.23.1",
- "@jetbrains/icons": "1.14.1",
+ "@jetbrains/icons": "1.14.3",
"@jetbrains/logos": "0.1.7",
"@jetbrains/react-portal": "3.1.0",
"autoprefixer": "7.2.6",
@@ -206,7 +206,7 @@
"scrollbar-width": "3.1.1",
"simply-uuid": "1.0.1",
"sniffr": "1.1.4",
- "style-loader": "0.20.2",
+ "style-loader": "0.20.3",
"svg-sprite-loader": "3.7.1",
"url-loader": "1.0.1"
},
diff --git a/packages/gemini/gemini/screens/Icon/All icons/all icons/chrome.png b/packages/gemini/gemini/screens/Icon/All icons/all icons/chrome.png
index 8bb0c82a2f..09c231222d 100644
Binary files a/packages/gemini/gemini/screens/Icon/All icons/all icons/chrome.png and b/packages/gemini/gemini/screens/Icon/All icons/all icons/chrome.png differ
diff --git a/packages/gemini/gemini/screens/Icon/All icons/all icons/edge.png b/packages/gemini/gemini/screens/Icon/All icons/all icons/edge.png
index 9d9b8281a6..df030bb022 100644
Binary files a/packages/gemini/gemini/screens/Icon/All icons/all icons/edge.png and b/packages/gemini/gemini/screens/Icon/All icons/all icons/edge.png differ
diff --git a/packages/gemini/gemini/screens/Icon/All icons/all icons/firefox.png b/packages/gemini/gemini/screens/Icon/All icons/all icons/firefox.png
index 40f4896a7c..85eff6df0f 100644
Binary files a/packages/gemini/gemini/screens/Icon/All icons/all icons/firefox.png and b/packages/gemini/gemini/screens/Icon/All icons/all icons/firefox.png differ
diff --git a/packages/gemini/gemini/screens/Icon/All icons/all icons/ie.png b/packages/gemini/gemini/screens/Icon/All icons/all icons/ie.png
index 9d9b8281a6..fef728439f 100644
Binary files a/packages/gemini/gemini/screens/Icon/All icons/all icons/ie.png and b/packages/gemini/gemini/screens/Icon/All icons/all icons/ie.png differ