Skip to content

Commit

Permalink
Merge branch 'develop' into feature/django_110
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Aug 19, 2016
2 parents 05b912e + 8e2e049 commit c1b5682
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cms/static/cms/css/3.3.0/cms.base.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cms/static/cms/css/3.3.0/cms.pagetree.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cms/static/cms/css/3.3.0/cms.welcome.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cms/static/cms/css/3.3.0/cms.wizard.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions cms/static/cms/sass/components/_welcome.scss
Expand Up @@ -51,7 +51,8 @@
}

.cms-welcome-logo,
.cms-welcome-logo:hover {
.cms-welcome-logo:hover,
.cms-welcome-logo:focus {
@extend %icon;
@include icon(logo);
font-size: 35px;
Expand All @@ -62,7 +63,8 @@
color: black;
transition: color $speed-base;
}
&:hover:before {
&:hover:before,
&:focus:before {
color: $color-primary;
}
}
Expand Down

0 comments on commit c1b5682

Please sign in to comment.