zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12897 from CartoDB/983-design

Browse Source 
Changing default styles for point, line and polygon geometries
pull/12898/head
Javier Álvarez Medina 7 years ago committed by GitHub
parent d7a9dc75f1 fe54fd1f59
commit 7c34d8954e
11 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File

1
NEWS.md
Unescape View File

@ -2,6 +2,7 @@ Development
-----------
### Features
* Change default style for polygon, point and line geometries (design#983)
* Unify scrollbars style (#12184)
* Add endpoint for current user account deletion (#12841)
* Add contextual help to Analysis UI (#11907)

10
lib/assets/core/javascripts/cartodb3/data/default-cartography.json
Unescape View File

@ -7,7 +7,7 @@
"fixed": 7
},
"color": {
"fixed": "#FFB927",
"fixed": "#EE4D5A",
"opacity": 0.9
}
},
@ -16,7 +16,7 @@
"fixed": 1
},
"color": {
"fixed": "#FFF",
"fixed": "#FFFFFF",
"opacity": 1
}
}
@ -29,7 +29,7 @@
"fixed": 1.5
},
"color": {
"fixed": "#3EBCAE",
"fixed": "#4CC8A3",
"opacity": 1
}
}
@ -38,7 +38,7 @@
"polygon": {
"fill": {
"color": {
"fixed": "#374C70",
"fixed": "#826DBA",
"opacity": 0.9
}
},
@ -47,7 +47,7 @@
"fixed": 1
},
"color": {
"fixed": "#FFF",
"fixed": "#FFFFFF",
"opacity": 0.5
}
}

4
lib/assets/core/javascripts/cartodb3/data/default-form-styles.json
Unescape View File

@ -4,7 +4,7 @@
"fixed": 7
},
"color": {
"fixed": "#FFB927",
"fixed": "#EE4D5A",
"opacity": 0.9
}
},
@ -13,7 +13,7 @@
"fixed": 1
},
"color": {
"fixed": "#FFF",
"fixed": "#FFFFFF",
"opacity": 1
}
},

4
lib/assets/core/test/spec/cartodb3/data/user-actions.spec.js
Unescape View File

@ -900,7 +900,7 @@ describe('cartodb3/data/user-actions', function () {
var layer = this.userActions.createLayerFromTable(tableModel);
expect(layer.styleModel.get('type')).toBe('simple');
var stroke = layer.styleModel.get('stroke');
expect(stroke.color.fixed).toBe('#3EBCAE');
expect(stroke.color.fixed).toBe('#4CC8A3');
tableModel.set({
name: 'tableName',
@ -909,7 +909,7 @@ describe('cartodb3/data/user-actions', function () {
var layer2 = this.userActions.createLayerFromTable(tableModel);
expect(layer2.styleModel.get('type')).toBe('simple');
var fill = layer2.styleModel.get('fill');
expect(fill.color.fixed).toBe('#374C70');
expect(fill.color.fixed).toBe('#826DBA');
});
it('should invoke the error callback if layer creation fails', function () {

10
spec/lib/carto/form_spec.rb
Unescape View File

@ -11,7 +11,7 @@ module Carto
"fixed" => 7
},
"color" => {
"fixed" => "#FFB927",
"fixed" => "#EE4D5A",
"opacity" => 0.9
}
},
@ -20,7 +20,7 @@ module Carto
"fixed" => 1
},
"color" => {
"fixed" => "#FFF",
"fixed" => "#FFFFFF",
"opacity" => 1
}
},
@ -59,7 +59,7 @@ module Carto
{
"fill" => {
"color" => {
"fixed" => "#374C70",
"fixed" => "#826DBA",
"opacity" => 0.9
}
},
@ -68,7 +68,7 @@ module Carto
"fixed" => 1
},
"color" => {
"fixed" => "#FFF",
"fixed" => "#FFFFFF",
"opacity" => 0.5
}
},
@ -111,7 +111,7 @@ module Carto
"fixed" => 1.5
},
"color" => {
"fixed" => "#3EBCAE",
"fixed" => "#4CC8A3",
"opacity" => 1
}
},

4
spec/lib/carto/forms_definition_spec.rb
Unescape View File

@ -11,7 +11,7 @@ module Carto
"fixed" => 7
},
"color" => {
"fixed" => "#FFB927",
"fixed" => "#EE4D5A",
"opacity" => 0.9
}
},
@ -20,7 +20,7 @@ module Carto
"fixed" => 1
},
"color" => {
"fixed" => "#FFF",
"fixed" => "#FFFFFF",
"opacity" => 1
}
},

10
spec/lib/carto/styles/cartography_spec.rb
Unescape View File

@ -13,7 +13,7 @@ module Carto
"fixed" => 7
},
"color" => {
"fixed" => "#FFB927",
"fixed" => "#EE4D5A",
"opacity" => 0.9
}
},
@ -22,7 +22,7 @@ module Carto
"fixed" => 1
},
"color" => {
"fixed" => "#FFF",
"fixed" => "#FFFFFF",
"opacity" => 1
}
}
@ -35,7 +35,7 @@ module Carto
"fixed" => 1.5
},
"color" => {
"fixed" => "#3EBCAE",
"fixed" => "#4CC8A3",
"opacity" => 1
}
}
@ -44,7 +44,7 @@ module Carto
"polygon" => {
"fill" => {
"color" => {
"fixed" => "#374C70",
"fixed" => "#826DBA",
"opacity" => 0.9
}
},
@ -53,7 +53,7 @@ module Carto
"fixed" => 1
},
"color" => {
"fixed" => "#FFF",
"fixed" => "#FFFFFF",
"opacity" => 0.5
}
}

10
spec/lib/carto/styles/geometry_spec.rb
Unescape View File

@ -9,9 +9,9 @@ module Carto
let(:prod_default_geometry_cartocss) do
"#layer['mapnik::geometry_type'=1] {\n"\
" marker-width: 7;\n"\
" marker-fill: #FFB927;\n"\
" marker-fill: #EE4D5A;\n"\
" marker-fill-opacity: 0.9;\n"\
" marker-line-color: #FFF;\n"\
" marker-line-color: #FFFFFF;\n"\
" marker-line-width: 1;\n"\
" marker-line-opacity: 1;\n"\
" marker-placement: point;\n"\
@ -19,15 +19,15 @@ module Carto
" marker-allow-overlap: true;\n"\
"}\n"\
"#layer['mapnik::geometry_type'=2] {\n"\
" line-color: #3EBCAE;\n"\
" line-color: #4CC8A3;\n"\
" line-width: 1.5;\n"\
" line-opacity: 1;\n"\
"}\n"\
"#layer['mapnik::geometry_type'=3] {\n"\
" polygon-fill: #374C70;\n"\
" polygon-fill: #826DBA;\n"\
" polygon-opacity: 0.9;\n"\
" ::outline {\n"\
" line-color: #FFF;\n"\
" line-color: #FFFFFF;\n"\
" line-width: 1;\n"\
" line-opacity: 0.5;\n"\
" }\n"\

2
spec/lib/carto/styles/line_spec.rb
Unescape View File

@ -8,7 +8,7 @@ module Carto
describe '#default' do
let(:production_default_line_cartocss) do
"#layer {\n"\
" line-color: #3EBCAE;\n"\
" line-color: #4CC8A3;\n"\
" line-width: 1.5;\n"\
" line-opacity: 1;\n"\
"}"

4
spec/lib/carto/styles/point_spec.rb
Unescape View File

@ -9,9 +9,9 @@ module Carto
let(:production_default_point_cartocss) do
"#layer {\n"\
" marker-width: 7;\n"\
" marker-fill: #FFB927;\n"\
" marker-fill: #EE4D5A;\n"\
" marker-fill-opacity: 0.9;\n"\
" marker-line-color: #FFF;\n"\
" marker-line-color: #FFFFFF;\n"\
" marker-line-width: 1;\n"\
" marker-line-opacity: 1;\n"\
" marker-placement: point;\n"\

4
spec/lib/carto/styles/polygon_spec.rb
Unescape View File

@ -8,10 +8,10 @@ module Carto
describe '#default' do
let(:production_default_polygon_cartocss) do
"#layer {\n"\
" polygon-fill: #374C70;\n"\
" polygon-fill: #826DBA;\n"\
" polygon-opacity: 0.9;\n"\
" ::outline {\n"\
" line-color: #FFF;\n"\
" line-color: #FFFFFF;\n"\
" line-width: 1;\n"\
" line-opacity: 0.5;\n"\
" }\n"\

Write Preview
Loading…
Cancel
Save