Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgri…

…ppis stuff does not work in firefox. or safari.

or konqueror. we will talk to him about it later
  • Loading branch information...
commit d64eb529d2d79446feb913481d307cd5a8660e99 1 parent 88a1747
@denniscollective denniscollective authored
View
7 app/assets/javascripts/app/views/small_frame.js
@@ -16,7 +16,12 @@ app.views.SmallFrame = app.views.Base.extend({
},
postRenderTemplate : function() {
- this.$el.addClass(this.dimensionsClass() + " " + this.colorClass())
+ this.$el.addClass([this.dimensionsClass(), this.colorClass(), this.frameClass()].join(' '))
+ },
+
+ frameClass : function(){
+ var name = this.model.get("frame_name") || ""
+ return name.toLowerCase()
},
colorClass : function() {
View
34 app/assets/stylesheets/new_styles/_canvas.scss
@@ -76,6 +76,7 @@ body {
/* used in masking photos with overflow: hidden; */
.image-container {
+
overflow : hidden;
width : 100%;
@@ -188,4 +189,37 @@ body {
&.x2.width .content { @include wide(); }
&.sticky-note.x2.height .content { @include tall(); }
+
+ &.wallpaper {
+ .info {
+
+ }
+ .content{
+ display: table;
+ }
+
+ .image-container {
+ background-color: black;
+ display: table-cell;
+
+ img {
+ @include opacity(0.7);
+ }
+ }
+
+ .text-content {
+ position: absolute;
+ left: 0;
+ width: 100%;
+ top: 40%;
+ @include centered-frame();
+ font-size: 3em;
+ color: white;
+ @include opacity(1);
+ text-shadow : none;
+ font-weight: bold;
+
+
+ }
+ }
}
View
2  app/assets/templates/small-frame.jst.hbs
@@ -30,14 +30,12 @@
</div>
{{/if}}
- {{#unless photos}}
<div class="text-content">
{{{text}}}
</div>
{{#if text}}
<div class="background-color"></div>
{{/if}}
- {{/unless}}
</div>
<div class="info">
View
1  app/models/post.rb
@@ -45,6 +45,7 @@ class Post < ActiveRecord::Base
t.add :photos
t.add :nsfw
t.add :favorite
+ t.add :frame_name
end
xml_attr :provider_display_name
Please sign in to comment.
Something went wrong with that request. Please try again.