consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1711 from consul/annotation-legislation

Browse Source 
Annotation on legislation
This commit is contained in:
Raimond Garcia
2017-06-29 13:33:03 +02:00
committed by GitHub
parent 11e2950eae fe069b6be9
commit f24256c13f
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/assets/stylesheets/annotator_overrides.scss
View File

@@ -102,27 +102,47 @@
.annotator-hl {
cursor: pointer;
background: rgba(255, 255, 10, 0.2);
}
background: rgba(255, 249, 218, 0.75);
.annotator-hl.weight-1 {
background: #fff9da;
}
&.weight-1 {
background: hsla(50, 100, 93, 0.5);
.annotator-hl.weight-2 {
background: #fff5bc;
}
.weight-1 {
background: hsla(50, 100, 93, 0.75);
}
}
.annotator-hl.weight-3 {
background: #fff1a2;
}
&.weight-2 {
background: hsla(63, 78, 86, 0.5);
.annotator-hl.weight-4 {
background: #ffef8c;
}
.weight-2 {
background: hsla(63, 78, 86, 0.75);
}
}
.annotator-hl.weight-5 {
background: #ffe95f;
&.weight-3 {
background: hsla(52, 100, 85, 0.5);
.weight-3 {
background: hsla(52, 100, 85, 0.75);
}
}
&.weight-4 {
background: hsla(51, 91, 75, 0.5);
.weight-4 {
background: hsla(51, 91, 75, 0.75);
}
}
&.weight-5 {
background: hsla(46, 83, 60, 0.5);
.weight-5 {
background: hsla(46, 83, 60, 0.5);
}
}
}
.current-annotation {

4
app/views/legislation/annotations/_form.html.erb
View File

@@ -16,9 +16,7 @@
<div class="comment-actions">
<a class="cancel-comment" href="#" data-cancel-annotation><%= t('legislation.annotations.comments.cancel') %></a>
<%= f.submit class: 'button publish-comment' do %>
<strong><%= t('legislation.annotations.comments.publish_comment') %></strong>
<% end %>
<%= f.submit value: t('legislation.annotations.comments.publish_comment'), class: 'button publish-comment' %>
</div>
<%= f.hidden_field :quote %>

4
spec/features/legislation/draft_versions_spec.rb
View File

@@ -154,11 +154,11 @@ feature 'Legislation Draft Versions' do
page.find(:css, ".legislation-annotatable").double_click
page.find(:css, ".annotator-adder button").click
page.click_button "Create Annotation"
page.click_button "Publish Comment"
expect(page).to have_content "Comment can't be blank"
fill_in 'legislation_annotation_text', with: 'this is my annotation'
page.click_button "Create Annotation"
page.click_button "Publish Comment"
expect(page).to have_css ".annotator-hl"
first(:css, ".annotator-hl").click