github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/design' into feature/5.0

Browse source
This commit is contained in:
Khalah Jones-Golden 2016-02-04 13:06:43 -04:00
commit f7c98cc2d4
4 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ui/public/config/defaults.js
View file

@ -109,7 +109,7 @@ define(function (require) {
'visualization:colorMapping': {
type: 'json',
value: JSON.stringify({
'Count': '#57c17b'
'Count': '#6eadc1'
}),
description: 'Maps values to specified colors within visualizations'
},

28
src/ui/public/styles/variables/colors.less
View file

@ -34,3 +34,31 @@
@brand-info: #1F6B7A;
@brand-warning: #F39C12;
@brand-danger: #E74C3C;
@kibanaGray1: #2D2D2D;
@kibanaGray2: #5A5A5A;
@kibanaGray3: #9C9C9C;
@kibanaGray4: #BEBEBE;
@kibanaGray5: #E4E4E4;
@kibanaGray6: #F6F6F6;
@kibanaGray7: #FFFFFF;
@kibanaBlue1: #105A73;
@kibanaBlue2: #328CAA;
@kibanaBlue3: #6EADC1;
@kibanaBlue4: #9DD0E0;
@kibanaGreen1: #80C383;
@kibanaGreen2: #AEE8B0;
@kibanaYellow1: #FBCE47;
@kibanaYellow2: #F5DD94;
@kibanaRed1: #D76051;
@kibanaRed2: #FF9183;
@kibanaPurple1: #9980B2;
@kibanaPurple2: #CDB5E4;
@kibanaPink1: #E8488B;
@kibanaPink2: #FF95C1;

2
src/ui/public/vislib/components/color/seed_colors.js
View file

@ -8,8 +8,8 @@ define(function () {
return function SeedColorUtilService() {
return [
'#6eadc1',
'#57c17b',
'#006e8a',
'#6f87d8',
'#663db8',
'#bc52bc',

4
test/support/pages/visualize_page.js
View file

@ -502,7 +502,7 @@ define(function (require) {
// 5). for each chart element, find the green circle, then the cy position
function getChartType(chart) {
return chart
.findByCssSelector('circle[fill="#57c17b"]')
.findByCssSelector('circle[fill="#6eadc1"]')
.then(function (circleObject) {
// common.debug('circleObject = ' + circleObject + ' yAxisHeight= ' + yAxisHeight + ' yAxisLabel= ' + yAxisLabel);
return circleObject
@ -573,7 +573,7 @@ define(function (require) {
.getAttribute('fill')
.then(function (fillColor) {
// we're only getting the Green Bars
if (fillColor === '#57c17b') {
if (fillColor === '#6eadc1') {
return chart
.getAttribute('height')
.then(function (barHeight) {