Merge branch 'master' into legislation-module-stable

2017-01-17 15:45:33 +01:00
parent ac810dbbcc 6c227547e2
commit 6c36fde6cc
13 changed files with 247 additions and 178 deletions
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -895,6 +895,11 @@
  .info {
    background: #6A2A72;

+    p {
+      margin-bottom: 0;
+      text-transform: uppercase;
+    }
+
    @include breakpoint(medium) {
      border-top: rem-calc(6) solid #54225C;
    }