Skip to content

Commit

Permalink
Merge pull request #1381 from akvo/1380_list_view_css
Browse files Browse the repository at this point in the history 
[#1380] correct scope issues in list view css
  • Loading branch information
@loicsans
loicsans committed Apr 10, 2015
2 parents ed86fdc + e5de990 commit ca3b847
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 101 deletions.
44 changes: 22 additions & 22 deletions akvo/rsr/static/styles-src/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,67 +891,67 @@ h4.detailedInfo {
margin-top: 1em; } }
.main-list.projects ul li .donateButton .totalBudgetLabel {
width: initial; }
.main-list.projects.updates ul li {
.main-list.updates ul li {
border: thin solid rgba(0, 167, 157, 0);
-moz-transition: all 0.2s ease-in;
-o-transition: all 0.2s ease-in;
-webkit-transition: all 0.2s ease-in;
transition: all 0.2s ease-in; }
.main-list.projects.updates ul li .projectTitle {
.main-list.updates ul li .projectTitle {
color: #00aaff; }
.main-list.projects.updates ul li .projectTitle i {
.main-list.updates ul li .projectTitle i {
font-size: 1.1em;
color: #00aaff; }
.main-list.projects.updates ul li .projectTitle:hover {
.main-list.updates ul li .projectTitle:hover {
color: #ff5500; }
.main-list.projects.updates ul li h1 a {
.main-list.updates ul li h1 a {
color: #00a79d; }
.main-list.projects.updates ul li h1 a:hover {
.main-list.updates ul li h1 a:hover {
color: #ff5500; }
.main-list.projects.updates ul li:nth-child(2n+1) {
.main-list.updates ul li:nth-child(2n+1) {
background: rgba(0, 116, 109, 0.05);
border: thin solid rgba(0, 167, 157, 0.1); }
.main-list.projects.updates ul li .projectLocation {
.main-list.updates ul li .projectLocation {
color: rgba(32, 32, 36, 0.5); }
.main-list.projects.updates ul li:hover {
.main-list.updates ul li:hover {
background: rgba(0, 167, 157, 0.1);
border: thin solid rgba(0, 167, 157, 0.35); }
.main-list.projects.organisations ul li {
.main-list.organisations ul li {
border: thin solid rgba(238, 49, 36, 0);
-moz-transition: all 0.2s ease-in;
-o-transition: all 0.2s ease-in;
-webkit-transition: all 0.2s ease-in;
transition: all 0.2s ease-in; }
.main-list.projects.organisations ul li i {
.main-list.organisations ul li i {
font-size: 1.1em; }
.main-list.projects.organisations ul li .projectTitle {
.main-list.organisations ul li .projectTitle {
display: block;
margin: 0 0 3px 0; }
.main-list.projects.organisations ul li span.userFullName {
.main-list.organisations ul li span.userFullName {
margin: 0 0 0px 0; }
.main-list.projects.organisations ul li .upDateTime {
.main-list.organisations ul li .upDateTime {
margin-top: 10px; }
.main-list.projects.organisations ul li .additionalInfo div {
.main-list.organisations ul li .additionalInfo div {
color: rgba(32, 32, 36, 0.5); }
.main-list.projects.organisations ul li .additionalInfo div span {
.main-list.organisations ul li .additionalInfo div span {
margin-left: 5px; }
.main-list.projects.organisations ul li h1 a {
.main-list.organisations ul li h1 a {
color: #ee3124; }
.main-list.projects.organisations ul li h1 a:hover {
.main-list.organisations ul li h1 a:hover {
color: #ff5500; }
.main-list.projects.organisations ul li:nth-child(2n+1) {
.main-list.organisations ul li:nth-child(2n+1) {
background: rgba(238, 49, 36, 0.05);
border: thin solid rgba(238, 49, 36, 0.05); }
.main-list.projects.organisations ul li:hover {
.main-list.organisations ul li:hover {
background: rgba(238, 49, 36, 0.1);
border: thin solid rgba(238, 49, 36, 0.35); }
.main-list.projects.organisations ul li img {
.main-list.organisations ul li img {
filter: gray;
-webkit-filter: grayscale(100%);
filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
filter: grayscale(100%);
transition: all 0.2s ease-in; }
.main-list.projects.organisations ul li:hover img {
.main-list.organisations ul li:hover img {
filter: 0;
-webkit-filter: grayscale(0%);
filter: url();
Expand Down
158 changes: 79 additions & 79 deletions akvo/rsr/static/styles-src/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,98 +1039,98 @@ h4.detailedInfo {
}
}
}
&.updates {
ul {
li {
border: thin solid rgba($rsrGreen, 0);
@include transition(all 0.2s ease-in);
.orgName {}
.projectTitle {
}
&.updates {
ul {
li {
border: thin solid rgba($rsrGreen, 0);
@include transition(all 0.2s ease-in);
.orgName {}
.projectTitle {
color: rgba($anchorLink, 1);
i {
font-size: 1.1em;
color: rgba($anchorLink, 1);
i {
font-size: 1.1em;
color: rgba($anchorLink, 1);
}
}
&:hover {
color: $anchorLinkHover;
}
}
h1 {
a {
color: $rsrGreen;
&:hover {
color: $anchorLinkHover;
}
}
h1 {
a {
color: $rsrGreen;
&:hover {
color: $anchorLinkHover;
}
}
}
&:nth-child(2n+1) {
background: darken(rgba($rsrGreen, 0.05), 10%);
border: thin solid rgba($rsrGreen, 0.1);
}
.projectLocation {
color: rgba($akvoBlack, 0.5);
}
&:hover {
background: darken(rgba($rsrGreen, 0.1), 0%);
border: thin solid rgba($rsrGreen, 0.35);
}
.excerpt {}
.excerpt {}
}
&:nth-child(2n+1) {
background: darken(rgba($rsrGreen, 0.05), 10%);
border: thin solid rgba($rsrGreen, 0.1);
}
.projectLocation {
color: rgba($akvoBlack, 0.5);
}
&:hover {
background: darken(rgba($rsrGreen, 0.1), 0%);
border: thin solid rgba($rsrGreen, 0.35);
}
.excerpt {}
.excerpt {}
}
}
&.organisations {
ul {
li {
border: thin solid rgba($akvoTvRed, 0);
@include transition(all 0.2s ease-in);
i {
font-size: 1.1em;
}
.projectLocation {}
.projectTitle {
display: block;
margin: 0 0 3px 0;
}
span.userFullName {
margin: 0 0 0px 0;
}
.upDateTime {
margin-top: 10px;
}
.orgType {}
.additionalInfo {
div {
color: rgba($akvoBlack, 0.5);
span {
margin-left: 5px;
}
}
&.organisations {
ul {
li {
border: thin solid rgba($akvoTvRed, 0);
@include transition(all 0.2s ease-in);
i {
font-size: 1.1em;
}
.projectLocation {}
.projectTitle {
display: block;
margin: 0 0 3px 0;
}
span.userFullName {
margin: 0 0 0px 0;
}
.upDateTime {
margin-top: 10px;
}
.orgType {}
.additionalInfo {
div {
color: rgba($akvoBlack, 0.5);
span {
margin-left: 5px;
}
}
h1 {
a {
color: $akvoTvRed;
&:hover {
color: $anchorLinkHover;
}
}
h1 {
a {
color: $akvoTvRed;
&:hover {
color: $anchorLinkHover;
}
}
&:nth-child(2n+1) {
background: darken(rgba($akvoTvRed, 0.05), 0);
border: thin solid rgba($akvoTvRed, 0.05);
}
&:hover {
background: darken(rgba($akvoTvRed, 0.1), 0%);
border: thin solid rgba($akvoTvRed, 0.35);
}
}
&:nth-child(2n+1) {
background: darken(rgba($akvoTvRed, 0.05), 0);
border: thin solid rgba($akvoTvRed, 0.05);
}
&:hover {
background: darken(rgba($akvoTvRed, 0.1), 0%);
border: thin solid rgba($akvoTvRed, 0.35);
}
img {
@include bw;
transition: all 0.2s ease-in;
}
&:hover {
img {
@include bw;
transition: all 0.2s ease-in;
}
&:hover {
img {
@include colour;
}
@include colour;
}
}
}
Expand Down

0 comments on commit ca3b847

Please sign in to comment.