diff options
author | Steffen van Bergerem <svbergerem@online.de> | 2015-06-04 03:31:07 +0300 |
---|---|---|
committer | Jonne Haß <me@jhass.eu> | 2015-06-04 19:05:44 +0300 |
commit | f5bb4a4557171a8f6f7b83f703642226fe5fdfc3 (patch) | |
tree | 3bb44ccbfefa7af8f14e6ebafe027818453c2ad0 /app | |
parent | b7f4feacce52e078cb909271b4faed6aa15da079 (diff) |
Refactor button colors
Diffstat (limited to 'app')
6 files changed, 6 insertions, 39 deletions
diff --git a/app/assets/javascripts/app/views/aspect_membership_view.js b/app/assets/javascripts/app/views/aspect_membership_view.js index b15d9bbc4..231149131 100644 --- a/app/assets/javascripts/app/views/aspect_membership_view.js +++ b/app/assets/javascripts/app/views/aspect_membership_view.js @@ -145,7 +145,7 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({ // refresh the button text to reflect the current aspect selection status updateSummary: function(target) { this._toggleCheckbox(target); - this._updateButton('green'); + this._updateButton("btn-success"); } }); // @license-end diff --git a/app/assets/javascripts/app/views/tag_following_action_view.js b/app/assets/javascripts/app/views/tag_following_action_view.js index 37d95ff2a..e62754c0c 100644 --- a/app/assets/javascripts/app/views/tag_following_action_view.js +++ b/app/assets/javascripts/app/views/tag_following_action_view.js @@ -43,12 +43,12 @@ app.views.TagFollowingAction = app.views.Base.extend({ }, mouseIn : function(){ - this.$("input").removeClass("green").addClass("btn-danger"); + this.$("input").removeClass("btn-success").addClass("btn-danger"); this.$("input").val( Diaspora.I18n.t('stream.tags.stop_following', {tag: this.model.attributes.name} ) ); }, mouseOut : function() { - this.$("input").removeClass("btn-danger").addClass("green"); + this.$("input").removeClass("btn-danger").addClass("btn-success"); this.$("input").val( Diaspora.I18n.t('stream.tags.following', {"tag" : this.model.attributes.name} ) ); }, diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5143340cb..b5aca98de 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -19,7 +19,6 @@ @import 'sprites'; @import 'hovercard'; @import 'new_styles/base'; -@import 'new_styles/buttons'; @import 'new_styles/interactions'; @import 'new_styles/spinner'; @import 'lightbox'; diff --git a/app/assets/stylesheets/new_styles/_buttons.scss b/app/assets/stylesheets/new_styles/_buttons.scss deleted file mode 100644 index 4b8b2dcdb..000000000 --- a/app/assets/stylesheets/new_styles/_buttons.scss +++ /dev/null @@ -1,32 +0,0 @@ -.btn.btn-primary { - $button-border-color: #aaa; - background: $dark-blue; - color: #fff; - border: 1px solid darken($button-border-color, 20%); - text-shadow: none; - &:hover, &:active { - background: lighten($dark-blue, 10%); - border: 1px solid darken($button-border-color,35%); - } -} -.btn-group.open > .btn.btn-primary { - background: $creation-blue; - &:hover, &:active { background: lighten($dark-blue, 10%); } -} - -.btn.green { - $button-border-color: #aaa; - background: $green; - color: $grey; - border: 1px solid darken($button-border-color, 20% ); - - &:hover { - background: $light-green; - border: 1px solid darken($button-border-color,35%); - } -} -.btn-group.open > .btn.green { - background: $green; -} - -.btn.delete { color: desaturate($red,10%); } diff --git a/app/assets/templates/tag_following_action_tpl.jst.hbs b/app/assets/templates/tag_following_action_tpl.jst.hbs index 2d31000f4..e3c35496b 100644 --- a/app/assets/templates/tag_following_action_tpl.jst.hbs +++ b/app/assets/templates/tag_following_action_tpl.jst.hbs @@ -1,8 +1,8 @@ <div class="pull-right tag-following-action"> <form accept-charset="UTF-8" action="/tag_followings" method="post"> - <input type="submit" class="btn + <input type="submit" class="btn {{#if tag_is_followed }} - green followed + btn-success followed {{else}} btn-default {{/if}} diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index d51fa0528..c52fa3320 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -12,7 +12,7 @@ module AspectGlobalHelper aspect_membership_ids[a.id] = record.id end - button_class = selected_aspects.size>0 ? "green" : "btn-default" + button_class = selected_aspects.size > 0 ? "btn-success" : "btn-default" button_class << case size when "small" " btn-small" |