Skip to content

Update the appearance of the logo #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cintia-valente wants to merge 2 commits into
base: new-design
Choose a base branch
from
Open

Update the appearance of the logo #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee229fd
Update the appearance of the logo
cintia-valente May 30, 2018
333bc91
Changes
cintia-valente Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/cam-edit-user-avatar.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 6 additions & 20 deletions app/assets/stylesheets/app/application/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,6 @@ form {
}
}

.navbar-user-chip.open {
.navbar-user-toggle {
.border {
border: $m-logo-border-size solid $m-color-primary-soft;
border-radius: 50%;
}
}
}

.navbar-user-chip {
font-size: $m-font-mini;
margin: ($m-navbar-height - $m-navbar-btn-size - $m-logo-border-size - $m-logo-border-size)/2 0;
Expand All @@ -432,29 +423,24 @@ form {
background: $m-navbar-font-highlight;
}

.border {
border: $m-logo-border-size solid $m-logo-border;
border-radius: 50%;
@include transition(all 0.2s ease-in-out);
}

.border:hover {
border: $m-logo-border-size solid $m-color-primary-soft;
border-radius: 50%;
}

img, .logo-user {
height: $m-navbar-btn-size;
width: $m-navbar-btn-size;
float: none;
display: inline-block;
border: $m-logo-border-size solid $m-logo-border;
font-size: $m-logo-font-size;
padding: 2px;
transition: border .2s ease-in;

&.logo-initials {
padding: $m-logo-initials-padding;
}
}

.logo-user:hover {
border: $m-logo-border-size solid $m-color-primary-soft;
}
}

.navbar-user-menu {
Expand Down
34 changes: 29 additions & 5 deletions app/assets/stylesheets/app/users/show.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,46 @@ body.users.update {
font-weight: $m-font-weight-bold;
}

@include logo-container;
.logo-image-container {
margin-top: -180px;
height: 250px;
}

.logo-user {
height: 250px;
width: 250px;
float: none;
margin-top: -35%;
display: inline-block;
border: 1px solid $m-logo-border;
border-radius: 50%;
border: 10px solid $m-logo-border;
margin: 0 auto;

&.logo-initials {
padding: 90px 0;
font-size: 80px;
}
}

.logo-image-controls {
height: 250px;
width: 250px;
background: rgba(10, 23, 55, 0.5);
border-radius: 50%;
position: absolute;
left: 0;
top: 0;
right: 0;
margin: 0 auto;
border: 10px solid $m-logo-border;
}

.logo-image-text {
color: white;
margin-top: 65px;
img {
height: 85px;
width: 110px;
}
}

.dropdown-toggle {
background: none;
}
Expand Down
8 changes: 2 additions & 6 deletions app/helpers/logo_images_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,9 @@ def logo_image(resource, options={})
elsif version_name == :logo336x256
version_name = :logo168x128 unless resource.logo_image.send(version_name).file.exists?
end
content_tag :div, class: 'border' do
concat image_tag(resource.logo_image_url(version_name), options)
end
image_tag(resource.logo_image_url(version_name), options)
else
content_tag :div, class: 'border' do
concat logo_initials(resource, options)
end
logo_initials(resource, options)
end

# Try a gravatar image if we have a confirmed user
Expand Down
6 changes: 5 additions & 1 deletion app/views/users/edit_data.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
#content-strip.container-fluid
.dropdown
.dropdown-toggle{ data: { toggle: 'dropdown' } }
= logo_image(@user, class: "logo-user")
.logo-image-container
= logo_image(@user, class: "logo-user")
.logo-image-controls
.logo-image-text
=image_tag("cam-edit-user-avatar.png")
%ul.dropdown-menu.dropdown-menu-right
%li= upload_logo_controls(@user)
%li= link_to t('.remove_picture'), remove_logo_user_path(@user), method: "post"
Expand Down
3 changes: 2 additions & 1 deletion app/views/users/show.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
= render :partial => 'users/menu'

#content-strip.container-fluid
= logo_image(@user, class: "logo-user")
.logo-image-container
= logo_image(@user, class: "logo-user")

.user-profile
%span.name= @user.name
Expand Down