Skip to content

Commit

Permalink
Change JS exchange date format + bump version + update JS dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dvlpp committed Apr 28, 2016
1 parent f99711b commit 70d5392
Show file tree
Hide file tree
Showing 11 changed files with 1,770 additions and 1,237 deletions.
1 change: 1 addition & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports = function(grunt) {
'resources/assets/bower_components/sifter/sifter.js',
'resources/assets/bower_components/selectize/dist/js/selectize.js',
// Date
'resources/assets/bower_components/php-date-formatter/js/php-date-formatter.js',
'resources/assets/bower_components/datetimepicker/jquery.datetimepicker.js',
// Markdown
'resources/assets/bower_components/mirrormark/dist/js/mirrormark.package.js',
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.0.0",
"dependencies": {
"bootstrap": "~3.3.0",
"datetimepicker": "git://github.com/xdan/datetimepicker.git#~2.4.0",
"datetimepicker": "git://github.com/xdan/datetimepicker.git#~2.5.0",
"dragula.js": "dragula#~3.3.0",
"dropzone": "~4.0.1",
"fontawesome": "~4.3.0",
Expand Down
9 changes: 5 additions & 4 deletions resources/assets/js/sharp.date.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@
lang:'fr',
format:'d/m/Y',
dayOfWeekStart:1,
mask:true

mask: true,
startDate: new Date()
};

var params = $.extend(defauts, options);

return this.each(function() {
var $hiddenTSField = $(this).prev(".sharp-date-timestamp");

params.onChangeDateTime = function(dp,$input) {
$hiddenTSField.val(dp);
params.onChangeDateTime = function (dp, $input) {
var d = $input.datetimepicker('getValue');
$hiddenTSField.val(d.toISOString());
};

$(this).datetimepicker(params);
Expand Down
104 changes: 33 additions & 71 deletions resources/assets/sharp.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -269,10 +269,10 @@ th {
-moz-osx-font-smoothing: grayscale;
}
.glyphicon-asterisk:before {
content: "\2a";
content: "\002a";
}
.glyphicon-plus:before {
content: "\2b";
content: "\002b";
}
.glyphicon-euro:before,
.glyphicon-eur:before {
Expand Down Expand Up @@ -2569,6 +2569,11 @@ output {
.form-control::-webkit-input-placeholder {
color: #999999;
}

.form-control::-ms-expand {
border: 0;
background-color: transparent;
}
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
Expand Down Expand Up @@ -2975,7 +2980,7 @@ select[multiple].input-lg {
}
@media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label {
padding-top: 14.3px;
padding-top: 11px;
font-size: 18px;
}
}
Expand Down Expand Up @@ -3082,9 +3087,6 @@ fieldset[disabled] a.btn {
.open > .dropdown-toggle.btn-default {
background-image: none;
}
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
Expand All @@ -3093,13 +3095,7 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
fieldset[disabled] .btn-default.focus {
background-color: #ffffff;
border-color: #cccccc;
}
Expand Down Expand Up @@ -3148,9 +3144,6 @@ fieldset[disabled] .btn-default.active {
.open > .dropdown-toggle.btn-primary {
background-image: none;
}
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
Expand All @@ -3159,13 +3152,7 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
fieldset[disabled] .btn-primary.focus {
background-color: #66707a;
border-color: #5a636c;
}
Expand Down Expand Up @@ -3214,9 +3201,6 @@ fieldset[disabled] .btn-primary.active {
.open > .dropdown-toggle.btn-success {
background-image: none;
}
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
Expand All @@ -3225,13 +3209,7 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
fieldset[disabled] .btn-success.focus {
background-color: #5cb85c;
border-color: #4cae4c;
}
Expand Down Expand Up @@ -3280,9 +3258,6 @@ fieldset[disabled] .btn-success.active {
.open > .dropdown-toggle.btn-info {
background-image: none;
}
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
Expand All @@ -3291,13 +3266,7 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
fieldset[disabled] .btn-info.focus {
background-color: #12dbe8;
border-color: #10c5d0;
}
Expand Down Expand Up @@ -3346,9 +3315,6 @@ fieldset[disabled] .btn-info.active {
.open > .dropdown-toggle.btn-warning {
background-image: none;
}
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
Expand All @@ -3357,13 +3323,7 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
fieldset[disabled] .btn-warning.focus {
background-color: #f0ad4e;
border-color: #eea236;
}
Expand Down Expand Up @@ -3412,9 +3372,6 @@ fieldset[disabled] .btn-warning.active {
.open > .dropdown-toggle.btn-danger {
background-image: none;
}
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
Expand All @@ -3423,13 +3380,7 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
fieldset[disabled] .btn-danger.focus {
background-color: #d9534f;
border-color: #d43f3a;
}
Expand Down Expand Up @@ -3800,13 +3751,15 @@ tbody.collapse.in {
}
.btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-right-radius: 0px;
border-top-left-radius: 0px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.btn-group-vertical > .btn:last-child:not(:first-child) {
border-bottom-left-radius: 0px;
border-top-right-radius: 0;
border-top-left-radius: 0;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0;
Expand Down Expand Up @@ -3863,6 +3816,10 @@ tbody.collapse.in {
width: 100%;
margin-bottom: 0;
}

.input-group .form-control:focus {
z-index: 3;
}
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
Expand Down Expand Up @@ -4773,7 +4730,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
z-index: 3;
z-index: 2;
color: #434a50;
background-color: #eeeeee;
border-color: #dddddd;
Expand All @@ -4784,7 +4741,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
z-index: 2;
z-index: 3;
color: #ffffff;
background-color: #66707a;
border-color: #66707a;
Expand Down Expand Up @@ -5006,6 +4963,8 @@ a.badge:focus {
.container .jumbotron,
.container-fluid .jumbotron {
border-radius: 0px;
padding-left: 10px;
padding-right: 10px;
}
.jumbotron .container {
max-width: 100%;
Expand Down Expand Up @@ -5952,7 +5911,6 @@ button.close {
.modal-header {
padding: 15px;
border-bottom: 1px solid #e5e5e5;
min-height: 16.42857143px;
}
.modal-header .close {
margin-top: -2px;
Expand Down Expand Up @@ -6344,6 +6302,7 @@ button.close {
color: #ffffff;
text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0);
}
.carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
Expand Down Expand Up @@ -6453,16 +6412,16 @@ button.close {
.carousel-control .icon-next {
width: 30px;
height: 30px;
margin-top: -15px;
margin-top: -10px;
font-size: 30px;
}
.carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev {
margin-left: -15px;
margin-left: -10px;
}
.carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next {
margin-right: -15px;
margin-right: -10px;
}
.carousel-caption {
left: 20%;
Expand Down Expand Up @@ -6501,6 +6460,8 @@ button.close {
.pager:after,
.panel-body:before,
.panel-body:after,
.modal-header:before,
.modal-header:after,
.modal-footer:before,
.modal-footer:after {
content: " ";
Expand All @@ -6520,6 +6481,7 @@ button.close {
.navbar-collapse:after,
.pager:after,
.panel-body:after,
.modal-header:after,
.modal-footer:after {
clear: both;
}
Expand Down
Loading

0 comments on commit 70d5392

Please sign in to comment.