Replace Status underscore and minor style tweaks

This commit is contained in:
2016-09-21 15:47:24 +02:00
parent bdd6153020
commit 4b1a52f26e
5 changed files with 36 additions and 19 deletions

View File

@@ -19,7 +19,7 @@ function save_task(task_id, task_url) {
// Update the task list. // Update the task list.
// NOTE: this is tightly linked to the HTML of the task list in for_project.jade. // NOTE: this is tightly linked to the HTML of the task list in for_project.jade.
$(task + ' span.name').text($form.find("input[name='name']").val()); $(task + ' span.name').text($form.find("input[name='name']").val());
$(task + ' span.status').text($form.find("select[name='status']").val()); $(task + ' span.status').text($form.find("select[name='status']").val().replace('_', ' '));
$(task + ' span.status-indicator') $(task + ' span.status-indicator')
.removeAttr('class') .removeAttr('class')
.addClass('status-indicator ' + $form.find("select[name='status']").val()); .addClass('status-indicator ' + $form.find("select[name='status']").val());

View File

@@ -1,6 +1,10 @@
body body
background-color: $color-background background-color: $color-background
position: relative position: fixed
top: 0
left: 0
right: 0
bottom: 0
height: 100% height: 100%
width: 100% width: 100%
margin: 0 margin: 0
@@ -38,24 +42,22 @@ nav.sidebar
&:hover &:hover
color: $color-text-light-primary color: $color-text-light-primary
#col_main #col_sidebar
width: $sidebar-width
#col_left, #col_main, #col_right
display: flex display: flex
flex-direction: column flex-direction: column
position: relative position: relative
width: 50%
height: 100%
flex: 1 flex: 1
margin-left: $sidebar-width height: 100%
#col_main
box-shadow: 1px 0 0 $color-background-dark box-shadow: 1px 0 0 $color-background-dark
background-color: white
#col_right #col_right
display: flex
flex-direction: column
position: relative
background-color: $color-background background-color: $color-background
width: 50%
height: 100%
flex: 1
.col_header .col_header
position: relative position: relative
@@ -68,6 +70,8 @@ nav.sidebar
font: font:
size: 1.2em size: 1.2em
border-bottom: thin solid $color-background border-bottom: thin solid $color-background
&.scrolled
box-shadow: 0 -2px 20px rgba(black, .2) box-shadow: 0 -2px 20px rgba(black, .2)
.col-list-item .col-list-item

View File

@@ -4,6 +4,7 @@
#task-add #task-add
margin-left: auto margin-left: auto
font-size: .85em font-size: .85em
color: $color-primary
.status-indicator .status-indicator
background-color: white background-color: white
@@ -48,14 +49,14 @@
border-color: $color-background-dark border-color: $color-background-dark
border-right-color: $color-primary border-right-color: $color-primary
text-decoration: none text-decoration: none
background-color: rgba(white, .5) background-color: rgba($color-background, .5)
.status-indicator .status-indicator
transform: rotate(45deg) transform: rotate(45deg)
border-radius: 15% border-radius: 15%
&.processing &.processing
+stripes(rgba(white, .5), transparent, -45deg, 25px) +stripes($color-background, rgba($color-background, .5), -45deg, 25px)
+stripes-animate +stripes-animate
animation-duration: 2s animation-duration: 2s
@@ -82,3 +83,11 @@
option.invalid_task option.invalid_task
color: $color-danger color: $color-danger
background-color: hsl(hue($color-danger), 80%, 90%) background-color: hsl(hue($color-danger), 80%, 90%)
.task-list-header
border-right: thin solid $color-background
a
color: $color-text-dark
a.task-project
color: $color-text-dark-secondary
margin-left: 5px

View File

@@ -18,7 +18,7 @@ html(lang="en")
body body
#app-main #app-main
#col_left #col_sidebar
nav.sidebar(role="navigation") nav.sidebar(role="navigation")
dl dl
dd dd
@@ -31,6 +31,7 @@ html(lang="en")
a(href="") A a(href="") A
| {% block body %} | {% block body %}
#col_left
#col_main #col_main
h1 Main h1 Main
#col_right #col_right

View File

@@ -8,8 +8,10 @@ link(href="{{ url_for('static_attract', filename='assets/css/tasks.css') }}", re
| {% block body %} | {% block body %}
#col_main #col_main
.col_header .col_header.task-list-header
| Tasks - {{ project.name }} a(href="") Tasks ({{ tasks | count }})
a.task-project(href="{{url_for('projects.view', project_url=project.url)}}") {{ project.name }}
a#task-add(href="javascript:task_create();") + Create Task a#task-add(href="javascript:task_create();") + Create Task
#task-list.col-list #task-list.col-list
@@ -26,8 +28,9 @@ link(href="{{ url_for('static_attract', filename='assets/css/tasks.css') }}", re
#col_right #col_right
.col_header .col_header
| Task Details | Task Details
#status-bar Esa! #status-bar
#task-details #task-details
| Tasks
| {% endblock %} | {% endblock %}
| {% block footer_scripts %} | {% block footer_scripts %}