diff --git a/data/fonts/FaunaOne-Regular.ttf b/data/fonts/FaunaOne-Regular.ttf new file mode 100644 index 000000000..e6fec0abd Binary files /dev/null and b/data/fonts/FaunaOne-Regular.ttf differ diff --git a/data/images/album-placeholder-grid.svg b/data/images/album-placeholder-grid.svg index 0e6e9cac1..d1120cd2b 100644 --- a/data/images/album-placeholder-grid.svg +++ b/data/images/album-placeholder-grid.svg @@ -1,21 +1,44 @@ - + album-placeholder-grid Created with Sketch (http://www.bohemiancoding.com/sketch) - - - + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + \ No newline at end of file diff --git a/data/images/artist-placeholder-grid.svg b/data/images/artist-placeholder-grid.svg index 5f3f487b2..ac6531983 100644 --- a/data/images/artist-placeholder-grid.svg +++ b/data/images/artist-placeholder-grid.svg @@ -1,13 +1,17 @@ - artist-placeholder-grid + Slice 1 Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - + + + + + + + + + diff --git a/resources.qrc b/resources.qrc index a45534abd..2a463a8c4 100644 --- a/resources.qrc +++ b/resources.qrc @@ -185,5 +185,6 @@ data/images/inbox-512x512.png data/images/network-activity.svg data/fonts/TitilliumWeb-Bold.ttf + data/fonts/FaunaOne-Regular.ttf diff --git a/src/libtomahawk/utils/TomahawkStyle.h b/src/libtomahawk/utils/TomahawkStyle.h index b19be89d1..973850d71 100644 --- a/src/libtomahawk/utils/TomahawkStyle.h +++ b/src/libtomahawk/utils/TomahawkStyle.h @@ -61,15 +61,15 @@ namespace TomahawkStyle static const QColor SELECTION_BACKGROUND = QColor( "#962c26" ); static const QColor SELECTION_FOREGROUND = QColor( "#ffffff" ); - static const QColor HEADER_UPPER = QColor( "#25292c" ); - static const QColor HEADER_LOWER = QColor( "#1e1e1e" ); - static const QColor HEADER_TEXT = QColor( "#eaeaea" ); + static const QColor HEADER_UPPER = QColor( "#292f34" ); + static const QColor HEADER_LOWER = QColor( "#292f34" ); + static const QColor HEADER_TEXT = QColor( "#ffffff" ); static const QColor HEADER_HIGHLIGHT = QColor( "#333" ); - static const QColor PAGE_TEXT = Qt::gray; + static const QColor PAGE_TEXT = QColor( "#ABCCE8" ); static const QColor PAGE_ITEM_BACKGROUND = QColor( "#1e1e1e" ).lighter( 290 ); - static const QColor PAGE_FOREGROUND = QColor( "#ffffff" ); - static const QColor PAGE_BACKGROUND = QColor( "#1e1e1e" ).lighter(); + static const QColor PAGE_FOREGROUND = QColor( "#292f34" ); + static const QColor PAGE_BACKGROUND = QColor( "#DBDBDB" ); static const QColor FOOTNOTES_BACKGROUND = QColor( "#272b2e" ); static const QColor DASHBOARD_ROUNDFIGURE_BACKGROUND = QColor( "#454e59" ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index ffd1e2243..3140dbf61 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -98,7 +98,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QPalette trackViewPal = ui->topHits->palette(); trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); - trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) ); + trackViewPal.setColor( QPalette::Highlight, QColor( "#292f34" ) ); trackViewPal.setColor( QPalette::HighlightedText, Qt::white ); ui->topHits->setPalette( trackViewPal ); ui->topHits->setAlternatingRowColors( false ); @@ -121,7 +121,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->cover->setShowText( false ); QFont f = font(); - f.setPointSize( f.pointSize() + 3 ); + f.setPointSize( f.pointSize() + 1 ); + f.setFamily( "Fauna One" ); ui->biography->setOpenLinks( false ); ui->biography->setOpenExternalLinks( true ); ui->biography->setFrameShape( QFrame::NoFrame ); @@ -140,8 +141,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->label_3->setPalette( p ); QFont font = ui->label->font(); - font.setBold( true ); - font.setFamily( "Titillium Web" ); + font.setBold( false ); + font.setFamily( "Fauna One" ); ui->label->setFont( font ); ui->label_2->setFont( font ); ui->label_3->setFont( font );