Fixed myrsr headers.

akvo · Mar 31, 2016 · a317324 · a317324
1 parent e2897b7
commit a317324
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css
@@ -572,6 +572,13 @@ nav.navbar-fixed-top {
   margin: -20px 0 10px 0;
   padding-top: 10px; }
 
+.myRsrPg h3 {
+  display: inline-block;
+  margin-top: 20px; }
+
+.choose-report-template label {
+  display: block; }
+
 .myRsrMenu {
   position: relative;
   margin: 5px auto 0 auto; }
@@ -610,7 +617,7 @@ nav.navbar-fixed-top {
   margin-bottom: 25px; }
 
 #createProject {
-  margin: 20px 0 0 25px;
+  margin: -5px 0 0 25px;
   background: #202024;
   color: white;
   border: none; }
@@ -812,6 +819,7 @@ div.paginationWrap {
 
 #organisations {
   background: rgba(32, 32, 36, 0);
+  padding-top: 15px;
   padding-bottom: 15px;
   margin-top: 25px;
   -moz-box-shadow: 0 0 2px rgba(32, 32, 36, 0.3);
@@ -1484,8 +1492,11 @@ div.projectTopRow {
         div.projectTopRow .projectSideInfo ul li .donateButton {
           margin-right: 15px; }
 
-#invite_button button {
-  margin: 20px 0 0 25px; }
+#invite_button {
+  display: inline-block;
+  margin: -5px 0 0 10px; }
+  #invite_button button {
+    margin: 0px 0 0 0px; }
 
 div.textBlock {
   margin: 10px auto; }

diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss
@@ -618,7 +618,17 @@ nav.navbar-fixed-top {
     margin: -20px 0 10px 0;
     padding-top: 10px;
 }
-
+.myRsrPg {
+    h3 {
+        display: inline-block;
+        margin-top: 20px;
+    }
+}
+.choose-report-template {
+    label {
+        display: block;
+    }
+}
 .myRsrMenu {
     position: relative;
     margin: 5px auto 0 auto;
@@ -666,7 +676,7 @@ nav.navbar-fixed-top {
 }
 
 #createProject {
-    margin: 20px 0 0 25px;
+    margin: -5px 0 0 25px;
     background: $akvoBlack;
     color: white;
     border: none;
@@ -919,6 +929,7 @@ div.paginationWrap {
 
 #organisations {
     background: rgba($akvoBlack, 0.0);
+    padding-top: 15px;
     padding-bottom: 15px;
     margin-top: 25px;
     @include box-shadow(0 0 2px rgba($akvoBlack, 0.3));
@@ -1770,8 +1781,11 @@ div.projectTopRow {
 }
 
 #invite_button {
+    display: inline-block;
+    margin: -5px 0 0 10px;
+
     button {
-        margin: 20px 0 0 25px;
+        margin: 0px 0 0 0px;
     }
 }
 

diff --git a/akvo/templates/myrsr/my_projects.html b/akvo/templates/myrsr/my_projects.html
@@ -2,7 +2,7 @@
 {% load i18n rsr_utils rules compressed %}
 {% block title %}{% trans "MyRSR - my projects" %}{% endblock %}
 {% block myrsr_main %}
-      <div class="col-sm-6"><h3 style="display: inline-block; float:left;">{% trans "My projects" %}</h3>
+      <div class="col-sm-6"><h3>{% trans "My projects" %}</h3>
           {% has_perm 'rsr.add_project' user as can_add_project %}
           {% if can_add_project and user.can_create_project %}
             <button class="btn btn-default btn-sm" id="createProject"><i class="fa fa-plus"></i> {% trans 'Add a new project' %}</button>

diff --git a/akvo/templates/myrsr/myrsr_base.html b/akvo/templates/myrsr/myrsr_base.html
@@ -33,7 +33,7 @@
         </div>
     </div>
 
-    <div class="container">
+    <div class="container myRsrPg">
         <div class="row">
             {% block myrsr_main %}{% endblock myrsr_main %}
         </div>

diff --git a/akvo/templates/myrsr/user_management.html b/akvo/templates/myrsr/user_management.html
@@ -6,7 +6,7 @@
 
 {% block myrsr_main %}
 <div class="col-sm-6">
-    <h3  style="display: inline-block; float:left;">{% trans 'User management' %}</h3>
+    <h3>{% trans 'User management' %}</h3>
     {% has_perm 'rsr.change_employment' user as can_change_employments %}
     {% if not can_change_employments %}
         <p class="noItem text-center verticalPadding col-sm-6 col-sm-offset-3">