Permalink
Browse files

デザイン更新

  • Loading branch information...
1 parent b22db12 commit 29efba87a1bb3ea43bb7a55fb5a10e3e72263c52 teppei machida committed May 19, 2012
@@ -4,5 +4,5 @@
$ ->
$('.add a').click ->
- $('#new_task').toggle()
+ $('.add').toggleClass("close")
false
@@ -0,0 +1,3 @@
+=word-break
+ word-break: break-all
+ word-wrap: break-word
@@ -1,11 +1,11 @@
@import compass/reset
@import compass/utilities
@import compass/css3
+@import mixins
body.parties
#body
form
- padding: 10px 16px
.field
clear: both
+clearfix
@@ -191,10 +191,23 @@ body.parties_show
padding: 10px
background: rgba(0, 0, 0, .6)
+clearfix
- p
- font-size: 12px
- line-height: 1.6
- color: #fff
+ ul
+ li.task
+ p
+ font-size: 12px
+ line-height: 1.6
+ color: #fff
+ +word-break
+ ul
+ li.empty
+ line-height: 1.6
+ font-size: 13px
+ text-align: center
+ display: block
+ background: rgba(100, 100, 100, .3)
+ padding: 8px
+ +border-radius(4px)
+ font-size: 12px
.actions
padding: 8px 0 0 0
display: block
@@ -211,10 +224,6 @@ body.parties_show
color: #fff
+border-radius(4px)
font-weight: bold
- background-color: rgb(103,221,238)
- @include filter-gradient(#67ddee, #13adc3, vertical)
- $experimental-support-for-svg: true
- @include background-image(linear-gradient(top, rgba(103,221,238,1) 0%,rgba(19,173,195,1) 100%))
ul
float: right
display: block
@@ -231,10 +240,16 @@ body.parties_show
color: #fff
font-weight: bold
text-decoration: none
- background-color: rgb(103,221,238)
- @include filter-gradient(#67ddee, #13adc3, vertical)
- $experimental-support-for-svg: true
- @include background-image(linear-gradient(top, rgba(103,221,238,1) 0%,rgba(19,173,195,1) 100%))
+ background: rgba(255, 255, 255, .1)
+ border: #000 1px solid
+ .hold
+ a
+ +border-radius(4px 0 0 4px)
+ border-right: rgba(0, 0, 0, .4) 1px solid
+ .finish
+ a
+ +border-radius(0 4px 4px 0)
+ border-left: rgba(100, 100, 100, .2) 1px solid
.activities
clear: both
@@ -267,7 +282,7 @@ body.parties_show
height: auto
+border-radius(18px)
p
- font-size: 11px
+ font-size: 12px
line-height: 1.6
.backlog
@@ -286,15 +301,39 @@ body.parties_show
font-weight: bold
color: #fff
.add
- padding: 10px 10px 0 10px
+ padding: 10px 10px 10px 10px
+ +clearfix
+ a
+ display: block
+ background: #abd3e8
+ float: left
+ font-size: 12px
+ line-height: 20px
+ padding: 0 10px
+ text-decoration: none
+ +border-radius(4px)
+ color: #162d41
+ font-weight: bold
+ form.new_task
+ clear: both
+ textarea
+ width: 100%
+ padding: 0
+ +border-radius(4px)
+ font-size: 14px
+ margin: 10px 0 0 0
+ .close
+ display: none
ul
- li
+ clear: both
+ li.task
+clearfix
border-bottom: dotted #666 1px
display: block
padding: 14px 10px
+ +word-break
&:first-child
- padding: 14px 10px
+ padding: 0 10px 14px 10px
&:last-child
border: none
.icon
@@ -313,7 +352,7 @@ body.parties_show
height: auto
+border-radius(18px)
p
- font-size: 11px
+ font-size: 12px
line-height: 1.6
.done
clear: both
@@ -333,7 +372,7 @@ body.parties_show
.add
padding: 10px 0
ul
- li
+ li.task
+clearfix
border-bottom: dotted #666 1px
display: block
@@ -355,5 +394,6 @@ body.parties_show
+box-shadow(#495051 0 1px 0)
+border-radius(25px)
p
- font-size: 11px
- line-height: 1.6
+ font-size: 12px
+ line-height: 1.6
+ +word-break
@@ -83,18 +83,20 @@ div#main
position: absolute
+clearfix
nav#global
- background: #000
+ background: #222
position: absolute
left: 0
top: 0
width: 40px
- padding: 0 5px
+ padding: 10px 5px
+ +box-shadow(#000 0 0 4px inset)
a
display: block
width: 40px
height: 40px
- background: #fff
+ background: rgba(200, 200, 200, .1)
+border-radius(20px)
+ margin: 0 0 10px 0
#notice
position: absolute
top: 30px
@@ -1,7 +0,0 @@
-// Place all the styles related to the Tasks controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
-
-#new_task {
- display: none;
-}
@@ -52,7 +52,11 @@
.doing
%ul
- task = member.tasks.current(@party.id).first
- = render task if task
+ - if task
+ = render task
+ - else
+ %li.empty
+ 未選択
/
.activities
.add
@@ -69,11 +73,13 @@
.label
%h2 Backlog
- if user_signed_in? && current_user == member
- .add
- %a{:href => ""} new task
+ .add.close
+ %a{:href => ""} close
= form_for [@party, member.tasks.build], :remote => true do |f|
= f.text_area :content, :rows => 3, :cols => 30
= f.submit
+ .add
+ %a{:href => ""} new task
%ul
= render member.tasks.backlog(@party.id)
@@ -1,22 +1,24 @@
-= content_tag_for :li, task do
+= content_tag_for :li, task, :class => "task" do
%p
= task.content
- if task.state == "done"
- %p
- working time
- = distance_of_time_in_words(task.started_at, task.finished_at)
- %p
- finish time
- = task.finished_at.to_s(:time)
+ .times
+ %ul
+ %li.working
+ working time
+ = distance_of_time_in_words(task.started_at, task.finished_at)
+ %li.finish
+ finish time
+ = task.finished_at.to_s(:time)
- case task.state
- when "current"
- if user_signed_in? && current_user == task.user
.actions
%ul
- %li= link_to "hold", hold_party_task_path(@party, task), :remote => true
- %li= link_to "finish", finish_party_task_path(@party, task), :remote => true
+ %li.hold= link_to "hold", hold_party_task_path(@party, task), :remote => true
+ %li.finish= link_to "finish", finish_party_task_path(@party, task), :remote => true
%p.help
%a{:href => ""} HELP
- when "backlog"
- if user_signed_in? && current_user == task.user
- %p= link_to "start", start_party_task_path(@party, task), :remote => true
+ %p.start= link_to "start", start_party_task_path(@party, task), :remote => true

0 comments on commit 29efba8

Please sign in to comment.