Skip to content
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.

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

Feature/project avatar #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/project avatar #8

wants to merge 5 commits into from

Conversation

Razer6
Copy link
Owner

@Razer6 Razer6 commented Oct 25, 2014

No description provided.

Popl7 and others added 2 commits August 2, 2014 08:55
added avatar removal
show project avatar on dashboard, projects page, project page
added rspec and feature tests
added project avatar from repository
new default project icon added
added copying af avatar to forking of project
added generated icon
fixed avatar fork
hound fix
style fix
test fix
… into feature/project-avatar

Conflicts:
	app/assets/javascripts/project.js.coffee
	app/assets/stylesheets/sections/dashboard.scss
	app/models/project.rb
	app/views/projects/_home_panel.html.haml
	spec/models/project_spec.rb
brightness = bg_color[0, 2].hex + bg_color[2, 2].hex + bg_color[4, 2].hex
text_color = (brightness > 375) ? '#000' : '#fff'
content_tag(:div, class: options[:class],
style: "background-color: ##{ bg_color }; color: #{ text_color }") do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align the elements of a hash literal if they span more than one line.

@@ -116,6 +117,13 @@ class Project < ActiveRecord::Base
validates :star_count, numericality: { greater_than_or_equal_to: 0 }
validate :check_limit, on: :create

validate :avatar_type,
if: ->(project) { project.avatar &&
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align the parameters of a method call if they span more than one line.
Avoid using {...} for multi-line blocks.
Block body expression is on the same line as the block start.

Copy link
Owner Author

@Razer6 Razer6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erereree

$('.js-choose-project-avatar-button').bind "click", ->
form = $(this).closest("form")
form.find(".js-project-avatar-input").click()

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

foo

text-align: center;
vertical-align: top;

&.s16 { font-size: 12px; line-height: 1.33; }
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

er

font-size: 20px;
margin-bottom: 15px;

border: 1px solid #EEE;
padding: 8px 12px;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reer

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants