Merge branch 'develop' of github.com:lefnire/habitrpg into develop

styles/app/responsive.styl

@@ -1,3 +1,33 @@
+// widths
+.full
+	width: 100%;
+.half
+	width: 50%;
+.third
+	width: 33.3333%;
+.two-thirds
+	width: 66.6666%;
+.quarter
+	width: 25%;
+.three-quarters
+	width: 75%;
+.fifth
+	width: 20%;
+.two-fifths
+	width: 40%;
+.three-fifths
+	width: 60%;
+.four-fifths
+	width: 80%;
+.sixth
+	width: 16.6667%;
+.eighth
+	width: 12.5%;
+.tenth
+	width: 10%;
+.twelfth
+	width: 8.3333%;
+
 .grid
 	padding: 0 1.5em 1.5em 0
 	letter-spacing: -4px

styles/app/tasks.styl

@@ -95,15 +95,14 @@ for $stage in $stages
   outline: 0
   border: 0
   border-radius: 0 //required to nuke BB-playbook user agent styles
-  background-color: darken($best, 20%)
-  opacity: 0.75
+  background-color: darken($best, 15%)
   &:hover,
   &:focus
-    opacity: 1
+    // opacity: 1
     background-color: darken($best, 20%)
   &:active
     background-color: darken($best, 30%)
-    opacity: 1
+    // opacity: 1
 
 
 // an individual task entry
@@ -264,7 +263,7 @@ for $stage in $stages
 
 // task editing
 // ------------
-.task-options
+[class$="-options"]
   padding: 0 0.5em
   margin-top: 1.25em
   color: #333
@@ -300,13 +299,21 @@ for $stage in $stages
     box-shadow: none
     border-radius: 0
     font-family: 'Lato', sans-serif //bootstrap override
-  
+
   textarea.option-content
     height: 5em
     padding-top: 0.25em
     resize: none
     margin-bottom: 0
 
+.option-short
+  .option-content
+    width: 3em
+    display: inline-block
+  .input-suffix
+    vertical-align: 20%
+    padding-left: 0.25em
+
 // button-group
 .task-controls.tile-group
   display: block

views/app/settings.html

@@ -7,11 +7,11 @@
             </ul>
 
             <div class="tab-content">
-                <div class="tab-pane active" id="settings-settings">
+                <div class="tab-pane active personal-options" id="settings-settings">
                     <h4>Custom Day Start</h4>
-                    <div class="input-append">
-                        <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
-                        <span class="add-on">:00 (24h)</span>
+                    <div class="option-group option-short">
+                        <input class="option-content option-time" type="number" min=0 max=24 value={_user.preferences.dayStart}>
+                        <span class="input-suffix">:00 (24h clock)</span>
                     </div>
                     <div>
                         <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>

views/app/tasks.html

@@ -158,12 +158,12 @@
 
             <!-- if Reward, pricing -->
             {else if equal(:task.type, 'reward')}
-                <div class=control-group>
-                    <label>Price</label>
-                    <div class="input-append">
-                        <input class="span5" size="16" type="number" min="0" value={:task.value}><span class="add-on">Gold</span>
-                    </div>
-                </div>
+                <fieldset class="option-group option-short">
+                    <legend class="option-title">Price</legend>
+                    <input class="option-content" size="16" type="number" min="0" value={:task.value}>
+                    <div class="money input-suffix"><span class='shop_gold'></span></div>
+                </fieldset>
+                
 
             <!-- if Todo, the due date -->
             {else if equal(:task.type, 'todo')}