diff --git a/app/assets/stylesheets/skills.css.erb b/app/assets/stylesheets/skills.css.erb index eaafd94..3de2693 100644 --- a/app/assets/stylesheets/skills.css.erb +++ b/app/assets/stylesheets/skills.css.erb @@ -1,32 +1,49 @@ /* Edit/Delete/New button styles */ a.new-skill, a.edit-skill, a.delete-skill { - position: absolute; - right: 0; - top: 3px; + position: absolute; + right: 0; + top: 3px; } + a.edit-skill { - right: 120px; + right: 120px; } /* Skill index styles */ .skills > .third { - text-align: center; - margin: 10px; - padding: 20px; - width: 30%; - width: calc(33.3% - 20px); - -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + position: relative; + text-align: center; + margin: 10px; + padding: 20px 20px 70px 20px; + width: 30%; + width: calc(33.3% - 20px); + -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } + .skills > .third:nth-child(3n+1) { - margin-left: 0; - margin-right: 20px; + margin-left: 0; + margin-right: 20px; } + .skills > .third:nth-child(3n) { - margin-right: 0; - margin-left: 20px; + margin-right: 0; + margin-left: 20px; +} + +.skills > .third a { + position: absolute; + bottom: 20px; + left: 0; + right: 0; + margin: 0 auto; + width: 70px; +} +.skills > .third p +{ + margin-bottom: 0; } \ No newline at end of file diff --git a/app/models/skill.rb b/app/models/skill.rb index e8e9f75..a627edb 100644 --- a/app/models/skill.rb +++ b/app/models/skill.rb @@ -4,6 +4,5 @@ class Skill < ActiveRecord::Base validates :color, :presence => {:message => 'The color field cannot be blank'} validates :summary, :presence => {:message => 'The summary field cannot be blank'} validates :content, :presence => {:message => 'The content field cannot be blank'} - validates :knowledge, :presence => {:message => 'The knowledge field cannot be blank'} end diff --git a/app/views/skills/edit.html.erb b/app/views/skills/edit.html.erb index 9c59c86..b4d3806 100644 --- a/app/views/skills/edit.html.erb +++ b/app/views/skills/edit.html.erb @@ -17,8 +17,6 @@ <%= skill_form.text_area(:summary) %> <%= skill_form.label(:content, 'Content') %> <%= skill_form.text_area(:content) %> - <%= skill_form.label(:knowledge, 'Knowledge') %> - <%= skill_form.number_field(:knowledge) %> <%= skill_form.check_box(:visible) %> <%= skill_form.label(:visible, 'Publicly visible') %> <%= skill_form.submit('Update Skill', :class => 'button') %> diff --git a/app/views/skills/index.html.erb b/app/views/skills/index.html.erb index 6071802..0a0f91e 100644 --- a/app/views/skills/index.html.erb +++ b/app/views/skills/index.html.erb @@ -20,11 +20,7 @@ <% @skills.each do |skill| %>

<%= skill.name %>

-

<%= skill.summary %>

- -

<%= skill.knowledge %>/100

-
More Info diff --git a/app/views/skills/new.html.erb b/app/views/skills/new.html.erb index 0941569..1ff8f5e 100644 --- a/app/views/skills/new.html.erb +++ b/app/views/skills/new.html.erb @@ -17,8 +17,6 @@ <%= skill_form.text_area(:summary) %> <%= skill_form.label(:content, 'Content') %> <%= skill_form.text_area(:content) %> - <%= skill_form.label(:knowledge, 'Knowledge') %> - <%= skill_form.number_field(:knowledge) %> <%= skill_form.submit('Create Skill', :class => 'button') %> <% end %> \ No newline at end of file diff --git a/db/migrate/20160519073514_remove_knowledge_from_skills.rb b/db/migrate/20160519073514_remove_knowledge_from_skills.rb new file mode 100644 index 0000000..60cdc42 --- /dev/null +++ b/db/migrate/20160519073514_remove_knowledge_from_skills.rb @@ -0,0 +1,5 @@ +class RemoveKnowledgeFromSkills < ActiveRecord::Migration + def change + remove_column :skills, :knowledge, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index d8eae97..1f3a3b9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160519070409) do +ActiveRecord::Schema.define(version: 20160519073514) do create_table "messages", force: :cascade do |t| t.string "name" @@ -49,7 +49,6 @@ t.text "summary" t.text "content" t.string "color" - t.integer "knowledge" t.boolean "visible" end