Minor Updates
diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css
index e080880..d3f2e17 100644
--- a/erpnext/templates/includes/projects.css
+++ b/erpnext/templates/includes/projects.css
@@ -31,19 +31,19 @@
.timeline-centered {
position: relative;
- margin-bottom: 30px;
+ margin-bottom: 10px;
}
.timeline-centered:before {
content: '';
position: absolute;
display: block;
- width: 4px;
+ width: 3px;
background: #f5f5f6;
/*left: 50%;*/
- top: 20px;
- bottom: 20px;
- margin-left: 30px;
+ top: 0px;
+ bottom: 0px;
+ margin-left: 10px;
}
.timeline-centered .timeline-entry {
@@ -51,37 +51,25 @@
/*width: 50%;
float: right;*/
margin-top: 5px;
- margin-left: 30px;
- margin-bottom: 10px;
+ margin-left: 10px;
+ margin-bottom: 5px;
clear: both;
}
-
-.timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after {
- left: auto;
- right: 0;
- margin-left: 0;
- margin-right: -9px;
- -moz-transform: rotate(180deg);
- -o-transform: rotate(180deg);
- -webkit-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- transform: rotate(180deg);
-}
-
.timeline-centered .timeline-entry .timeline-entry-inner {
position: relative;
- margin-left: -20px;
+ margin-left: -3px;
}
.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon {
+ margin-top:10px;
background: #fff;
color: #737881;
display: block;
- width: 40px;
- height: 40px;
+ width: 10px;
+ height: 10px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
@@ -89,17 +77,41 @@
-moz-border-radius: 20px;
border-radius: 20px;
text-align: center;
- -moz-box-shadow: 0 0 0 5px #f5f5f6;
- -webkit-box-shadow: 0 0 0 5px #f5f5f6;
- box-shadow: 0 0 0 5px #f5f5f6;
- line-height: 40px;
- font-size: 15px;
+ -moz-box-shadow: 0 0 0 2px #f5f5f6;
+ -webkit-box-shadow: 0 0 0 2px #f5f5f6;
+ box-shadow: 0 0 0 2px #f5f5f6;
+ line-height: 30px;
float: left;
}
+.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary {
+ background-color: #303641;
+ color: #fff;
+}
+
+.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-secondary {
+ background-color: #ee4749;
+ color: #fff;
+}
+
+.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-success {
+ background-color: #98d85b;
+ color: #fff;
+}
+
+.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-info {
+ background-color: #21a9e1;
+ color: #fff;
+}
+
.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-warning {
- background-color: #fad839;
+ background-color: #ffa00a;
+ color: #fff;
+}
+
+.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-danger {
+ background-color: #ff5858;
color: #fff;
}
@@ -108,7 +120,7 @@
position: relative;
background: #f5f5f6;
padding: 1em;
- margin-left: 60px;
+ margin-left: 40px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
diff --git a/erpnext/templates/includes/projects/project_issues.html b/erpnext/templates/includes/projects/project_issues.html
index 14ce70f..34f6633 100644
--- a/erpnext/templates/includes/projects/project_issues.html
+++ b/erpnext/templates/includes/projects/project_issues.html
@@ -3,7 +3,7 @@
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/issues-view?name={{ issue.name}}">
- <span class="indicator {{ "green" if issue.status=="Open" else "darkgrey" }}">
+ <span class="indicator {{ "red" if issue.status=="Open" else "green" }}">
{% if issue.status == "Closed" %}
{{ issue.subject }} resolved {{ frappe.utils.pretty_date(issue.resolution_date) }}
{% else %}
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
index 84de0e8..b2be27b 100644
--- a/erpnext/templates/includes/projects/project_tasks.html
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -3,7 +3,7 @@
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/tasks-view?name={{ task.name}}">
- <span class="indicator {{ "green" if task.status=="Open" else "darkgrey" }}">
+ <span class="indicator {{ "orange" if task.status=="Open" else "green" }}">
{% if task.status == "Closed" %}
{{ task.subject }} completed on {{ task.closing_date }}
{% else %}
diff --git a/erpnext/templates/includes/projects/timeline.html b/erpnext/templates/includes/projects/timeline.html
index 77b0c76..605404b 100644
--- a/erpnext/templates/includes/projects/timeline.html
+++ b/erpnext/templates/includes/projects/timeline.html
@@ -1,44 +1,17 @@
{% for timeline in doc.timelines %}
-<div class='timeline'>
- <div class="row project-item">
- <div class="col-xs-12">
- <span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
- <span class='indicator'>
- {{timeline.reference_name}} {{timeline.subject }}
- </span>
- <span class='indicator pull-right'>
- {{ frappe.utils.pretty_date(timeline.creation) }}
- </span>
+ <article class="timeline-entry">
+ <div class="timeline-entry-inner">
+ <div class="timeline-icon {{ "bg-danger" if ((timeline.reference_name).startswith('ISS') and (timeline.subject).startswith('Open')) else "bg-warning" if ((timeline.reference_name).startswith('TASK') and (timeline.subject).startswith('Open')) else "bg-success" if (timeline.subject).startswith('Closed') else "bg-info"}}">
+ </div>
+ <div class="timeline-label">
+ <span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
+ <span class='indicator'>
+ {{timeline.reference_name}} {{timeline.subject }}
+ </span>
+ <span class='indicator pull-right'>
+ {{ frappe.utils.pretty_date(timeline.creation) }}
+ </span>
+ </div>
</div>
- </div>
-</div>
-{% endfor %}
-<!-- <div class="timeline-centered">
-{% for timeline in doc.timelines %}
-
-
-
- <article class="timeline-entry">
-
- <div class="timeline-entry-inner">
-
- <div class="timeline-icon bg-warning">
- <i class="entypo-camera"></i>
- </div>
-
- <div class="timeline-label">
- <span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
- <span class='indicator'>
- {{timeline.reference_name}} {{timeline.subject }}
- </span>
- <span class='indicator pull-right'>
- {{ frappe.utils.pretty_date(timeline.creation) }}
- </span>
- </div>
- </div>
-
- </article>
-
-
-{% endfor %}
-</div> -->
\ No newline at end of file
+ </article>
+{% endfor %}
\ No newline at end of file