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

more responsive stuffs [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-05-12 22:29:08 -07:00
parent 31049fe1c4
commit f14907e64c
5 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/views/small_frame.js
View file

@ -79,9 +79,17 @@ app.views.SmallFrame = app.views.Post.extend({
if(!(this.model.get("photos") || [])[0]) { return } if(!(this.model.get("photos") || [])[0]) { return }
var modifiers = [this.dimensionsClass(), this.colorClass()].join(' ') var modifiers = [this.dimensionsClass(), this.colorClass()].join(' ')
, width;
/* mobile width
*
* currently does not re-calculate on orientation change */
if($(window).width() <= 767) {
width = $(window).width();
}
var firstPhoto = this.model.get("photos")[0] var firstPhoto = this.model.get("photos")[0]
, width = (modifiers.search("x2") != -1 ? this.DOUBLE_COLUMN_WIDTH : this.SINGLE_COLUMN_WIDTH) , width = width || (modifiers.search("x2") != -1 ? this.DOUBLE_COLUMN_WIDTH : this.SINGLE_COLUMN_WIDTH)
, ratio = width / firstPhoto.dimensions.width; , ratio = width / firstPhoto.dimensions.width;
return(ratio * firstPhoto.dimensions.height) return(ratio * firstPhoto.dimensions.height)

9
app/assets/stylesheets/new_styles/_base.scss
View file

@ -1,6 +1,6 @@
body { body {
background-image : image_url("pattern.png"); background-image : image_url("pattern.png");
padding : none !important; padding : none;
} }
/* new link color */ /* new link color */
@ -473,3 +473,10 @@ div[data-template=flow] {
font-family : Roboto-Bold; font-family : Roboto-Bold;
} }
} }
/* responsive */
@media (max-width: 767px) {
body {
padding : 0;
}
}

3
app/assets/stylesheets/new_styles/_canvas.scss
View file

@ -338,7 +338,7 @@
} }
} }
/* canvas responsive */ /* responsive */
@media (max-width: 767px) { @media (max-width: 767px) {
body { body {
padding : 0; padding : 0;
@ -352,6 +352,7 @@
margin-bottom : 10px; margin-bottom : 10px;
.content { .content {
font-size : 0.9em;
margin : 0 20px; margin : 0 20px;
width : auto !important; width : auto !important;
} }

5
app/assets/stylesheets/new_styles/_profile.scss
View file

@ -212,7 +212,7 @@
} }
} }
/* canvas responsive */ /* responsive */
@media (max-width: 767px) { @media (max-width: 767px) {
.profile-image-container { .profile-image-container {
height : 100px; height : 100px;
@ -228,7 +228,8 @@
padding-bottom : 20px; padding-bottom : 20px;
} }
#wallpaper-upload { #wallpaper-upload,
.edit-control {
display : none; display : none;
} }
} }

11
app/assets/templates/profile-info.jst.hbs
View file

@ -36,10 +36,13 @@
</span> </span>
{{#if is_own_profile}} {{#if is_own_profile}}
<span class="divider">•</span> <span class="edit-control">
<a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;"> <span class="divider">•</span>
<i class="icon-cog icon-white"></i> <a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;">
</a> <i class="icon-cog icon-white"></i>
</a>
</span>
</span>
{{/if}} {{/if}}
</div> </div>