Commit 25e4961f authored by Kevin Whitaker's avatar Kevin Whitaker

Remove some of old styling for new bootstrap css.

parent 6d038acf
......@@ -35,6 +35,7 @@ WebInterface::WebInterface(const Wt::WEnvironment& env) : Wt::WApplication(env)
priv_int = new internal;
this->useStyleSheet(Wt::WLink("/resources/font-awesome/css/font-awesome.min.css"));
setTheme(new Wt::WBootstrapTheme());
((Wt::WBootstrapTheme*)theme())->setVersion(Wt::WBootstrapTheme::Version3);
setTitle("Arbitrateor - Audio Jukebox");
enableUpdates(true);
priv_int->playerUI = new PlayerInterface(this);
......
......@@ -43,6 +43,7 @@ PlayerInterface::PlayerInterface(WebInterface* app)
trackProgress->setInterval(1000);
trackProgress->timeout().connect(this,&PlayerInterface::updateProgressFromTimer);
currentTrackDetails = new TrackDetails();
currentTrackDetails->setMinimumSize(Wt::WLength(100,Wt::WLength::Pixel),Wt::WLength(100,Wt::WLength::Pixel));
playpause = new Wt::WPushButton();
playpause->setTextFormat(Wt::XHTMLText);
playpause->decorationStyle().font().setFamily(Wt::WFont::Default,"FontAwesome");
......@@ -67,10 +68,11 @@ PlayerInterface::PlayerInterface(WebInterface* app)
interfaceLayout->addWidget(playControlWidget);
interfaceLayout->addWidget(currentTrackProgress);
interfaceLayout->addLayout(voteControlLayout);
playControlWidget->decorationStyle().setBorder(Wt::WBorder::Outset);
playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("#00B200"));
playControlWidget->addStyleClass("panel");
playControlWidget->addStyleClass("panel-default");
playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("gainsboro"));
playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(currentTrackDetails);
playControlLayout->addWidget(currentTrackDetails,0,Wt::AlignmentFlag::AlignCenter | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(skipControls,0,Wt::AlignmentFlag::AlignRight | Wt::AlignmentFlag::AlignMiddle);
}
......@@ -170,4 +172,5 @@ void PlayerInterface::updateDetailsFromServer(AudioTrack track)
updateSkipDeniedFromServer();
}
currentTrackDetails->updateWithTrackDetails(track);
}
......@@ -24,8 +24,10 @@
TrackDetails::TrackDetails()
{
this->setMaximumSize(Wt::WLength::Auto,Wt::WLength(200, Wt::WLength::Pixel));
this->decorationStyle().setBorder(Wt::WBorder::Ridge);
//this->decorationStyle().setBorder(Wt::WBorder::Ridge);
this->decorationStyle().setBackgroundColor(Wt::WColor("#6FFF6F"));
this->addStyleClass("panel");
this->addStyleClass("panel-default");
mainLayout = new Wt::WHBoxLayout();
this->setLayout(mainLayout);
metaLayout = new Wt::WVBoxLayout();
......@@ -33,6 +35,7 @@ TrackDetails::TrackDetails()
albumCover = new Wt::WImage();
albumCover->setMinimumSize(Wt::WLength(75,Wt::WLength::Pixel),Wt::WLength(75,Wt::WLength::Pixel));
albumCover->setMaximumSize(Wt::WLength(200,Wt::WLength::Pixel),Wt::WLength(200,Wt::WLength::Pixel));
albumCover->addStyleClass("img-rounded");
mainLayout->addWidget(albumCover);
mainLayout->addSpacing(Wt::WLength(10, Wt::WLength::Pixel));
mainLayout->addLayout(metaLayout);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment