Skip to content
Extraits de code Groupes Projets
Valider b5fbefad rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

this changes profile background colors to be dark, and sets up the groundwork...

this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles.  all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action.

for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`.  the current image tests in the public folder are results of the convert command noted.
parent 2f618f6d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 87 ajouts et 64 suppressions
app/assets/images/buttons/bday@2x-white.png

1,21 ko

app/assets/images/buttons/service-icons/fb@2x-white.png

1,08 ko

app/assets/images/buttons/service-icons/tumblr@2x-white.png

1,16 ko

app/assets/images/buttons/service-icons/twitter@2x-white.png

1,2 ko

......@@ -2,7 +2,8 @@
//= require ../views/profile_info_view
app.pages.Profile = app.views.Base.extend({
className : "container",
id : "profile",
templateName : "profile",
......
body {
background-image : image_url("pattern.png");
}
/* new link color */
a { color : rgb(42,156,235) }
......
@mixin wide() {
width : $two-column-width + px;
min-width : $two-column-width + px;
max-width : $two-column-width + px;
}
body {
background-color : #F6F6F6;
background-image : image_url('pattern.png')
}
.canvas-frame {
float : left;
margin : 10px;
......@@ -28,7 +22,7 @@ body {
.content {
@include transition(box-shadow);
@include box-shadow(0,1px,3px,rgba(0,0,0,0.2));
@include box-shadow(0,1px,10px,rgba(0,0,0,0.9));
background-image : image_url("paper-texture-1.jpg");
......
#profile {
color : #fff;
background : {
color : #333;
/* The background-image property will be user-generated and set in `app.pages.Profile` (app/assets/javascripts/app/pages/profile.js)
and should ONLY be set once the image is fully loaded.
Optimal imagemagick manipulation settings for uploaded image (via trial & error):
`convert -brightness-contrast -40x-50`
NOTE: I noticed that just turning the brightness down had an adverse affect on contrast,
thus the "washing out" at -50 contrast. For more info on this specific command, read the documentation
on it here: http://www.imagemagick.org/script/command-line-options.php#brightness-contrast */
image : url('/imagetest.jpg');
size : cover;
attachment : fixed;
}
}
/* getting started pulse animation */
#composer-button.pulse {
-webkit-animation: opacity-pulse 1s infinite;
......
......@@ -8,7 +8,7 @@
{{#if location}}
<span class="stat">
<a href="http://maps.google.com/maps?q={{location}}" target="_blank">
<i class="icon-map-marker"></i>
<i class="icon-map-marker icon-white"></i>
</a>
{{location}}
</span>
......@@ -17,7 +17,7 @@
{{#if birthday}}
<span class="stat">
<img src='{{imageUrl "buttons/bday@2x.png"}}' class="cake" />
<img src='{{imageUrl "buttons/bday@2x-white.png"}}' class="cake" />
{{birthday}}
</span>
<span class="divider"></span>
......@@ -25,20 +25,20 @@
<span class="stat services">
<a href="https://facebook.com" class="service" target="_blank">
<img src='{{imageUrl "buttons/service-icons/fb@2x.png"}}' />
<img src='{{imageUrl "buttons/service-icons/fb@2x-white.png"}}' />
</a>
<a href="https://twitter.com" class="service" target="_blank">
<img src='{{imageUrl "buttons/service-icons/twitter@2x.png"}}' />
<img src='{{imageUrl "buttons/service-icons/twitter@2x-white.png"}}' />
</a>
<a href="https://tumblr.com" class="service" target="_blank">
<img src='{{imageUrl "buttons/service-icons/tumblr@2x.png"}}' />
<img src='{{imageUrl "buttons/service-icons/tumblr@2x-white.png"}}' />
</a>
</span>
{{#if isOwnProfile}}
<span class="divider"></span>
<a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;">
<i class="icon-cog"></i>
<i class="icon-cog icon-white"></i>
</a>
{{/if}}
</div>
......
<div id="top-right-nav">
{{#if showFollowButton}}
<a href="#" onClick="alert('Not yet implemented!')" id="follow-button">
<span class="label label-inverse">
<i class="icon-plus icon-white"></i>
<span>
FOLLOW
<div class="container">
<div id="top-right-nav">
{{#if showFollowButton}}
<a href="#" onClick="alert('Not yet implemented!')" id="follow-button">
<span class="label label-inverse">
<i class="icon-plus icon-white"></i>
<span>
FOLLOW
</span>
</span>
</span>
</a>
{{/if}}
</a>
{{/if}}
{{#if current_user.guid}}
<a href="/" id="home-button">
<span class="label label-inverse">
<i class="icon-home icon-white"></i>
<span>
HOME
{{#if current_user.guid}}
<a href="/" id="home-button">
<span class="label label-inverse">
<i class="icon-home icon-white"></i>
<span>
HOME
</span>
</span>
</span>
</a>
{{else}}
<a href="/" id="home-button">
<span class="label label-inverse">
<span>
DIASPORA
</a>
{{else}}
<a href="/" id="home-button">
<span class="label label-inverse">
<span>
DIASPORA
</span>
</span>
</span>
</a>
{{/if}}
</a>
{{/if}}
{{#if isOwnProfile}}
<a href="/users/sign_out" title="Log out" id="logout-button">
<span class="label label-inverse">
<i class="icon-off icon-white"></i>
</span>
</a>
{{/if}}
</div>
{{#if isOwnProfile}}
<a href="/users/sign_out" title="Log out" id="logout-button">
<span class="label label-inverse">
<i class="icon-off icon-white"></i>
</span>
</a>
{{/if}}
</div>
<section id="profile-info"/>
<section id="profile-info"/>
<div id="composer" style="display:none;">
<iframe src="/posts/new" height=500 width=700 style="border:none;"></iframe>
</div>
<div id="composer" style="display:none;">
<iframe src="/posts/new" height=500 width=700 style="border:none;"></iframe>
</div>
<section id="profile-controls">
{{#if isOwnProfile}}
<a href="#composer" id="composer-button" class="control small" rel="facebox">
<img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
</a>
<a href="#" id="edit-mode-toggle" class="control small">
<img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
</a>
{{/if}}
</section>
<section id="profile-controls">
{{#if isOwnProfile}}
<a href="#composer" id="composer-button" class="control small" rel="facebox">
<img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
</a>
<a href="#" id="edit-mode-toggle" class="control small">
<img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
</a>
{{/if}}
</section>
<section id="canvas"></section>
<section id="canvas"></section>
<div id="paginate"><span class="loader hidden"/></div>
\ No newline at end of file
<div id="paginate"><span class="loader hidden"/></div>
</div>
public/imagetest-unmodified.jpg

239 ko

public/imagetest.jpg

189 ko

public/imagetest2.jpg

1,61 Mo

public/img/glyphicons-halflings-white.png

4,25 ko

public/img/glyphicons-halflings.png

4,25 ko

0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter