diff --git a/app/assets/images/fonts/Roboto-Bold.ttf b/app/assets/images/fonts/Roboto-Bold.ttf new file mode 100644 index 000000000..91ec21227 Binary files /dev/null and b/app/assets/images/fonts/Roboto-Bold.ttf differ diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index 8ae2dd57d..484920927 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -1,6 +1,5 @@ #edit-controls { - @include transition(opacity); - @include opacity(0); + display : none; position : fixed; @@ -21,7 +20,7 @@ /* functionality under edit mode */ .edit-mode { #edit-controls { - @include opacity(1); + display : block; } #edit-mode-toggle.control { @@ -70,4 +69,31 @@ @include opacity(0.8); } } +} + +#home-button { + @include transition(opacity); + @include opacity(0.4); + + position : absolute; + right : 10px; + top : 10px; + + .label { + padding : 2px 5px; + padding-right : 7px; + padding-bottom : 3px; + + span { + display : inline-block; + position : relative; + top : 1px; + font-family : Roboto-Bold; + } + } + + &:hover { + @include opacity(0.75); + text-decoration : none; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss index fe6e8806d..b79b2f303 100644 --- a/app/assets/stylesheets/new_styles/_typography.scss +++ b/app/assets/stylesheets/new_styles/_typography.scss @@ -4,6 +4,11 @@ src : image-url('fonts/Roboto-Regular.ttf') } +@font-face { + font-family : Roboto-Bold; + src : image-url('fonts/Roboto-Bold.ttf') +} + body, p, h1, h2, h3, h4, h5, h6, textarea, input, * { font-family : Roboto, Helvetica, sans; } diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index 7e0b0926a..6b6b76692 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -1,7 +1,16 @@
- editing... + EDITING
+ + + + + HOME + + + +
@@ -19,6 +28,6 @@ {{/if}}
-
+
-
+