From bb18803665af85c7d80a47ca2de1da924279c25f Mon Sep 17 00:00:00 2001
From: Pablo Cuadrado <pablocuadrado@gmail.com>
Date: Tue, 23 Sep 2014 19:09:04 -0300
Subject: [PATCH] welcome to diaspora styles ported
---
.../stylesheets/new_styles/_registration.scss | 31 +++++++++++++++++++
app/views/streams/main_stream.html.haml | 14 +++------
2 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
index 8dd83bd5f6..72ce18a23e 100644
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ b/app/assets/stylesheets/new_styles/_registration.scss
@@ -54,3 +54,34 @@
}
}
}
+
+#welcome-to-diaspora {
+ -webkit-box-shadow: inset 0 -2px 10px rgba(0,0,0,0.35);
+ -moz-box-shadow: inset 0 -2px 10px rgba(0,0,0,0.35);
+ position: relative;
+ width: 100%;
+ left: 0;
+ top: 0;
+ padding: 10px;
+ .right {
+ position: absolute;
+ right: 0;
+ top: 10px;
+ }
+ h1,h3 {
+ color: #fff;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ background: orange;
+ &:hover {
+ #gs-skip-x {
+ @include opacity(0.4);
+ @include transition(opacity, 0.25s);
+
+ &:hover {
+ @include opacity(1);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 6427b19f54..45419f82c7 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -8,25 +8,21 @@
= javascript_include_tag :jsxc, :id => 'jsxc',
:data => { :endpoint => get_bosh_endpoint }
+.bootstrap_header_padding
+
- if current_user.getting_started?
#welcome-to-diaspora
.container{:style => "position: relative;"}
.right
= link_to image_tag('close_label.png'), getting_started_completed_path, :id => "gs-skip-x"
- .span-23
+ .span12
%h1
= t('aspects.index.welcome_to_diaspora', :name => current_user.first_name)
%h3
= t('aspects.index.introduce_yourself')
- %br
- %br
- %br
- %br
- %br
-.bootstrap_header_padding
-.container
- .row
+.container-fluid
+ .row-fluid
.span3#leftNavBar
#home_user_badge
= owner_image_link
--
GitLab