diff --git a/src/styles/_dashboard.sass b/src/styles/_dashboard.sass index 4673156..7488dd6 100644 --- a/src/styles/_dashboard.sass +++ b/src/styles/_dashboard.sass @@ -89,13 +89,18 @@ .dashboard .d-stats padding: 0 20px + + .d-stats-card + +container-box + padding: 10px + + .progress + margin-bottom: 0 + h4 + margin-top: 0 + font-weight: normal + .d-activity - padding: 5px 15px margin: 0 20px 15px - +container-box - - h3 - margin-top: 10px - a color: $color-text-dark-primary diff --git a/src/templates/attract/index.jade b/src/templates/attract/index.jade index fa151b1..c5cc5d9 100644 --- a/src/templates/attract/index.jade +++ b/src/templates/attract/index.jade @@ -14,21 +14,29 @@ #col_right .dashboard .d-stats - h3 Shot Statistics + h3 Attract Projects | {% for proj, summary in projs_with_summaries %} - h4 - a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") {{ proj.name }} - .progress - | {% for status, percentage in summary.percentages() %} - .progress-bar.bg-status( - class="status-{{status}}", - title="{{ status | undertitle }}", - role="progressbar", - style="width:{{percentage}}%") - | {{ status | undertitle }} + .d-stats-card + h4 + a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") {{ proj.name }} + + span.pull-right + a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") Shots  + | | + a(href="{{ url_for('attract.tasks.perproject.index', project_url=proj.url) }}") Tasks + .progress + | {% for status, percentage in summary.percentages() %} + .progress-bar.bg-status( + class="status-{{status}}", + title="{{ status | undertitle }} ({{percentage}}%)", + role="progressbar", + style="width:{{percentage}}%") + | {{ status | undertitle }} + | {% endfor %} | {% endfor %} - | {% endfor %} + + hr .d-activity h3 Activity Stream