From 73091141361bcfcc06f646242b469daa50c686ad Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg <maxwell@joindiaspora.com> Date: Thu, 26 Apr 2012 20:30:00 -0700 Subject: [PATCH] adding magic to buttons on framer [ci skip] --- app/assets/javascripts/app/pages/framer.js | 1 + app/assets/templates/composer-controls.jst.hbs | 2 +- app/assets/templates/framer-controls.jst.hbs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/pages/framer.js b/app/assets/javascripts/app/pages/framer.js index 8247127b50..b6465405ce 100644 --- a/app/assets/javascripts/app/pages/framer.js +++ b/app/assets/javascripts/app/pages/framer.js @@ -44,6 +44,7 @@ app.views.framerControls = app.views.Base.extend({ saveFrame : function(){ this.$('button').prop('disabled', 'disabled') + this.$('button').addClass('disabled') // this is gross hack to make this action work in the iframe version and not iframe version. var callback = {} var parentDoc = parent; diff --git a/app/assets/templates/composer-controls.jst.hbs b/app/assets/templates/composer-controls.jst.hbs index 5efb7301d5..e60cb19f7a 100644 --- a/app/assets/templates/composer-controls.jst.hbs +++ b/app/assets/templates/composer-controls.jst.hbs @@ -1,5 +1,5 @@ <div id='controls-wrapper'> - <button class="done btn-primary next">Next</button> + <button class="done btn btn-primary next">Next <i class="icon-arrow-right icon-white"></i></button> <div class="aspect-selector"/> <div class="service-selector"/> </div> \ No newline at end of file diff --git a/app/assets/templates/framer-controls.jst.hbs b/app/assets/templates/framer-controls.jst.hbs index 638a06e8e9..3d3f5523d5 100644 --- a/app/assets/templates/framer-controls.jst.hbs +++ b/app/assets/templates/framer-controls.jst.hbs @@ -1,4 +1,4 @@ <div id='controls-wrapper'> - <button class="done btn-primary">done</button> + <button class="done btn btn-success">Post <i class='icon-white icon-ok-sign'></i></button> <div class='template-picker'></div> </div> \ No newline at end of file -- GitLab