Merge branch 'develop'

2013-06-11 17:41:47 -04:00
parent ab57243315 f080745f9a
commit 46ff7287c2
1 changed files with 2 additions and 1 deletions
@@ -71,7 +71,7 @@ for $stage in $stages
    box-shadow: none
    background-color: white
    height: 3em
-    padding: 0 0 0 0.5em
+    padding: 0 3.3em 0 0.5em
    width: 100%
    &:focus
      box-shadow: inset 0 0 3px darken($best, 20%),inset -1px 0 1px darken($best, 30%)
@@ -117,6 +117,7 @@ for $stage in $stages
  display: block
  padding: 0.75em 0 0.75em 3.5em
  line-height: 1.4
+  word-wrap: break-word

 .habit-wide .task-text
  padding-left: 7em