Merge pull request #5057 from blase/feature/4466-port-getting-started-page-to-bootstrap

Port Getting Started page to Bootstrap

Changelog.md

@@ -3,6 +3,7 @@
 ## Refactor
 * Port help pages to Bootstrap [#5050](https://github.com/diaspora/diaspora/pull/5050)
 * Refactor Notification#notify [#4945](https://github.com/diaspora/diaspora/pull/4945)
+* Port getting started to Bootstrap [#5057](https://github.com/diaspora/diaspora/pull/5057)
 
 ## Bug fixes
 * Fix hiding of poll publisher on close [#5029](https://github.com/diaspora/diaspora/issues/5029)

app/assets/stylesheets/getting-started.css.scss

@@ -0,0 +1,33 @@
+#hello-there {
+  .avatar {
+    width: 50px;
+    height: 50px;
+  }
+
+  .awesome {
+    text-align: center;
+  }
+
+  .hero-unit {
+    margin: 58px 42px;
+    padding: 40px 80px;
+  }
+
+  h2 {
+    margin-top: 80px;
+  }
+
+  p, form {
+    margin-left: 30px;
+  }
+
+  ul.as-selections {
+    width: 100%;
+
+    li.as-original {
+      input {
+        margin-bottom: 15px;
+      }
+    }
+  }
+}

app/assets/stylesheets/new-templates.css.scss

@@ -45,3 +45,6 @@
 
 /* help */
 @import 'help';
+
+/* getting started */
+@import 'getting-started'

app/controllers/users_controller.rb

@@ -5,6 +5,8 @@
 class UsersController < ApplicationController
   before_filter :authenticate_user!, :except => [:new, :create, :public, :user_photo]
 
+  use_bootstrap_for :getting_started
+
   respond_to :html
 
   def edit
@@ -117,8 +119,6 @@ class UsersController < ApplicationController
     @person   = @user.person
     @profile  = @user.profile
 
-    @css_framework = :bootstrap
-    @include_application_css = true #Hack for multiple CSS frameworks and having two main styles
     respond_to do |format|
     format.mobile { render "users/getting_started" }
     format.all { render "users/getting_started", layout: "with_header_with_footer" }

app/views/photos/_new_profile_photo.haml

@@ -60,7 +60,7 @@
 #profile_photo_upload
   = owner_image_tag(:thumb_medium)
 
-  #file-upload.button
+  #file-upload.btn
     =t('.upload')
 
   = image_tag('mobile-spinner.gif', :class => 'hidden', :style => "z-index:-1", :id => 'file-upload-spinner')
@@ -69,4 +69,3 @@
     #fileInfo
 
   #publisher_photo_upload
-

app/views/users/getting_started.haml

@@ -5,11 +5,13 @@
 - content_for :head do
   = javascript_include_tag :profile
 
-%section#hello-there
+.container
+  .row
+    %section#hello-there.span12
       .hero-unit
-    %h1.center
+        %h1.text-center
           = t('.well_hello_there')
-    %h3.center
+        %h3.text-center
           = t(".community_welcome")
 
         = invited_by_message
@@ -42,5 +44,4 @@
               = text_field_tag 'follow_tags', nil, :class => "nostrap"
 
         .awesome
-      = link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, :id => "awesome_button", :class => "button creation"
+          = link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, :id => "awesome_button", :class => "btn creation"
-