diff --git a/js/gittip/tips.js b/js/gittip/tips.js index 8ca089e5a4..e8f89a2f6d 100644 --- a/js/gittip/tips.js +++ b/js/gittip/tips.js @@ -20,7 +20,7 @@ Gittip.tips.init = function() { function checkTip() { var $this = $(this), $parent = $this.parents('form'), - $confirm = $parent.find('.confirm-tip'), + $confirm = $parent.find('.confirm'), amount = parseFloat($this.val(), 10) || 0, oldAmount = parseFloat(this.defaultValue, 10), max = parseFloat($this.prop('max')), @@ -71,13 +71,13 @@ Gittip.tips.init = function() { }); }); - $('.my-tip .cancel-tip').click(function(event) { + $('.my-tip .cancel').click(function(event) { event.preventDefault(); $(this).parents('form').trigger('reset'); }); - $('.my-tip .tip-suggestions a').click(function(event) { + $('.my-tip .suggestions a').click(function(event) { event.preventDefault(); var $this = $(this), @@ -88,7 +88,7 @@ Gittip.tips.init = function() { $('form.my-tip').on('reset', function() { $(this).removeClass('changed'); - $(this).find('.confirm-tip').prop('disabled', true); + $(this).find('.confirm').prop('disabled', true); $(window).off('beforeunload.tips'); }); diff --git a/scss/gittip.scss b/scss/gittip.scss index cfa8ad3750..00e364ba45 100644 --- a/scss/gittip.scss +++ b/scss/gittip.scss @@ -31,12 +31,14 @@ // Styles specific to certain pages. @import "history"; +@import "giving"; + @import "team"; @import "profile-edit"; @import "widgets/sign_in"; -@import "widgets/my_tip"; +@import "widgets/money"; @import "widgets/tipr"; diff --git a/scss/giving.scss b/scss/giving.scss new file mode 100644 index 0000000000..925f377cc0 --- /dev/null +++ b/scss/giving.scss @@ -0,0 +1,19 @@ +#giving { + h2 { white-space: nowrap } + + th { + vertical-align: middle; + padding-right: 0.5em; + } + + td { + text-align: left; + height: 30px; + } + + tr.tip, tr.pledge { + th, td { + white-space: nowrap + } + } +} diff --git a/scss/widgets/my_tip.scss b/scss/widgets/money.scss similarity index 75% rename from scss/widgets/my_tip.scss rename to scss/widgets/money.scss index 98daace86b..a48a080011 100644 --- a/scss/widgets/my_tip.scss +++ b/scss/widgets/money.scss @@ -1,13 +1,13 @@ -form.my-tip { +form.money { line-height: 1.7em; overflow: hidden; - .tip-controls { + .controls { text-align: right; width: 60%; float: left; - .tip-suggestions { + .suggestions { display: inline-block; font-size: 0.9em; @@ -26,31 +26,29 @@ form.my-tip { } } - .tip-actions { + .actions { width: 38%; float: right; text-align: left; border-left: 1px solid $brown; padding-left: 1.9%; - .cancel-tip { + .cancel { font-size: 0.9em; } } - .cancel-tip { + .cancel { opacity: 0.5; cursor: default; } - &.changed { - .cancel-tip { - opacity: 1; - cursor: pointer; - } + &.changed .cancel { + opacity: 1; + cursor: pointer; } } -input.my-tip { +input.money { width: 5.5em; } diff --git a/templates/my-tip-bulk.html b/templates/my-tip-bulk.html index c78ec227bf..798b877d52 100644 --- a/templates/my-tip-bulk.html +++ b/templates/my-tip-bulk.html @@ -1,12 +1,12 @@ -
diff --git a/templates/my-tip.html b/templates/my-tip.html index 05260ec98f..7babc4158b 100644 --- a/templates/my-tip.html +++ b/templates/my-tip.html @@ -1,10 +1,10 @@ -