diff --git a/akvo/rsr/static/scripts-src/my-user-management.js b/akvo/rsr/static/scripts-src/my-user-management.js index f8deb16695..12fe5663e1 100644 --- a/akvo/rsr/static/scripts-src/my-user-management.js +++ b/akvo/rsr/static/scripts-src/my-user-management.js @@ -297,7 +297,7 @@ var UserRow = React.createClass({displayName: 'UserRow', React.DOM.td(null, this.props.user.email), React.DOM.td(null, this.props.user.first_name), React.DOM.td(null, this.props.user.last_name), - React.DOM.td(null, EmploymentList( {user:this.props.user} )) + React.DOM.td( {className:"text-right"}, EmploymentList( {user:this.props.user} )) ) ); } @@ -329,7 +329,7 @@ UserTable = React.createClass({displayName: 'UserTable', return ( Table( {striped:true}, React.DOM.thead(null, React.DOM.tr(null, React.DOM.th(null, "Email"),React.DOM.th(null, "First name"),React.DOM.th(null, "Last name"), - React.DOM.th(null, "Organisations")) + React.DOM.th( {className:"text-right"}, "Organisations")) ), React.DOM.tbody(null, users) ) diff --git a/akvo/rsr/static/scripts-src/my-user-management.jsx b/akvo/rsr/static/scripts-src/my-user-management.jsx index 70caaec729..86a1974494 100644 --- a/akvo/rsr/static/scripts-src/my-user-management.jsx +++ b/akvo/rsr/static/scripts-src/my-user-management.jsx @@ -297,7 +297,7 @@ var UserRow = React.createClass({ {this.props.user.email} {this.props.user.first_name} {this.props.user.last_name} - + ); } @@ -329,7 +329,7 @@ UserTable = React.createClass({ return ( - + {users}
EmailFirst nameLast nameOrganisations
Organisations
diff --git a/akvo/rsr/static/styles-src/library.scss b/akvo/rsr/static/styles-src/library.scss index d7d6887ef3..43aad336e9 100755 --- a/akvo/rsr/static/styles-src/library.scss +++ b/akvo/rsr/static/styles-src/library.scss @@ -129,7 +129,7 @@ $width-large: 1200px; @if $width == wide-screens { @media only screen and (min-width: $width-large) { @content; } } - @else if $width == medium-screens { + @else if $width == mediums-screens { @media only screen and (min-width: $width-medium) {@content; } } @else if $width == small-screens { @@ -138,7 +138,7 @@ $width-large: 1200px; @else if $width == wide-max-screens { @media only screen and (max-width: $width-large) { @content; } } - @else if $width == medium-max-screens { + @else if $width == mediums-max-screens { @media only screen and (max-width: $width-medium) { @content; } } @else if $width == small-max-screens { diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index 5992fe5c0c..a66b0c0007 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -177,8 +177,8 @@ span.twitter-typeahead .tt-dropdown-menu { z-index: 1000; display: none; float: left; - min-width: 160px; - padding: 5px 0; + min-width: 268px; + padding: 5px 15px; margin: 2px 0 0; list-style: none; font-size: 14px; @@ -190,9 +190,13 @@ span.twitter-typeahead .tt-dropdown-menu { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; } + span.twitter-typeahead .tt-dropdown-menu .tt-suggestions { + color: rgba(0, 0, 0, 0.7) !important; } + span.twitter-typeahead .tt-dropdown-menu .tt-suggestions * { + color: rgba(0, 0, 0, 0.7) !important; } .tt-hint { - color: rgba(0, 167, 157, 0.5); } + color: rgba(0, 167, 157, 0.9); } span.twitter-typeahead .tt-suggestion > p { display: block; @@ -200,7 +204,7 @@ span.twitter-typeahead .tt-suggestion > p { clear: both; font-weight: normal; line-height: 1.42857143; - color: #333; + color: rgba(0, 0, 0, 0.7); white-space: nowrap; } span.twitter-typeahead .tt-suggestion > p:hover, span.twitter-typeahead .tt-suggestion > p:focus { @@ -477,6 +481,11 @@ nav.navbar-fixed-top { background: rgba(255, 85, 0, 0.05) url(../images/carretWhite.png) 98% center no-repeat; background-size: 5px auto; } +.myProjectList tbody tr { + background: rgba(32, 32, 36, 0.1) !important; } + .myProjectList tbody tr.isPublished { + background: white !important; } + #profile .usrAvatar { background-color: rgba(32, 32, 36, 0); padding: 10px 0 10px 0; } @@ -563,7 +572,7 @@ nav.navbar-fixed-top { color: #999; } #organisations .tt-dropdown-menu { margin-top: 12px; - padding: 8px 0; + padding: 8px 15px; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -663,7 +672,7 @@ h4.detailedInfo { /* LISTINGS */ #map { height: 400px; } - @media only screen and (max-width: 768px) { + @media only screen and (max-width: 568px) { #map { display: none; } } diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 86a54eb33f..cc0a2b4b8b 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -169,8 +169,8 @@ span.twitter-typeahead .tt-dropdown-menu { z-index: 1000; display: none; float: left; - min-width: 160px; - padding: 5px 0; + min-width: 268px; + padding: 5px 15px; margin: 2px 0 0; list-style: none; font-size: 14px; @@ -182,10 +182,19 @@ span.twitter-typeahead .tt-dropdown-menu { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; + .tt-suggestions { + color: rgba(black, 0.7) !important; + * { + color: rgba(black, 0.7) !important; + } + } + .tt-dataset-projects {} + .tt-dataset-organisations {} + .tt-dataset-locations {} } .tt-hint { - color: rgba($rsrGreen, 0.5); + color: rgba($rsrGreen, 0.9); } span.twitter-typeahead .tt-suggestion > p { @@ -194,7 +203,7 @@ span.twitter-typeahead .tt-suggestion > p { clear: both; font-weight: normal; line-height: 1.42857143; - color: #333; + color: rgba(black, 0.7); white-space: nowrap; } @@ -517,6 +526,17 @@ nav.navbar-fixed-top { } } +.myProjectList { + tbody { + tr { + background: rgba($akvoBlack, 0.1) !important; + &.isPublished { + background: white !important; + } + } + } +} + #profile { .usrAvatar { background-color: rgba($akvoBlack, 0); @@ -617,7 +637,7 @@ nav.navbar-fixed-top { } .tt-dropdown-menu { margin-top: 12px; - padding: 8px 0; + padding: 8px 15px; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -733,7 +753,7 @@ h4.detailedInfo { /* LISTINGS */ #map { height: 400px; - @include responsive(small-max-screens) { + @include responsive(xtra-small-max-screens) { display: none; } } @@ -1025,7 +1045,7 @@ h4.detailedInfo { .donateButton { text-align: left; a { - @include responsive(medium-max-screens) { + @include responsive(mediums-max-screens) { margin-top: 0.6em; } @@ -1654,7 +1674,7 @@ div.textBlock { background-color: $secondary8; } @include responsive(small-screens) { - @include responsive(medium-max-screens) { + @include responsive(mediums-max-screens) { h3 { font-size: 1.3em; } @@ -1696,7 +1716,7 @@ section.projectFinancial { } } - @include responsive(medium-max-screens) { + @include responsive(mediums-max-screens) { @include responsive(small-screens) { .dl-horizontal { dt { @@ -1803,4 +1823,4 @@ dd { font-weight: bold; } } -} +} \ No newline at end of file diff --git a/akvo/templates/myrsr/my_projects.html b/akvo/templates/myrsr/my_projects.html index 4821641051..c6c62eb183 100644 --- a/akvo/templates/myrsr/my_projects.html +++ b/akvo/templates/myrsr/my_projects.html @@ -30,14 +30,16 @@ {% if page %} - +
{% for project in page %} - + {% if project.is_published %} + + {% endif %} diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html index 579fa651ed..96e84b1c8e 100644 --- a/akvo/templates/update_directory.html +++ b/akvo/templates/update_directory.html @@ -84,7 +84,7 @@

by{{u.user.first_name}} {{u.user.last_name}} {% if u.user.approved_organisations %} {% with org=u.user.approved_organisations.0 %} - ( {{org.long_name}} ) + {{org.long_name}} {% endwith %} {% endif %}

{% trans "Project" %}{% trans "Location" %}{% trans "Status" %}{% trans "Actions" %}
{% comment %} @@ -74,7 +76,7 @@

{{ project.title }}

{% endif %} {% has_perm 'rsr.post_updates' project as can_add_update %} - Add update + Update