Skip to content

Commit

Permalink
Version 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
evoluteur committed Jul 1, 2015
1 parent 93be9e6 commit a490827
Show file tree
Hide file tree
Showing 9 changed files with 280 additions and 258 deletions.
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = function (grunt) {
'/* https://github.com/evoluteur/evolutility */\n',

bannerDependencies: '/*\n <%= pkg.name %> v<%= pkg.version %> dependencies: \n' +
' bootstrap 3.3.4, jquery 2.1.4, backbone 1.1.2, backbone.localStorage v1.1.7, underscore 1.8.3, d3 3.5.5, bootstrap-datepicker" 1.4.0, select2 3.5.2. */\n',
' bootstrap 3.3.4, jquery 2.1.4, backbone 1.1.2, backbone.localStorage v1.1.7, underscore 1.8.3, d3 3.5.5, bootstrap-datepicker" 1.4.0, select2 3.5.2. \n*/\n',

// *************************************************************************************
// CONCAT
Expand Down Expand Up @@ -205,6 +205,7 @@ module.exports = function (grunt) {
},
prod: {
options: {
banner: '<%= bannerDependencies %>',
compress: true
},
files: {
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-data.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 23 additions & 9 deletions dist/css/evolutility.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
margin-bottom: 10px;
padding: 3px;
background-color: #fbfbfb;
/*
[data-id="prev"].nav-disabled,
[data-id="next"].nav-disabled{
a {
color: @color-disabled;
&:hover{
background-color: transparent;
cursor:default;
}
}
}
*/
}
.evo-toolbar > [data-cid="views"] {
color: black;
Expand All @@ -24,15 +36,6 @@
width: 1px;
background-color: #bce8f1;
}
.evo-toolbar [data-id="prev"].nav-disabled a,
.evo-toolbar [data-id="next"].nav-disabled a {
color: silver;
}
.evo-toolbar [data-id="prev"].nav-disabled a:hover,
.evo-toolbar [data-id="next"].nav-disabled a:hover {
background-color: transparent;
cursor: default;
}
.evo-toolbar .evo-dropdown-icons {
min-width: 50px;
}
Expand Down Expand Up @@ -124,6 +127,12 @@
width: 100%;
margin: 0 0 10px;
}
.evo-p-json {
margin-bottom: 10px;
}
.evo-p-json fieldset {
padding: 10px !important;
}
.glyphicon-wrench {
margin-left: 5px;
display: inline !important;
Expand All @@ -142,6 +151,8 @@ label {
background-color: #FFF8E1;
border: 1px solid #FFECB3;
border-radius: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
}
.evol-mini-holder .help-block,
.evolw-edit .help-block {
Expand Down Expand Up @@ -431,6 +442,9 @@ text.label {
.evo-chart-config:hover {
color: #428bca;
}
.evol-xpt {
margin-bottom: 10px;
}
.evol-xpt-form {
border-collapse: collapse;
border: 0;
Expand Down
Loading

0 comments on commit a490827

Please sign in to comment.