Skip to content

Update bootstrap #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update bootstrap #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,390 changes: 1,390 additions & 0 deletions views/css/bootstrap-icons.css
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions views/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions views/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added views/css/fonts/bootstrap-icons.woff
View file
Open in desktop
Binary file not shown.
Binary file added views/css/fonts/bootstrap-icons.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed views/fonts/glyphicons-halflings-regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed views/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
Binary file not shown.
43 changes: 20 additions & 23 deletions views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,47 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en" ng-app="patiobarApp">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
<title>Patiobar</title>
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap-icons.css">
<link rel="stylesheet" href="/css/main.css">
</head>
<body>
<nav class="navbar navbar-inverse" role="navigation" ng-controller="StationController">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation" ng-controller="StationController">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#stations">
<span class="sr-only">Toggle Stations</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<p class="navbar-brand"><a href="https://github.com/kylejohnson/Patiobar">Patiobar</a></p>
</div><!-- End navbar-header -->

<a class="navbar-brand" href="https://github.com/kylejohnson/Patiobar">Patiobar</a>

<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#stations" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="text-center collapse navbar-collapse" id="stations">
<button type="button" ng-repeat="station in stations" class="btn btn-default navbar-btn btn-sm" ng-click="changeStation(station.id);" ng-class="{'btn-success': stationName == station.name}">{{station.name}}</button>
<button type="button" ng-repeat="station in stations" class="btn btn-sm btn-outline-secondary" ng-click="changeStation(station.id);" ng-class="{'btn-outline-success': stationName == station.name}">{{station.name}}</button>
</div>
</div> <!-- End container-fluid -->
</nav>

<div class="container" ng-controller="SongController">
<div id="player" class="center-block">
<div class="text-center">
<img class="center-block img-rounded img-responsive" id="coverArt" ng-src="{{src}}" alt="{{alt}}">
<img class="center-block img-thumbnail img-fluid" id="coverArt" ng-src="{{src}}" alt="{{alt}}">

<div id="details">
<p id="title" class="media-heading">{{title}}</p>
<p id="albumartist">{{albumartist}}</p>
</div>

<div id="controls">
<button type="button" id="love" class="pull-left btn btn-default" ng-click="sendCommand('+');"> <span class="glyphicon glyphicon-thumbs-up"></span> </button>
<button id="pauseplay" type="button" class="btn btn-default" ng-click="sendCommand('p');"> <span class="glyphicon glyphicon-pause"></span> </button>
<button type="button" class="btn btn-default" ng-click="sendCommand('n');"> <span class="glyphicon glyphicon-fast-forward"></span> </button>
<button type="button" class="btn btn-default" ng-click="sendCommand('(');"> <span class="glyphicon glyphicon-volume-down"></span> </button>
<button type="button" class="btn btn-default" ng-click="sendCommand(')');"> <span class="glyphicon glyphicon-volume-up"></span> </button>
<button type="button" title="Tired (shelve for a month)" class="btn btn-default" ng-click="sendCommand('t');"> <span class="glyphicon glyphicon-calendar"></span> </button>
<button type="button" class="pull-right btn btn-default" ng-click="sendCommand('-');"> <span class="glyphicon glyphicon-thumbs-down"></span> </button>
<button type="button" id="love" class="pull-left btn btn-primary bi-hand-thumbs-up" ng-click="sendCommand('+');"> </button>
<button id="pauseplay" type="button" class="btn btn-primary bi-pause-btn" ng-click="sendCommand('p');"> </button>
<button type="button" class="btn btn-primary bi-skip-forward" ng-click="sendCommand('n');"> </button>
<button type="button" class="btn btn-primary bi-volume-down" ng-click="sendCommand('(');"> </button>
<button type="button" class="btn btn-primary bi-volume-up" ng-click="sendCommand(')');"> </button>
<button type="button" title="Tired (shelve for a month)" class="btn btn-primary bi-calendar" ng-click="sendCommand('t');"> </button>
<button type="button" class="pull-right btn btn-primary bi-hand-thumbs-down" ng-click="sendCommand('-');"> </span> </button>
</div>
</div> <!-- End text-center -->
</div> <!-- End Player -->
Expand All @@ -54,7 +51,7 @@
<script src="/socket.io/socket.io.js"></script>
<script src="/js/jquery-2.1.1.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.9/angular.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap.bundle.min.js"></script>
<script src="/js/main.js"></script>
</body>
</html>
7 changes: 7 additions & 0 deletions views/js/bootstrap.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions views/js/bootstrap.bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions views/js/bootstrap.min.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions views/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ function SongController($scope, socket) {
$scope.rating = msg.rating;

if (msg.rating == 1) {
document.getElementById("love").className = "btn btn-success pull-left";
document.getElementById("love").className = "btn btn-success pull-left bi-hand-thumbs-up";
} else {
document.getElementById("love").className = "btn btn-default pull-left";
document.getElementById("love").className = "btn btn-primary pull-left bi-hand-thumbs-up";

}
});
Expand Down