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

fix roboto; break long urls and stuff in sticky notes [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-04-23 22:31:37 -07:00
parent bf110f0818
commit 4be6f196cd
6 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/new-templates.css.scss
View file

@ -10,3 +10,6 @@
@import 'new_styles/canvas'; @import 'new_styles/canvas';
@import 'new_styles/spinner'; @import 'new_styles/spinner';
@import 'new_styles/profile'; @import 'new_styles/profile';
/* font overrides */
@import 'new_styles/typography';

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

@ -27,23 +27,11 @@ $sand : rgb(245, 239, 237);
max-width : $two-column-width + px; max-width : $two-column-width + px;
} }
/* ROBOTO!!!!!! */
@font-face {
font-family : Roboto;
src : image_url('fonts/Roboto-Regular.tff')
}
body, p, h1, h2, h3, h4, h5, h6 {
font-family : Roboto, Helvetica, sans;
}
body { body {
background-color : #F6F6F6; background-color : #F6F6F6;
background-image : image_url('pattern.jpg'); background-image : image_url('pattern.jpg');
} }
.canvas-frame { .canvas-frame {
float : left; float : left;
margin : 10px; margin : 10px;
@ -72,6 +60,7 @@ body {
p { p {
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
word-break : hyphenate;
} }
position : relative; position : relative;
@ -121,7 +110,9 @@ body {
.info { .info {
@include transition(bottom); @include transition(bottom);
@include opacity(0.8); @include opacity(0.8);
@include box-shadow(0, -1px, 3px, rgba(0,0,0,0.1));
border : 1px solid rgba(255,255,255,0.5);
background-color : rgba(255,255,255,0.4); background-color : rgba(255,255,255,0.4);
position : absolute; position : absolute;
@ -193,6 +184,7 @@ body {
font-style : italic; font-style : italic;
text-align : center; text-align : center;
padding: 0 20px; padding: 0 20px;
word-break : break-all;
} }
} }
} }
@ -209,7 +201,7 @@ body {
&.blog-text { &.blog-text {
.text-content { .text-content {
padding : 10px; padding : 20px;
@include opacity(0.9); @include opacity(0.9);
p { p {
@ -234,7 +226,6 @@ body {
} }
} }
/* larger declarations */ /* larger declarations */
&.x2.width .content { @include wide(); } &.x2.width .content { @include wide(); }

2
app/assets/stylesheets/new_styles/_new_mixins.scss
View file

@ -74,7 +74,7 @@ $night-text-color : #999;
size: 2em; size: 2em;
} }
line-height: 2em; line-height: 1.2em;
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 0; margin-bottom: 0;
} }

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

@ -47,6 +47,10 @@
.canvas-frame .fav { .canvas-frame .fav {
@include opacity(1) @include opacity(1)
} }
#edit-mode-toggle.control {
@include opacity(1);
}
} }
#profile-header { #profile-header {

9
app/assets/stylesheets/new_styles/_typography.scss Normal file
View file

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