Permalink
Browse files

font size dropdown positioned correctly in top bar

  • Loading branch information...
1 parent 0ac7bd5 commit 4939775203906cb4ff9cd040ee0daf11ede33fed @craiglittle craiglittle committed Apr 3, 2012
Showing with 21 additions and 15 deletions.
  1. +6 −2 app/assets/stylesheets/custom.css
  2. +13 −11 app/views/decks/_formatting_bar.html.erb
  3. +2 −2 public/pickle.js
@@ -262,13 +262,17 @@
margin-right: 20px;
margin-top: -2px;
}
+
+ .template {
+ float: left;
+ }
- .temp_dropdown {
+ .temp-dropdown {
pointer-events: auto;
margin-right: 25px;
}
- .size_dropdown {
+ .size-dropdown {
pointer-events: auto;
}
@@ -11,26 +11,28 @@
<div class='selectors'>
<div class='template'>
Template:
- <select class='temp_dropdown' name='temp_dropdown'>
+ <select class='temp-dropdown' name='temp-dropdown'>
<% template_data.each_with_index do |template, i| %>
<option value='<%= template[:template_id] %>' <%= " selected='selected'" if deck.template_id == (i + 1) %>><%= template[:name] %></option>
<% end %>
</select>
</div>
<div class='template'>Font size:
- <select class='size_dropdown' name='size_dropdown'>
- <option value='32' name=<%= " selected='selected'" if deck.template.default_font_size == 24 %>>24</option>
- <option value='32' name=<%= " selected='selected'" if deck.template.default_font_size == 32 %>>32</option>
- <option value='48' name=<%= " selected='selected'" if deck.template.default_font_size == 48 %>>48</option>
- <option value='64' name=<%= " selected='selected'" if deck.template.default_font_size == 64 %>>64</option>
- <option value='80' name=<%= " selected='selected'" if deck.template.default_font_size == 80 %>>80</option>
- <option value='100' name=<%= " selected='selected'" if deck.template.default_font_size == 100 %>>100</option>
- </select></div>
+ <select class='size-dropdown' name='size-dropdown'>
+ <option value='48' name=<%= " selected='selected'" if deck.template.default_font_size == 48 %>>48</option>
+ <option value='64' name=<%= " selected='selected'" if deck.template.default_font_size == 64 %>>64</option>
+ <option value='80' name=<%= " selected='selected'" if deck.template.default_font_size == 80 %>>80</option>
+ <option value='100' name=<%= " selected='selected'" if deck.template.default_font_size == 100 %>>100</option>
+ <option value='120' name=<%= " selected='selected'" if deck.template.default_font_size == 120 %>>120</option>
+ <option value='150' name=<%= " selected='selected'" if deck.template.default_font_size == 150 %>>150</option>
+ <option value='200' name=<%= " selected='selected'" if deck.template.default_font_size == 200 %>>200</option>
+ </select>
+ </div>
</div>
- <div class='ux-helper'>
- </div>
+ <div class='ux-helper'>
+ </div>
<div id='menu-right'>
<a id='preview-button' class='button alter' style="pointer-events: auto;" data-logged-in="<%= user_signed_in? %>">Preview</a>
View
@@ -352,14 +352,14 @@ $('.delete_slide').click(function() {
if (slideIndexNumber == deckContent.length) { impress().prev(); }
});
-$('.temp_dropdown').change(function() {
+$('.temp-dropdown').change(function() {
database.deckData.template_id = parseInt($(this).val());
constructTree();
});
-$('.size_dropdown').change(function() {
+$('.size-dropdown').change(function() {
var deckContent = database.deckData.steps
var currentSlide = $('.active');
var slideIndexNumber = getSlideIndexNumber(currentSlide);

0 comments on commit 4939775

Please sign in to comment.