Skip to content

Commit

Permalink
Merge branch 'release/1.6.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
@asaquzzaman
asaquzzaman committed Jul 31, 2017
2 parents be91910 + aef6c26 commit 0c9d727
Show file tree
Hide file tree
Showing 80 changed files with 1,571 additions and 1,173 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ export.sh
nbproject
node_modules
includes/pro
includes/debug.log
build
secret.json
.netbeans.xml
npm-debug.log


1 change: 1 addition & 0 deletions .svnignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
includes/pro
includes/debug.log
node_modules
nbproject
Gruntfile.js
Expand Down
150 changes: 150 additions & 0 deletions assets/css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3885,19 +3885,120 @@ ul.cpm-files li .cpm-file-action .comment-number {
height: 99vh;
padding-bottom: 15px;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-todo-edit {
display: none;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title:hover .cpm-todo-edit {
display: inline-block;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title {
margin-top: 0px;
margin-bottom: 15px;
display: inline-block;
padding-right: 20px;
width: 100%;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .dashicons-lock,
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .dashicons-unlock {
color: #0073aa;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-text,
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-meta {
float: left;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-text:hover .cpm-task-title-span {
background: #eee;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-span {
padding: 0 5px;
display: inline-block;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-text {
max-width: 88%;
margin-right: 12px;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-text .cpm-task-title-field {
display: inline-block;
width: 100%;
padding: 7px 8px 7px 8px;
background: #eee;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-meta {
width: 8%;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-mark-done-checkbox {
width: 4%;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-wrap {
width: 90%;
text-align: justify;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-task-title-wrap,
.cpm .half-modal .cpm-modal-conetnt .cpm-task-title .cpm-mark-done-checkbox {
float: left;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta {
margin-top: 0px;
margin-left: 5%;
display: inline-block;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-task-date-wrap {
cursor: pointer;
position: relative;
margin-right: 10px;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-task-date-wrap .cpm-date-edit-btn {
display: none;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-task-date-wrap:hover .cpm-date-edit-btn {
display: inline-block;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-date-update-wrap {
position: absolute;
z-index: 99999;
width: 600px;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-date-picker-from,
.cpm .half-modal .cpm-modal-conetnt .cpm-task-meta .cpm-date-picker-to {
margin-right: -1px;
float: left;
}
.cpm .half-modal .cpm-modal-conetnt .cpm-assigned-user img {
width: 24px;
height: 24px;
}
.cpm .half-modal .cpm-modal-conetnt .task-details:hover .cpm-desc-content {
background: #eee;
}
.cpm .half-modal .cpm-modal-conetnt .task-details {
margin-bottom: 15px;
margin-top: 15px;
margin-left: 5%;
width: 62%;
text-align: justify;
}
.cpm .half-modal .cpm-modal-conetnt .task-details .cpm-help-text {
font-size: 10px;
background: #f5f5f5;
width: 30%;
padding: 0 7px;
}
.cpm .half-modal .cpm-modal-conetnt .task-details .cpm-desc-field {
height: 100px;
width: 100%;
}
.cpm .half-modal .cpm-modal-conetnt .task-details .cpm-desc-content {
margin: 0;
padding: 6px;
min-height: 100px;
}
.cpm .half-modal .cpm-modal-conetnt .task-details .cpm-task-des-edit-btn {
display: none;
}
.cpm .half-modal .cpm-modal-conetnt .task-details:hover .cpm-task-des-edit-btn {
display: inline-block;
color: #0073aa;
}
.cpm .modal-enter,
.cpm .modal-leave {
opacity: 0;
Expand Down Expand Up @@ -4298,6 +4399,20 @@ ul.cpm-files li .cpm-file-action .comment-number {
padding: 1px ;
}
}
.cpm-task-modal .cpm-multiselect-single-task .multiselect__input {
width: 100%;
}
.cpm-task-modal .cpm-multiselect-single-task .multiselect__select {
display: none;
}
.cpm-task-modal .cpm-multiselect-single-task .multiselect__tags {
padding: 8px 12px 0 8px;
}
.cpm-task-modal .cpm-multiselect-single-task .multiselect__tags .multiselect__tag {
display: none;
margin: 0;
padding: 0;
}
.cpm-task-modal .cpm-assigned-user,
.cpm-task-modal time {
background: none;
Expand Down Expand Up @@ -4655,3 +4770,38 @@ ul.cpm-files li .cpm-file-action .comment-number {
top: -12px;
z-index: 99999;
}
.cpm-multiselect .multiselect__content .multiselect__option--highlight:hover {
background: none;
color: #575d64;
}
.cpm-multiselect .multiselect__content .multiselect__option--highlight {
background: none;
color: #575d64;
}
.cpm-multiselect .multiselect__content .multiselect__option--selected:hover {
background: #f3f3f3;
color: #35495e;
}
.cpm-multiselect .multiselect__content .multiselect__option--selected {
background: #f3f3f3;
color: #35495e;
}
.cpm-multiselect .multiselect__content .multiselect__option--selected:after {
content: "\2713 ";
}
.cpm-multiselect .multiselect__content .multiselect__option--highlight:after {
background: none;
color: #35495e;
}
.cpm-multiselect .multiselect__content img.option__image {
display: inline-block;
margin-right: 5px;
vertical-align: top;
}
.cpm-multiselect .multiselect__content .option__desc {
display: inline-block;
width: 73%;
white-space: normal;
margin: 0 0 0 2px;
padding: 0;
}
Loading

0 comments on commit 0c9d727

Please sign in to comment.