Skip to content
This repository has been archived by the owner on Mar 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #534 from radiant-player/fix-mavericks
Browse files Browse the repository at this point in the history
Add CSS fix for Mavericks
  • Loading branch information
jacobwgillespie committed Apr 2, 2016
2 parents 808166e + e45ae6b commit 6ece3cc
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [unreleased]

* Fixed UI issues for Mavericks users ([#534](https://github.com/radiant-player/radiant-player-mac/pull/534), [@BarakaAka1Only](https://github.com/BarakaAka1Only))

## [1.8.0] - 2016-03-30
### Changed
* Updated the internal Google Music API ([#520](https://github.com/radiant-player/radiant-player-mac/pull/520))
Expand Down
1 change: 1 addition & 0 deletions radiant-player-mac/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@

- (id) preferenceForKey:(NSString *)key;
- (BOOL) isYosemite;
- (BOOL) isMavericks;

- (void) evaluateJavaScriptFile:(NSString *)name;
- (void) applyCSSFile:(NSString *)name;
Expand Down
9 changes: 7 additions & 2 deletions radiant-player-mac/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -929,8 +929,8 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame

// Apply common styles.
[self applyCSSFile:@"common"];
if ([self isYosemite]) {

if ([self isYosemite] || [self isMavericks]) {
[self applyCSSFile:@"flexfix"];
}

Expand Down Expand Up @@ -984,6 +984,11 @@ - (BOOL)isYosemite
return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_9;
}

- (BOOL)isMavericks
{
return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8;
}

- (void) evaluateJavaScriptFile:(NSString *)name
{
NSString *template =
Expand Down
10 changes: 10 additions & 0 deletions radiant-player-mac/css/flexfix.css
Original file line number Diff line number Diff line change
Expand Up @@ -353,3 +353,13 @@ paper-dialog.episode-dialog .buttons {
.ups.light span {
-webkit-flex: initial;
}
/* Mavericks */
#volume:hover #material-volume-low,
#volume:hover #material-volume-high,
#volume:hover #material-vslider,
#volume.simulated-hover #material-volume-low,
#volume.simulated-hover #material-volume-high,
#volume.simulated-hover #material-vslider,
#material-vslider:focus {
opacity: 1
}

0 comments on commit 6ece3cc

Please sign in to comment.