nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move settings.scss

Browse source
This commit is contained in:
Steffen van Bergerem 2015-10-05 13:35:26 +02:00
parent 66fb953591
commit b59c99807b
6 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/pages/settings.js
View file

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

2
app/assets/stylesheets/_application.scss
View file

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

31
app/assets/stylesheets/new_styles/_settings.scss
View file

@ -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%;
}

22
app/assets/stylesheets/settings.scss Normal file
View file

@ -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%;
}

2
app/views/photos/_new_profile_photo.haml
View file

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

2
app/views/users/_edit.haml
View file

@ -20,7 +20,7 @@
.col-md-6 .col-md-6
%h3 %h3
= t(".your_email") = 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, = form_for "user", url: user_path,