Skip to content

Commit

Permalink
[#2011] Merge in #1966 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@KasperBrandt
KasperBrandt committed Mar 31, 2016
2 parents fad1e62 + 7772dbf commit 5521dd0
Show file tree
Hide file tree
Showing 5 changed files with 173 additions and 58 deletions.
12 changes: 12 additions & 0 deletions akvo/rsr/static/styles-src/library.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,3 +295,15 @@ $transitionable-prefixed-values: transform, transform-origin !default;
transition-delay: $delays
));
}


@function calculateRem($size) {
$remSize: $size / 16px;

@return $remSize * 1rem;
}

@mixin font-size($size) {
font-size: $size;
font-size: calculateRem($size);
}
122 changes: 86 additions & 36 deletions akvo/rsr/static/styles-src/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,34 @@ body {
width: 100%;
height: 100%;
color: #394c50;
line-height: 1.42857;
text-rendering: optimizelegibility;
font-family: 'Poppins', 'Questrial', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
padding-top: 75px; }
padding-top: 75px;
font-size: 24px;
font-size: 1.5rem;
line-height: 1.5; }
@media (max-width: 900px) {
body {
font-size: 20px;
font-size: 1.25rem; } }
@media (max-width: 500px) {
body {
font-size: 18px;
font-size: 1.125rem; } }
@media only screen and (max-width: 768px) {
body {
padding-top: 65px; } }

h1, h2, h3, h4, h5, h6, p, ul, ol {
margin-top: 0;
margin-bottom: 1rem; }

h1, h2, h3, h4, h5, h6 {
font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal;
color: #2c2a74; }
color: #2c2a74;
margin-bottom: .5rem;
line-height: 1.1; }

a, a:link, a:visited {
outline: none;
Expand Down Expand Up @@ -593,16 +609,18 @@ nav.navbar-fixed-top {
padding-bottom: 15px; }
.indicator-period-list tbody.indicator-period {
border: none; }
.indicator-period-list tbody.indicator-period tr td {
padding-top: 25px;
padding-bottom: 25px;
border: none; }
.indicator-period-list tbody.indicator-period tr td.actions-td .btn-default {
margin-top: -7px;
background: #202024;
color: white; }
.indicator-period-list tbody.indicator-period tr td.actions-td .btn-default:hover {
background: #2c2a74; }
.indicator-period-list tbody.indicator-period tr {
border-bottom: 1px solid rgba(32, 32, 36, 0.05); }
.indicator-period-list tbody.indicator-period tr td {
padding-top: 25px;
padding-bottom: 25px;
border: none; }
.indicator-period-list tbody.indicator-period tr td.actions-td .btn-default {
margin-top: -7px;
background: #202024;
color: white; }
.indicator-period-list tbody.indicator-period tr td.actions-td .btn-default:hover {
background: #2c2a74; }

.myProjectList thead tr, #updates thead tr, #user_table thead tr {
background-color: rgba(32, 32, 36, 0.05);
Expand Down Expand Up @@ -895,6 +913,8 @@ h4.detailedInfo {
color: white;
border: 1px solid rgba(255, 255, 255, 0.2);
transition: all 0.4s ease-in;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
.searchContainer #search .showFilters:hover {
background: rgba(255, 85, 0, 0);
Expand Down Expand Up @@ -1506,7 +1526,8 @@ div.textBlock {
color: #2c2a74; }
#project-footer #project-footer-right {
border: 1px solid rgba(32, 32, 36, 0.05);
padding: 1.5em; }
padding: 0.25em 1.5em;
background: rgba(255, 255, 255, 0.3); }

#draft {
background: rgba(224, 79, 70, 0.2);
Expand Down Expand Up @@ -1805,6 +1826,19 @@ dd.currencyAmount {
margin-left: auto; }

/* Project report page */
@media only screen and (max-width: 768px) {
.projectReport tr {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 0.5em 0;
border: 1px solid rgba(3, 3, 3, 0.2); }
.projectReport td, .projectReport th {
flex: 1 1 150px;
border: 0.5px solid rgba(3, 3, 3, 0.2); }
.projectReport td.edit-buttons, .projectReport td.empty {
/*flex: 1 0 90%;
text-align: center;*/ } }
@media only screen and (max-width: 768px) {
.projectReport {
max-width: 95%;
Expand Down Expand Up @@ -2224,7 +2258,7 @@ article {
position: relative;
width: 100%;
margin-bottom: 55px;
font-size: 110%; }
font-size: 115%; }
.baseline .baseline-value, .baseline .baseline-year, .baseline .period-target, .baseline .period-actual, .baseline .period-target-comment, .periodValues .baseline-value, .periodValues .baseline-year, .periodValues .period-target, .periodValues .period-actual, .periodValues .period-target-comment {
display: inline-block !important;
padding: 0 0 10px 15px; }
Expand All @@ -2237,11 +2271,13 @@ article {
display: block;
font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700;
color: rgba(32, 32, 36, 0.9); }
color: rgba(44, 42, 116, 0.9); }
.baseline .baseline-value span:nth-child(2n) span, .baseline .baseline-year span:nth-child(2n) span, .baseline .period-target span:nth-child(2n) span, .baseline .period-actual span:nth-child(2n) span, .baseline .period-target-comment span:nth-child(2n) span, .periodValues .baseline-value span:nth-child(2n) span, .periodValues .baseline-year span:nth-child(2n) span, .periodValues .period-target span:nth-child(2n) span, .periodValues .period-actual span:nth-child(2n) span, .periodValues .period-target-comment span:nth-child(2n) span {
display: inline; }
.baseline .baseline-value span:nth-child(2n) span:nth-child(1), .baseline .baseline-year span:nth-child(2n) span:nth-child(1), .baseline .period-target span:nth-child(2n) span:nth-child(1), .baseline .period-actual span:nth-child(2n) span:nth-child(1), .baseline .period-target-comment span:nth-child(2n) span:nth-child(1), .periodValues .baseline-value span:nth-child(2n) span:nth-child(1), .periodValues .baseline-year span:nth-child(2n) span:nth-child(1), .periodValues .period-target span:nth-child(2n) span:nth-child(1), .periodValues .period-actual span:nth-child(2n) span:nth-child(1), .periodValues .period-target-comment span:nth-child(2n) span:nth-child(1) {
margin-left: 10px; }
.baseline .period-target-comment span:nth-child(2n), .periodValues .period-target-comment span:nth-child(2n) {
font-weight: 400; }
.baseline .baseline-value, .baseline .period-target, .periodValues .baseline-value, .periodValues .period-target {
width: 50%;
float: left; }
Expand Down Expand Up @@ -2351,6 +2387,7 @@ article {
-webkit-transition: background-color 0.25s ease-in-out;
transition: background-color 0.25s ease-in-out; }
.sidebar .result-nav-header {
display: none;
background: rgba(44, 42, 116, 0); }
.sidebar .result-nav-header h3 {
color: white;
Expand All @@ -2362,10 +2399,10 @@ article {
margin-top: 0;
background: #2c2a74;
margin-bottom: 0;
-moz-border-radius: 8px 8px 0 0;
-o-border-radius: 8px 8px 0 0;
-webkit-border-radius: 8px 8px 0 0;
border-radius: 8px 8px 0 0; }
-moz-border-radius: 5px 5px 0 0;
-o-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0; }
.sidebar .result-nav-header h3 > a {
position: absolute;
right: -5px; }
Expand Down Expand Up @@ -2672,6 +2709,12 @@ article {
.target-td {
vertical-align: middle; }

.update-description {
color: #202024;
font-size: 90%; }
.update-description label {
color: initial; }

.indicator-bar-progress-complete-container .indicator-bar-progress-complete {
padding-left: 15px;
font-size: 1.1em;
Expand Down Expand Up @@ -2864,26 +2907,32 @@ label.imageUpload input[type="file"], label.fileUpload input[type="file"] {
display: block;
background: rgba(255, 255, 255, 0.5);
color: #d9534f; }
.update-container .update-entry-container .comments .input-group {
.update-container .update-entry-container .comments {
padding: 10px 5px 5px 5px;
margin-top: 20px;
/* button {
background: rgba(57, 102, 128, 0.1); }
.update-container .update-entry-container .comments .input-group {
/* button {
background: $akvoBlack;
color:white;
&:hover {
background: $akvoPurple;
}
}*/ }
.update-container .update-entry-container .comments .comment {
margin-top: 20px;
margin-bottom: 20px; }
.update-container .update-entry-container .comments .comment .comment-header {
margin-bottom: 5px;
font-weight: bold; }
.update-container .update-entry-container .comments .comment .comment-header span {
color: #2c2a74; }
.update-container .update-entry-container .comments .comment .comment-header span:last-child {
margin-left: 15px;
color: rgba(32, 32, 36, 0.5); }
.update-container .update-entry-container .comments .comment {
margin-top: 0px;
margin-bottom: 20px; }
.update-container .update-entry-container .comments .comment .comment-header {
font-weight: bold; }
.update-container .update-entry-container .comments .comment .comment-header span {
color: #2c2a74; }
.update-container .update-entry-container .comments .comment .comment-header span:last-child {
margin-left: 15px;
color: rgba(32, 32, 36, 0.5); }
.update-container .update-entry-container .comments .comment .comment-text {
font-size: 90%;
padding-left: 20px;
padding-right: 20px; }
.update-container .update-entry-container .menuAction {
position: relative; }
.update-container .update-entry-container .menuAction .removeUpdate {
Expand Down Expand Up @@ -2914,10 +2963,9 @@ label.imageUpload input[type="file"], label.fileUpload input[type="file"] {
.update-container .update-entry-container .menuAction .bottomRow .cancelUpdate {
margin-right: 25px; }
.update-container .update-entry-container .upActualValue {
margin-top: 47px;
margin-bottom: 15px; }
margin: 25px 0 0 0px; }
.update-container .update-entry-container .upActualValue .update-actual-value-text {
color: rgba(32, 32, 36, 0.7); }
color: #396680; }
.update-container .update-entry-container .upActualValue .update-actual-value-data {
font-weight: bold; }
.update-container .update-entry-container .upActualValue .update-relative-value {
Expand Down Expand Up @@ -3116,6 +3164,8 @@ label.imageUpload input[type="file"], label.fileUpload input[type="file"] {
.update-dialog-container td .update-entry-container .update-description {
padding: 0.5em;
margin: 20px auto 30px; }
.update-container .update-dialog-container td .update-entry-container .update-description {
color: red; }
.update-dialog-container td .update-entry-container .update-description.editable {
background: whitesmoke;
border: 1px solid #A3C7E3; }
Expand Down
Loading

0 comments on commit 5521dd0

Please sign in to comment.