changeset 403:e0626046579a

Rearrange stuff.
author nanaya <me@myconan.net>
date Sun, 06 Sep 2015 04:32:02 +0900
parents a18e19139f57
children 3d434e15ddb1
files app/assets/stylesheets/application.scss app/views/pastes/new.html.erb config/locales/en.yml
diffstat 3 files changed, 29 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/app/assets/stylesheets/application.scss	Sun Sep 06 04:20:50 2015 +0900
+++ b/app/assets/stylesheets/application.scss	Sun Sep 06 04:32:02 2015 +0900
@@ -25,6 +25,10 @@
   }
 }
 
+.radio-container {
+  margin-top: -10px;
+}
+
 .zp-hl {
   background-color: #fff;
   padding: 0px;
--- a/app/views/pastes/new.html.erb	Sun Sep 06 04:20:50 2015 +0900
+++ b/app/views/pastes/new.html.erb	Sun Sep 06 04:32:02 2015 +0900
@@ -12,37 +12,35 @@
       <%= link_to t(".preview_md"), "#",
           :class => "btn btn-default js-paste-preview-md pull-right"
       %>
+  </div></div>
+
+  <div class="row">
+    <div class="form-group col-sm-3 <%= error_class f.object, :key %>">
+      <%= f.label :key, t(".deletion_key") %>
+      <%= f.text_field :key, :class => "form-control" %>
+    </div>
   </div>
 
-  <div class="form-horizontal">
-    <div class="form-group <%= error_class f.object, :key %>">
-      <%= f.label :key, t(".deletion_key"), :class => "col-sm-2 control-label" %>
-      <div class="col-sm-3">
-        <%= f.text_field :key, :class => "form-control" %>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="control-label col-sm-2"><%= t(".privacy.label") %></label>
+  <div class="form-group">
+    <label><%= t(".privacy.label") %></label>
 
-      <div class="col-sm-10">
-        <% paste_privacy_options.each do |label, value| %>
-          <div class="radio">
-            <label>
-              <%= f.radio_button :is_private, value %>
-              <%= t(".privacy.#{label}") %>
-            </label>
-          </div>
-        <% end %>
-      </div>
+    <div class="radio-container">
+      <% paste_privacy_options.each do |label, value| %>
+        <div class="radio">
+          <label>
+            <%= f.radio_button :is_private, value %>
+            <%= t(".privacy.#{label}") %>
+          </label>
+        </div>
+      <% end %>
     </div>
-
-    <div class="form-group"><div class="col-sm-offset-2 col-sm-10">
-      <%= f.button :class => "btn btn-primary" %>
+  </div>
 
-      <%= link_to t(".clear"), "#", :class => "btn btn-danger js-paste-clear" %>
-    </div></div>
-  </div>
+  <div class="form-group">
+    <%= f.button :class => "btn btn-primary" %>
+
+    <%= link_to t(".clear"), "#", :class => "btn btn-danger js-paste-clear" %>
+  </div></div>
 <% end %>
 
 <div class="modal fade js-paste-preview-md-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
--- a/config/locales/en.yml	Sun Sep 06 04:20:50 2015 +0900
+++ b/config/locales/en.yml	Sun Sep 06 04:32:02 2015 +0900
@@ -12,7 +12,7 @@
       clear: Clear
       close: Close
       deletion_key: Deletion Key
-      preview_md: Preview Markdown
+      preview_md: Markdown Preview
       privacy:
         label: Privacy
         private: Private