Move settings.scss

app/assets/javascripts/app/pages/settings.js

@@ -1,7 +1,7 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 app.pages.Settings = Backbone.View.extend({
   initialize: function() {
-    $(".settings_visibility").tooltip({placement: "top"});
+    $(".settings-visibility").tooltip({placement: "top"});
     $(".profile-visibility-hint").tooltip({placement: "top"});
     $("[name='profile[public_details]']").bootstrapSwitch();
   }

app/assets/stylesheets/_application.scss

@@ -34,7 +34,7 @@
 @import 'terms';
 
 /* profile and settings pages */
-@import 'new_styles/settings';
+@import 'settings';
 
 /* new SPV */
 @import 'header';

app/assets/stylesheets/new_styles/_settings.scss

@@ -1,31 +0,0 @@
-/* Specific styles for the settings pages (profile, user account, privacy, services) */
-#inner_account_delete {
-	width: 700px;
-}
-
-.as-selections #tags {
-	box-shadow: none;
-}
-
-.enclosed-checkbox label {
-	margin-bottom: 0;
-}
-
-#profile_photo_upload {
-  text-align: center;
-
-  .avatar {
-    height: auto;
-    width: auto;
-    max-width: 200px;
-    margin-bottom: 20px;
-  }
-}
-
-.settings_visibility { margin-left: 10px; }
-
-#profile_bio {
-  width: 100%;
-  max-width: 100%;
-  min-width: 100%;
-}

app/assets/stylesheets/settings.scss

@@ -0,0 +1,22 @@
+// Specific styles for the settings pages (profile, user account, privacy, services)
+.enclosed-checkbox label {
+  margin-bottom: 0;
+}
+
+.profile-photo-upload {
+  text-align: center;
+
+  .avatar {
+    height: auto;
+    margin-bottom: 20px;
+    max-width: 200px;
+    width: auto;
+  }
+}
+
+.settings-visibility { margin-left: 10px; }
+
+.page-profiles.action-edit textarea {
+  max-width: 100%;
+  min-width: 100%;
+}

app/views/photos/_new_profile_photo.haml

@@ -57,7 +57,7 @@
     }
     window.onload = createUploader;
 
-#profile_photo_upload
+.profile-photo-upload#profile_photo_upload
   = owner_image_tag(:thumb_large)
   .small-horizontal-spacer
   .clearfix

app/views/users/_edit.haml

@@ -20,7 +20,7 @@
       .col-md-6
         %h3
           = t(".your_email")
-          %i.entypo-lock.gray.settings_visibility{title: t("users.edit.your_email_private")}
+          %i.entypo-lock.gray.settings-visibility{title: t("users.edit.your_email_private")}
 
 
         = form_for "user", url: user_path,