Skip to content

Commit aae9f16

Browse files
evoluteurevoluteur
committed
Cleanups.
1 parent 6c002dc commit aae9f16

7 files changed

Lines changed: 32 additions & 14 deletions

File tree

‎dist/css/demo.css‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
color: #c6d9f0;
4444
text-decoration: none;
4545
}
46-
.evo-header a :hover {
46+
.evo-header a:hover {
4747
color: #c6d9f0;
4848
}
4949
@media only screen and (min-width: 900px) {
@@ -390,3 +390,11 @@ a {
390390
[data-eid="test"] .evol-cards-body > div.panel {
391391
height: 182px !important;
392392
}
393+
.cBlue {
394+
color: blue;
395+
}
396+
@media only screen and (max-width: 590px) {
397+
.hideIfSmall {
398+
display: none;
399+
}
400+
}

‎dist/evolutility.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,8 +1310,8 @@ return {
13101310

13111311
}();
13121312
;
1313-
// Original code from blog post http://www.delimited.io/blog/2013/12/19/force-bubble-charts-in-d3 by Steve Hall.
1314-
// Modified for Evolutility
1313+
// Original code and blog post by Steve Hall http://www.delimited.io/blog/2013/12/19/force-bubble-charts-in-d3
1314+
// Modified for Evolutility by Olivier Giulieri http://evoluteur.github.io/evolutility/
13151315

13161316
var Evol=Evol||{};
13171317

@@ -1342,8 +1342,8 @@ Bubbles.prototype._initialize = function(){
13421342
Bubbles.prototype.fixData = function(data){
13431343
return _.map(data, function(d){
13441344
return d;
1345-
})
1346-
}
1345+
});
1346+
};
13471347

13481348
Bubbles.prototype.setData = function(data){
13491349
var that=this,
@@ -1500,7 +1500,7 @@ Bubbles.prototype.changeBubblesSize = function (sizeFieldId){
15001500
if(sizeFieldId){
15011501
var sizes = _.map(this.data, function(d){
15021502
var v=d[sizeFieldId];
1503-
return (v==null || v==isNaN)?0:v;
1503+
return (v===null || v===isNaN)?0:v;
15041504
});
15051505
this.plotScale = d3.scale.log().domain([ _.min(sizes), _.max(sizes)]).range([10, 25]);
15061506
cs.transition().duration(500)

‎dist/evolutility.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/d3-bubbles.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Original code from blog post http://www.delimited.io/blog/2013/12/19/force-bubble-charts-in-d3 by Steve Hall.
2-
// Modified for Evolutility
1+
// Original code and blog post by Steve Hall http://www.delimited.io/blog/2013/12/19/force-bubble-charts-in-d3
2+
// Modified for Evolutility by Olivier Giulieri http://evoluteur.github.io/evolutility/
33

44
var Evol=Evol||{};
55

@@ -30,8 +30,8 @@ Bubbles.prototype._initialize = function(){
3030
Bubbles.prototype.fixData = function(data){
3131
return _.map(data, function(d){
3232
return d;
33-
})
34-
}
33+
});
34+
};
3535

3636
Bubbles.prototype.setData = function(data){
3737
var that=this,
@@ -188,7 +188,7 @@ Bubbles.prototype.changeBubblesSize = function (sizeFieldId){
188188
if(sizeFieldId){
189189
var sizes = _.map(this.data, function(d){
190190
var v=d[sizeFieldId];
191-
return (v==null || v==isNaN)?0:v;
191+
return (v===null || v===isNaN)?0:v;
192192
});
193193
this.plotScale = d3.scale.log().domain([ _.min(sizes), _.max(sizes)]).range([10, 25]);
194194
cs.transition().duration(500)

‎js/ui-models/apps/comics.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ uiModels.comics = {
6868
},
6969
{
7070
id: 'finished', attribute: 'finished', type: 'boolean', width: 19, viewmany: true,
71-
label: 'Finished', labeltrue:'Finished', labelfalse:'Unfinished'
71+
label: 'Finished', labeltrue:'Finished', labelfalse:'Unfinished', css:'cBlue'
7272
},
7373
{
7474
id:'amazon', label:'Amazon', type:'formula', width:100, css:'evol-ellipsis',

‎less/demo.less‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,13 @@ a{
124124
[data-eid="test"] .evol-cards-body > div.panel {
125125
height: 182px !important;
126126
}
127+
128+
.cBlue{
129+
color:blue;
130+
}
131+
132+
.hideIfSmall{
133+
@media only screen and (max-width: 590px) {
134+
display: none;
135+
}
136+
}

‎less/header.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
color:@color-header-link;
6464
text-decoration: none;
6565

66-
:hover{
66+
&:hover{
6767
color:@color-header-link;
6868
}
6969
}

0 commit comments

Comments
 (0)