changeset 424:967233b26404

Fix styling for md size
author nanaya <me@myconan.net>
date Sat, 26 Sep 2015 03:56:24 +0900
parents ec413bbb4128
children 9369ad2f2ce8
files app/assets/stylesheets/application.scss app/views/pastes/new.html.erb app/views/pastes/show.html.erb
diffstat 3 files changed, 31 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/app/assets/stylesheets/application.scss	Thu Sep 17 18:39:33 2015 +0900
+++ b/app/assets/stylesheets/application.scss	Sat Sep 26 03:56:24 2015 +0900
@@ -3,6 +3,10 @@
 
 .input-url1 { display: none !important; }
 
+.form-group--narrow {
+  max-width: 300px;
+}
+
 .paste-paste {
   resize: vertical;
   font-family: $font-family-monospace;
--- a/app/views/pastes/new.html.erb	Thu Sep 17 18:39:33 2015 +0900
+++ b/app/views/pastes/new.html.erb	Sat Sep 26 03:56:24 2015 +0900
@@ -14,39 +14,37 @@
       %>
   </div></div>
 
-  <div class="row"><div class="col-sm-3">
-    <div class="form-group <%= error_class f.object, :key %>">
-      <%= f.label :key, t(".deletion_key") %>
-      <%= f.text_field :key, :class => "form-control" %>
-    </div>
+  <div class="form-group <%= error_class f.object, :key %> form-group--narrow">
+    <%= f.label :key, t(".deletion_key") %>
+    <%= f.text_field :key, :class => "form-control" %>
+  </div>
 
-    <div class="form-group">
-      <label><%= t(".privacy.label") %></label>
+  <div class="form-group">
+    <label><%= t(".privacy.label") %></label>
 
-      <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="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>
 
-    <div class="form-group">
-      <%= f.label :language %>
+  <div class="form-group form-group--narrow">
+    <%= f.label :language %>
 
-      <%= f.select :language, [], { :prompt => t(".language_none") }, :class => "form-control" %>
-    </div>
+    <%= f.select :language, [], { :prompt => t(".language_none") }, :class => "form-control" %>
+  </div>
 
-    <div class="form-group">
-      <%= f.button :class => "btn btn-primary" %>
+  <div class="form-group">
+    <%= f.button :class => "btn btn-primary" %>
 
-      <%= link_to t(".clear"), "#", :class => "btn btn-danger js-paste-clear" %>
-    </div>
-  </div></div>
+    <%= link_to t(".clear"), "#", :class => "btn btn-danger js-paste-clear" %>
+  </div>
 <% end %>
 
 <div class="modal fade js-paste-preview-md-modal" tabindex="-1" role="dialog">
--- a/app/views/pastes/show.html.erb	Thu Sep 17 18:39:33 2015 +0900
+++ b/app/views/pastes/show.html.erb	Sat Sep 26 03:56:24 2015 +0900
@@ -35,9 +35,9 @@
   </div>
 </div></div></div>
 
-<div class="row">
+<div class="row"><div class="col-xs-12">
   <%= form_for @paste, :method => :delete, :authenticity_token => false do |f| %>
-    <div class="form-group <%= error_class f.object, :key %> col-sm-6">
+    <div class="form-group form-group--narrow <%= error_class f.object, :key %>">
       <div class="input-group">
         <%= f.text_field :key,
             :value => nil,
@@ -52,7 +52,7 @@
       </div>
     </div>
   <% end %>
-</div>
+</div></div>
 
 <ul class="nav nav-pills paste-show__footer">
     <li role="presentation">