From 242430111248f0102f90d6aa3fe65fd8a7e091bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Pankowiak?= <blasecodes@gmail.com>
Date: Thu, 7 Aug 2014 18:08:44 +0200
Subject: [PATCH] Port Community Spotlight to Bootstrap
---
app/assets/stylesheets/contacts.css.scss | 41 ++++++++++++++++++++++++
app/controllers/contacts_controller.rb | 2 +-
app/views/contacts/spotlight.haml | 41 ++++++++++++------------
3 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/app/assets/stylesheets/contacts.css.scss b/app/assets/stylesheets/contacts.css.scss
index d674a5f3c3..e98596f685 100644
--- a/app/assets/stylesheets/contacts.css.scss
+++ b/app/assets/stylesheets/contacts.css.scss
@@ -39,3 +39,44 @@
}
}
}
+
+#community_spotlight {
+ .avatar {
+ width: 140px;
+ height: 140px;
+ }
+
+ .user_card {
+ @include border-radius(3px);
+ @include box-shadow(0,1px,5px,#ccc);
+
+ border: 1px solid #ccc;
+ display: inline-block;
+ margin-bottom: 15px;
+ margin-right: 10px;
+ min-height: 220px;
+ padding: 10px 10px 30px 10px;
+ position: relative;
+ vertical-align: top;
+ width: 140px;
+
+ h4 {
+ margin-bottom: 0px;
+ padding-bottom: 2px;
+ }
+
+ .add_user_to_aspect {
+ bottom: 10px;
+ right: 10px;
+ position: absolute;
+ }
+
+ .dropdown {
+ width: 100%;
+ }
+
+ .tags {
+ color: $text-grey;
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 653f1a4c8c..68e3f6469e 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -5,7 +5,7 @@
class ContactsController < ApplicationController
before_filter :authenticate_user!
- use_bootstrap_for :index
+ use_bootstrap_for :index, :spotlight
def index
respond_to do |format|
diff --git a/app/views/contacts/spotlight.haml b/app/views/contacts/spotlight.haml
index 39a1c5588c..53c8515ea7 100644
--- a/app/views/contacts/spotlight.haml
+++ b/app/views/contacts/spotlight.haml
@@ -8,23 +8,24 @@
- content_for :head do
= javascript_include_tag :people
-#section_header
- %h2
- = t('contacts.index.title')
-
-= render 'shared/contact_sidebar'
-
-.span-18.last{:style => "position:relative;"}
-
- - if AppConfig.settings.community_spotlight.suggest_email.present?
- .right
- = link_to t('contacts.spotlight.suggest_member'), "mailto:#{AppConfig.settings.community_spotlight.suggest_email}", :class => "button"
-
- %h3
- = t('contacts.spotlight.community_spotlight')
- %br
-
- #community_spotlight
- - unless @people.blank?
- - @people.each do |person|
- = render 'community_spotlight/user', :person => person
+.row
+ .span12
+ #section_header
+ %h3
+ = t('contacts.index.title')
+
+.row
+ = render 'shared/contact_sidebar'
+
+ .span9
+ - if AppConfig.settings.community_spotlight.suggest_email.present?
+ .right
+ = link_to t('contacts.spotlight.suggest_member'), "mailto:#{AppConfig.settings.community_spotlight.suggest_email}", :class => "button"
+
+ %h3
+ = t('contacts.spotlight.community_spotlight')
+
+ #community_spotlight
+ - unless @people.blank?
+ - @people.each do |person|
+ = render 'community_spotlight/user', :person => person
--
GitLab