diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index 2b7896741..8263aa83d 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -9,4 +9,7 @@ /* profile */ @import 'new_styles/canvas'; @import 'new_styles/spinner'; -@import 'new_styles/profile'; \ No newline at end of file +@import 'new_styles/profile'; + +/* font overrides */ +@import 'new_styles/typography'; \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index ca82ab92f..ac331c288 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -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; } diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index 43375f948..7ab15c1b2 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -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(); } diff --git a/app/assets/stylesheets/new_styles/_new_mixins.scss b/app/assets/stylesheets/new_styles/_new_mixins.scss index 5d35698c1..2c3827bf7 100644 --- a/app/assets/stylesheets/new_styles/_new_mixins.scss +++ b/app/assets/stylesheets/new_styles/_new_mixins.scss @@ -74,7 +74,7 @@ $night-text-color : #999; size: 2em; } - line-height: 2em; + line-height: 1.2em; padding-bottom: 0; margin-bottom: 0; } diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index 5d5443326..f53f5ba8a 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -47,6 +47,10 @@ .canvas-frame .fav { @include opacity(1) } + + #edit-mode-toggle.control { + @include opacity(1); + } } #profile-header { diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss new file mode 100644 index 000000000..efc596925 --- /dev/null +++ b/app/assets/stylesheets/new_styles/_typography.scss @@ -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; +} \ No newline at end of file