styles looking decent

18F · Jul 15, 2016 · 37c21b9 · 37c21b9
1 parent 96e6c09
commit 37c21b9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -33,5 +33,6 @@
 @import 'components/slabs';
 @import 'components/striped-table';
 @import 'components/sign-up';
+@import 'components/profile';
 
 @import 'junk_drawer';
diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss
@@ -3,11 +3,6 @@ input[disabled] {
   color: lighten($color-gray-dark, 50%);
 }
 
-input,
-input[type="text"] {
-  border-radius: $border-radius;
-}
-
 .time-input {
   float: left;
   width: 33%;

diff --git a/app/assets/stylesheets/components/_profile.scss b/app/assets/stylesheets/components/_profile.scss
@@ -0,0 +1,12 @@
+.profile-wrapper {
+  @include span-columns(8);
+  @include shift(2);
+  border: 1px solid $color-gray-neutral;
+  margin-top: .5em;
+  padding-left: 1em;
+  padding-right: 1em;
+
+  form {
+    max-width: none;
+  }
+}
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -1,4 +1,5 @@
 <div class="usa-grid">
+  <div class="profile-wrapper">
   <h1>Profile</h1>
 
   <%= simple_form_for @user, method: :put do |f| %>
@@ -22,6 +23,7 @@
       </p>
       <%= f.input :credit_card_form_url %>
 
-    <%= f.submit 'Update', class: 'usa-button usa-button-outline' %>
+    <%= f.submit class: 'usa-button usa-button-outline' %>
   <% end %>
 </div>
+</div>
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
@@ -3,7 +3,7 @@ en:
     "yes": 'Yes'
     "no": 'No'
     required:
-      mark: ''
+      html: '<span class="usa-additional_text">Required</span>'
     error_notification:
       default_message: "Please review the problems below:"
     labels:
@@ -38,6 +38,7 @@ en:
       auction:
         create: "Create"
         update: "Update"
-    submit:
+      user:
+        update: "Update"
       bid:
         create: "Place bid"