From db67eefeab2cb17a564973651f5e62c4e68ec8b1 Mon Sep 17 00:00:00 2001
From: Loic <loic.sans@gmail.com>
Date: Wed, 10 Feb 2016 11:55:17 +0200
Subject: [PATCH] [#1897] part commit WIP

---
 akvo/rsr/static/scripts-src/results-data.js  |   4 +-
 akvo/rsr/static/scripts-src/results-data.jsx |   2 +-
 akvo/rsr/static/styles-src/main.css          |  35 ++++---
 akvo/rsr/static/styles-src/main.scss         | 105 +++++++++++--------
 4 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/akvo/rsr/static/scripts-src/results-data.js b/akvo/rsr/static/scripts-src/results-data.js
index f79398361c..50aebca0d2 100644
--- a/akvo/rsr/static/scripts-src/results-data.js
+++ b/akvo/rsr/static/scripts-src/results-data.js
@@ -486,7 +486,7 @@ var UpdateEntry = React.createClass({displayName: 'UpdateEntry',
                             React.DOM.ul( {className:"nav nav-pills bottomRow navbar-right"}, 
                                 React.DOM.li( {role:"presentation", className:"returnUpdate"}, React.DOM.a(
                                     {onClick:this.returnForRevision,
-                                    className:"btn btn-default btn-sm"}, i18n.return_for_revision)
+                                    className:"btn btn-default btn-xs"}, i18n.return_for_revision)
                                 ),
                                 React.DOM.li( {role:"presentation", className:"editUpdate"}, React.DOM.a(
                                     {onClick:this.switchEdit,
@@ -511,7 +511,7 @@ var UpdateEntry = React.createClass({displayName: 'UpdateEntry',
                             React.DOM.ul( {className:"nav nav-pills bottomRow navbar-right"}, 
                                 React.DOM.li( {role:"presentation", className:"editUpdate"}, React.DOM.a(
                                     {onClick:this.switchEdit,
-                                    className:"btn btn-default btn-xs1"}, i18n.edit_update))
+                                    className:"btn btn-default btn-xs"}, i18n.edit_update))
                             )
                         );
                     } else {
diff --git a/akvo/rsr/static/scripts-src/results-data.jsx b/akvo/rsr/static/scripts-src/results-data.jsx
index 8dc2313cab..2893d76c80 100644
--- a/akvo/rsr/static/scripts-src/results-data.jsx
+++ b/akvo/rsr/static/scripts-src/results-data.jsx
@@ -486,7 +486,7 @@ var UpdateEntry = React.createClass({
                             <ul className="nav nav-pills bottomRow navbar-right">
                                 <li role="presentation" className="returnUpdate"><a
                                     onClick={this.returnForRevision}
-                                    className="btn btn-default btn-sm">{i18n.return_for_revision}</a>
+                                    className="btn btn-default btn-xs">{i18n.return_for_revision}</a>
                                 </li>
                                 <li role="presentation" className="editUpdate"><a
                                     onClick={this.switchEdit}
diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css
index 2659f770cf..6b394c9224 100755
--- a/akvo/rsr/static/styles-src/main.css
+++ b/akvo/rsr/static/styles-src/main.css
@@ -2260,11 +2260,17 @@ body.translationBarActive div.skiptranslate ~ #map {
       .results .baseline .baseline-value span:nth-child(2),
       .results .baseline .baseline-year span:nth-child(2), .results .baseline .period-target span:nth-child(2), .results .baseline .period-actual span:nth-child(2), .results .periodValues .baseline-value span:nth-child(2),
       .results .periodValues .baseline-year span:nth-child(2), .results .periodValues .period-target span:nth-child(2), .results .periodValues .period-actual span:nth-child(2) {
-        font-size: 1.6em;
         display: block;
         font-weight: bold;
-        color: #515050;
-        margin-left: 5px; }
+        color: #515050; }
+        .results .baseline .baseline-value span:nth-child(2) span,
+        .results .baseline .baseline-year span:nth-child(2) span, .results .baseline .period-target span:nth-child(2) span, .results .baseline .period-actual span:nth-child(2) span, .results .periodValues .baseline-value span:nth-child(2) span,
+        .results .periodValues .baseline-year span:nth-child(2) span, .results .periodValues .period-target span:nth-child(2) span, .results .periodValues .period-actual span:nth-child(2) span {
+          display: inline; }
+        .results .baseline .baseline-value span:nth-child(2) span:nth-child(2),
+        .results .baseline .baseline-year span:nth-child(2) span:nth-child(2), .results .baseline .period-target span:nth-child(2) span:nth-child(2), .results .baseline .period-actual span:nth-child(2) span:nth-child(2), .results .periodValues .baseline-value span:nth-child(2) span:nth-child(2),
+        .results .periodValues .baseline-year span:nth-child(2) span:nth-child(2), .results .periodValues .period-target span:nth-child(2) span:nth-child(2), .results .periodValues .period-actual span:nth-child(2) span:nth-child(2) {
+          margin-left: 10px; }
     .results .baseline .baseline-value, .results .baseline .period-target, .results .periodValues .baseline-value, .results .periodValues .period-target {
       float: left; }
     .results .baseline .baseline-year, .results .baseline .period-actual, .results .periodValues .baseline-year, .results .periodValues .period-actual {
@@ -2273,8 +2279,9 @@ body.translationBarActive div.skiptranslate ~ #map {
     width: 30%;
     min-width: 200px;
     overflow-y: auto;
-    vertical-align: top;
-    border: 1px solid rgba(32, 32, 36, 0.3); }
+    vertical-align: top; }
+    .results .sidebar .results-list {
+      border: 1px solid rgba(32, 32, 36, 0.3); }
     .results .sidebar .result-nav {
       padding: 0.2em 0em 0 0em;
       border-bottom: 1px solid rgba(32, 32, 36, 0.6); }
@@ -2290,7 +2297,8 @@ body.translationBarActive div.skiptranslate ~ #map {
         -webkit-transition: background-color 0.25s ease-in-out;
         transition: background-color 0.25s ease-in-out; }
     .results .sidebar .result-nav-header {
-      border-bottom: 1px solid rgba(32, 32, 36, 0); }
+      border-bottom: 1px solid rgba(32, 32, 36, 0);
+      background: rgba(32, 32, 36, 0.1); }
       .results .sidebar .result-nav-header h3 {
         color: white;
         display: inline-block;
@@ -2753,12 +2761,12 @@ body.translationBarActive div.skiptranslate ~ #map {
       .results .update-container .update-entry-container .comments .input-group {
         margin-top: 20px;
         /* button {
-                        background: $akvoBlack;
-                        color:white;
-                        &:hover {
-                            background: $akvoPurple;
-                        }
-                    }*/ }
+                           background: $akvoBlack;
+                           color:white;
+                           &:hover {
+                               background: $akvoPurple;
+                           }
+                       }*/ }
       .results .update-container .update-entry-container .comments .comment {
         margin-top: 20px;
         margin-bottom: 20px; }
@@ -3263,3 +3271,6 @@ div#my-reports {
     margin: 1em 0; }
   div#my-reports .pointerEvents {
     pointer-events: initial; }
+
+.results-list div:last-child .result-nav {
+  border-bottom: none; }
diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss
index 688f7bb4f0..2ded09b623 100755
--- a/akvo/rsr/static/styles-src/main.scss
+++ b/akvo/rsr/static/styles-src/main.scss
@@ -634,6 +634,7 @@ nav.navbar-fixed-top {
         background: $rsrBlue;
     }
 }
+
 .indicator-period-list {
     thead {
         tr {
@@ -647,17 +648,18 @@ nav.navbar-fixed-top {
     }
     tbody {
         &.indicator-period {
-            border:none;
+            border: none;
             tr {
                 td {
-                    padding-top:25px;
-                    padding-bottom:25px;
-                    border:none;
+                    padding-top: 25px;
+                    padding-bottom: 25px;
+                    border: none;
                 }
             }
         }
     }
 }
+
 .myProjectList,
 #updates,
 #user_table {
@@ -2744,11 +2746,15 @@ body {
                 display: block;
             }
             span:nth-child(2) {
-                font-size: 1.6em;
                 display: block;
                 font-weight: bold;
                 color: rgb(81, 80, 80);
-                margin-left: 5px;
+                span {
+                    display: inline;
+                }
+                span:nth-child(2) {
+                    margin-left: 10px;
+                }
             }
         }
         .baseline-value, .period-target {
@@ -2763,7 +2769,9 @@ body {
         min-width: 200px;
         overflow-y: auto;
         vertical-align: top;
-        border: 1px solid rgba($akvoBlack, 0.3);
+        .results-list {
+            border: 1px solid rgba($akvoBlack, 0.3);
+        }
         .result-nav {
             padding: 0.2em 0em 0 0em;
             border-bottom: 1px solid rgba($akvoBlack, 0.6);
@@ -2780,6 +2788,7 @@ body {
         }
         .result-nav-header {
             border-bottom: 1px solid rgba($akvoBlack, 0);
+            background: rgba($akvoBlack, 0.1);
             h3 {
                 color: rgba(white, 1);
                 display: inline-block;
@@ -2824,7 +2833,7 @@ body {
                             margin-right: 6px;
                             text-shadow: 0 1px 0 rgb(255, 255, 255);
                             color: rgba($akvoPurple, 0.6);
-                            }
+                        }
                         > span {
                             box-sizing: border-box;
                             max-width: 80%;
@@ -2841,7 +2850,6 @@ body {
             .fa-chevron-circle-up {
                 display: none;
             }
-
             &.expanded {
                 opacity: 1;
                 &:before {
@@ -2856,7 +2864,6 @@ body {
                     }
                 }
             }
-
             .result-indicator-count {
                 color: $akvoPurple;
                 display: block;
@@ -2950,21 +2957,21 @@ body {
         vertical-align: top;
         overflow-y: scroll;
         padding: 0.25em 1em;
-        background-color: rgba(245, 245, 245,0.2);
+        background-color: rgba(245, 245, 245, 0.2);
         @include flex(1);
         .indicator-period {
-            .indicTitle{
+            .indicTitle {
                 position: relative;
                 .indicator-title {
                     i {
                         display: none;
-                        }
                     }
+                }
                 .new-update {
                     position: absolute;
                     display: inline-block;
-                    top:0;
-                    right:0;
+                    top: 0;
+                    right: 0;
                 }
             }
         }
@@ -3027,8 +3034,8 @@ body {
                 /*background-color: rgb(235,235,231);*/
                 tbody {
                     &.indicator-period {
-                        border:none;
-                        padding:15px 0;
+                        border: none;
+                        padding: 15px 0;
                     }
                     &.expanded {
                         background-color: white;
@@ -3336,10 +3343,10 @@ body {
             top: -1000px;
         }
     }
-    .update-container{
-        background: rgba($akvoBlack,0);
-        border:1px solid rgba($akvoBlack,0.1);
-        padding:0 1em 0.75em 1em;
+    .update-container {
+        background: rgba($akvoBlack, 0);
+        border: 1px solid rgba($akvoBlack, 0.1);
+        padding: 0 1em 0.75em 1em;
         margin-bottom: 20px;
         .update-entry-container {
             margin-bottom: 2em;
@@ -3349,46 +3356,50 @@ body {
                 border-left: none;
             }
             .update-entry-container-header {
-                background: rgba($akvoBlack,0.1);
-                padding:0.75em 0;
-                .update-user {color:$akvoPurple;}
-                .update-created-at {margin-left: 15px;}
-                .update-status {color:$akvoTvRed;}
+                background: rgba($akvoBlack, 0.1);
+                padding: 0.75em 0;
+                .update-user {
+                    color: $akvoPurple;
+                }
+                .update-created-at {
+                    margin-left: 15px;
+                }
+                .update-status {
+                    color: $akvoTvRed;
+                }
             }
             .comments {
                 .input-group {
                     margin-top: 20px;
-                 /* button {
-                        background: $akvoBlack;
-                        color:white;
-                        &:hover {
-                            background: $akvoPurple;
-                        }
-                    }*/
+                    /* button {
+                           background: $akvoBlack;
+                           color:white;
+                           &:hover {
+                               background: $akvoPurple;
+                           }
+                       }*/
                 }
                 .comment {
                     margin-top: 20px;
                     margin-bottom: 20px;
                     .comment-header {
-                        margin-bottom:5px;
+                        margin-bottom: 5px;
                         font-weight: bold;
                     }
-                    .comment-text {
-
-                    }
+                    .comment-text {}
                 }
             }
             .bottomRow {
                 margin-top: 20px;
-                padding:0.75em;
+                padding: 0.75em;
                 position: relative;
-                .btn {                        
+                .btn {
                     background: $akvoBlack;
-                    color:white;
+                    color: white;
                     &:hover {
                         background: $akvoPurple;
-                        }
                     }
+                }
                 .cancelUpdate {}
                 .editUpdate {}
                 .saveUpdate {}
@@ -3400,7 +3411,7 @@ body {
                 margin-top: 20px;
                 margin-bottom: 15px;
                 .update-actual-value-text {
-                    color:rgba($akvoBlack,0.4);
+                    color: rgba($akvoBlack, 0.4);
                 }
                 .update-actual-value-data {
                     font-weight: bold;
@@ -3970,4 +3981,14 @@ div#my-reports {
     .pointerEvents {
         pointer-events: initial;
     }
+}
+
+.results-list {
+    div {
+        &:last-child {
+            .result-nav {
+                border-bottom: none;
+            }
+        }
+    }
 }
\ No newline at end of file