fix roboto; break long urls and stuff in sticky notes [ci skip]
This commit is contained in:
parent
bf110f0818
commit
4be6f196cd
6 changed files with 25 additions and 18 deletions
|
|
@ -10,3 +10,6 @@
|
|||
@import 'new_styles/canvas';
|
||||
@import 'new_styles/spinner';
|
||||
@import 'new_styles/profile';
|
||||
|
||||
/* font overrides */
|
||||
@import 'new_styles/typography';
|
||||
|
|
@ -168,8 +168,8 @@ article { //mood posts
|
|||
}
|
||||
|
||||
header, header p{
|
||||
//big text
|
||||
@include media-text();
|
||||
//big text
|
||||
@include media-text();
|
||||
font-size: $big-text-size;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,23 +27,11 @@ $sand : rgb(245, 239, 237);
|
|||
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 {
|
||||
background-color : #F6F6F6;
|
||||
background-image : image_url('pattern.jpg');
|
||||
}
|
||||
|
||||
|
||||
|
||||
.canvas-frame {
|
||||
float : left;
|
||||
margin : 10px;
|
||||
|
|
@ -72,6 +60,7 @@ body {
|
|||
p {
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
word-break : hyphenate;
|
||||
}
|
||||
|
||||
position : relative;
|
||||
|
|
@ -121,7 +110,9 @@ body {
|
|||
.info {
|
||||
@include transition(bottom);
|
||||
@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);
|
||||
|
||||
position : absolute;
|
||||
|
|
@ -193,6 +184,7 @@ body {
|
|||
font-style : italic;
|
||||
text-align : center;
|
||||
padding: 0 20px;
|
||||
word-break : break-all;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -209,7 +201,7 @@ body {
|
|||
|
||||
&.blog-text {
|
||||
.text-content {
|
||||
padding : 10px;
|
||||
padding : 20px;
|
||||
@include opacity(0.9);
|
||||
|
||||
p {
|
||||
|
|
@ -234,7 +226,6 @@ body {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* larger declarations */
|
||||
&.x2.width .content { @include wide(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ $night-text-color : #999;
|
|||
size: 2em;
|
||||
}
|
||||
|
||||
line-height: 2em;
|
||||
line-height: 1.2em;
|
||||
padding-bottom: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,10 @@
|
|||
.canvas-frame .fav {
|
||||
@include opacity(1)
|
||||
}
|
||||
|
||||
#edit-mode-toggle.control {
|
||||
@include opacity(1);
|
||||
}
|
||||
}
|
||||
|
||||
#profile-header {
|
||||
|
|
|
|||
9
app/assets/stylesheets/new_styles/_typography.scss
Normal file
9
app/assets/stylesheets/new_styles/_typography.scss
Normal 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;
|
||||
}
|
||||
Loading…
Reference in a new issue