Merge pull request #1131 from akvo/1130_org_page_ui

[#1130] Fixed Organisation description text
akvo · Feb 18, 2015 · 7c32689 · 7c32689
2 parents 1f05708 + 5684eba
commit 7c32689
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/akvo/rsr/static/rsr/v3/css/src/main.css b/akvo/rsr/static/rsr/v3/css/src/main.css
@@ -1035,6 +1035,10 @@ div.textBlock {
 /* Organisation Page */
 .organisationDetail .organisationHeader {
   background: rgba(32, 32, 36, 0.05); }
+.organisationDetail .orgDescr {
+  background-color: rgba(218, 218, 218, 0.4); }
+  .organisationDetail .orgDescr p {
+    padding-left: 20px; }
 .organisationDetail h1 {
   margin-top: 0;
   margin-bottom: 20px;
@@ -1051,7 +1055,7 @@ div.textBlock {
     width: 35%;
     margin-left: 5px; }
 .organisationDetail .orgDetails {
-  background: rgba(255, 255, 255, 0.05);
+  background: rgba(255, 255, 255, 0.45);
   -moz-border-radius: 5px;
   -o-border-radius: 5px;
   -webkit-border-radius: 5px;

diff --git a/akvo/rsr/static/rsr/v3/css/src/main.scss b/akvo/rsr/static/rsr/v3/css/src/main.scss
@@ -1276,6 +1276,12 @@ div.textBlock {
     .organisationHeader {
         background: rgba($akvoBlack, 0.05);
     }
+    .orgDescr {
+        background-color: rgba(218,218,218, 0.4);
+        p {
+            padding-left: 20px;
+        }
+    }
     h1 {
         margin-top:0;
         margin-bottom:20px;
@@ -1296,7 +1302,7 @@ div.textBlock {
         }
     }
     .orgDetails {
-        background: rgba(white, 0.05);
+        background: rgba(white, 0.45);
         @include border-radius(5px);
     }
 }

diff --git a/akvo/templates/organisation_main.html b/akvo/templates/organisation_main.html
@@ -3,7 +3,9 @@
 {% block title %}{{organisation.name}}{% endblock %}
 {% block maincontent %}
   <div class="container organisationDetail">
+
     <div class="row verticalPadding organisationHeader">
+
       <div class="col-sm-6">
         <div class="col-sm-12">
           <h1><i class="fa fa-users"></i> {{organisation.name}}</h1>
@@ -14,8 +16,10 @@ <h1><i class="fa fa-users"></i> {{organisation.name}}</h1>
           {% endif %}
         </div>
       </div>
+
       <div class="col-sm-5 orgDetails">
         <h4>Details</h4>
+
         <ul class="noStyleUl">
           <li>
             {% if organisation.url %}<a href="{{organisation.url}}">{{organisation.url}}</a>{% endif %}
@@ -46,7 +50,9 @@ <h4>Details</h4>
           {% if organisation.contact_email or organisation.phone %}
           </li>
         </ul>
+
         <h4 class="topMargin">Contact information</h4>
+
         <ul class="noStyleUl">
           <li>
             {% if organisation.contact_email %}
@@ -59,13 +65,19 @@ <h4 class="topMargin">Contact information</h4>
             {% endif %}
           </li>
         {% endif %}
-        <li class="topMargin">
-          {{organisation.description|linebreaks}}
-        </li>
       </ul>
+
     </div>
+
+  </div>
+  <div class="row orgDescr">
+      <div class="col-sm-8 verticalPadding">
+        <p>{{organisation.description|linebreaks}}</p>
+      </div>
   </div>
+
 </div>
+
 <div class="container">
   <div class="row verticalPadding">
     <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">