fixed captions and stuff [ci skip]

This commit is contained in:
danielgrippi 2012-04-24 12:44:44 -07:00
parent bff9d2d370
commit 931dd2621b
5 changed files with 27 additions and 10 deletions

View file

@ -34,14 +34,13 @@ app.views.SmallFrame = app.views.Base.extend({
return "blog-text x2 width"
} else if(text.length > 140) {
return randomColor
} else if(text.length > 50) {
} else if(text.length > 35) {
return randomColor
} else {
return "big-text " + randomColor
}
},
dimensionsClass : function() {
/* by default, make it big if it's a fav */
if(this.model.get("favorite")) { return "x2 width height" }

View file

@ -1,5 +1,8 @@
@import "_new_mixins";
/* new link color */
a { color : rgb(42,156,235) !important; }
/* bootstrap extentions */
.icon-red { background-image: image_url("img/glyphicons-halflings-red.png"); }
.icon-green { background-image: image_url("img/glyphicons-halflings-green.png"); }

View file

@ -110,10 +110,12 @@ body {
.info {
@include transition(bottom);
@include opacity(0.8);
@include box-shadow(0, -1px, 3px, rgba(0,0,0,0.1));
@include box-shadow(0,1px,5px,rgba(0,0,0,0.8));
border : 1px solid rgba(255,255,255,0.5);
background-color : rgba(255,255,255,0.4);
background-color : rgb(255,255,255);
z-index : 30;
position : absolute;
bottom : -30px;
@ -137,8 +139,6 @@ body {
}
.text-content {
@include opacity(0.65);
position : relative;
z-index : 10;
color : #000;
@ -154,10 +154,25 @@ body {
}
}
&.day:not(.sticky-note),
&.night:not(.sticky-note) {
.text-content {
padding : 10px 15px;
padding-bottom : 5px;
p {
font-size : 14px;
line-height : 19px;
color : #555;
}
}
}
&.sticky-note {
.content{
min-height : $column-width + px;
.text-content {
@include opacity(0.65);
margin: 20px 20px 30px;
}
}

View file

@ -4,6 +4,6 @@
src : image_url('fonts/Roboto-Regular.ttf')
}
body, p, h1, h2, h3, h4, h5, h6, * {
body, p, h1, h2, h3, h4, h5, h6, textarea, input, * {
font-family : Roboto, Helvetica, sans;
}

View file

@ -24,10 +24,10 @@
</div>
{{/if}}
<div class="text-content">
{{{text}}}
</div>
{{#if text}}
<div class="text-content">
{{{text}}}
</div>
<div class="background-color"></div>
{{/if}}