From 5e6762ff1a85d8080846c20314ae5cadf5cec6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 4 Oct 2016 15:15:12 +0200 Subject: [PATCH] Renamed attract-form to attract-box, and added with-status class. The with-status class enables the status-coloured thick border at the top. The rename from 'form' to 'box' was made to allow non-form contents too. --- src/styles/_shots.sass | 5 +---- src/styles/_tasks.sass | 7 ++++--- src/templates/attract/shots/view_shot_embed.jade | 2 +- src/templates/attract/tasks/view_task_embed.jade | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index cf181b7..f726af9 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -113,10 +113,7 @@ opacity: .8 transform: translate(-50%, -50%) scale(1.3) -.attract-form span.shot_id - float: right - -.attract-form +.attract-box .item-id padding: 8px margin-left: 10px diff --git a/src/styles/_tasks.sass b/src/styles/_tasks.sass index 75abe7f..890289a 100644 --- a/src/styles/_tasks.sass +++ b/src/styles/_tasks.sass @@ -1,10 +1,11 @@ -.attract-form +.attract-box margin: 10px padding: 0 10px 10px +container-box - border-top: thick solid $color-background-dark - @include status-color-property(border-top-color, '', 'dark') + &.with-status + border-top: thick solid $color-background-dark + @include status-color-property(border-top-color, '', 'dark') .item-name font-size: 1.6em diff --git a/src/templates/attract/shots/view_shot_embed.jade b/src/templates/attract/shots/view_shot_embed.jade index 1b0a4ad..2dedf25 100644 --- a/src/templates/attract/shots/view_shot_embed.jade +++ b/src/templates/attract/shots/view_shot_embed.jade @@ -1,4 +1,4 @@ -.attract-form.shot(class="status-{{ shot.properties.status }}") +.attract-box.shot.with-status(class="status-{{ shot.properties.status }}") form#shot_form(onsubmit="return shot_save('{{shot._id}}', '{{ url_for('attract.shots.perproject.save', project_url=project['url'], shot_id=shot._id) }}')") input(type='hidden',name='_etag',value='{{ shot._etag }}') .input-transparent-group diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade index 9454e9b..f53da2c 100644 --- a/src/templates/attract/tasks/view_task_embed.jade +++ b/src/templates/attract/tasks/view_task_embed.jade @@ -1,4 +1,4 @@ -.attract-form.task( +.attract-box.task.with-status( class="status-{{ task.properties.status }}") form#task_form(onsubmit="return task_save('{{task._id}}', '{{ url_for('attract.tasks.perproject.save', project_url=project['url'], task_id=task._id) }}')") input(type='hidden',name='_etag',value='{{ task._etag }}')