From 06ded692a5bc8660362fa7044334dbab5aa10737 Mon Sep 17 00:00:00 2001
From: SuperBFG7 <daniel@despite.ch>
Date: Mon, 18 Dec 2017 15:10:21 +0100
Subject: [PATCH] Revert "Merge branch 'lmanul-master'"

This reverts commit f118c53ecbd955d9cbe9ae7e534c93d4f684172c, reversing
changes made to 604d54a0bb3509ea48d143bba01d3c241453761d.
---
 .gitignore               |  1 -
 htdocs/css/bootstrap.css | 41 +++++++++++++++++++++++++++++-----------
 htdocs/index.html        | 24 +++++++++++------------
 htdocs/js/mpd.js         |  2 +-
 4 files changed, 43 insertions(+), 25 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 567609b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/htdocs/css/bootstrap.css b/htdocs/css/bootstrap.css
index bceb082..14cc1f4 100644
--- a/htdocs/css/bootstrap.css
+++ b/htdocs/css/bootstrap.css
@@ -1993,7 +1993,6 @@ select[multiple].input-lg {
   font-weight: normal;
   line-height: 1.428571429;
   text-align: center;
-  text-overflow: ellipsis;
   white-space: nowrap;
   vertical-align: middle;
   cursor: pointer;
@@ -2074,11 +2073,6 @@ fieldset[disabled] .btn-default.active {
   color: #fff;
   background-color: #333;
 }
-.btn-label {
-  margin-left: 8px;
-  text-overflow: ellipsis;
-  vertical-align: middle;
-}
 .btn-primary {
   color: #fff;
   background-color: #428bca;
@@ -2376,13 +2370,14 @@ input[type="button"].btn-block {
   src: url('../fonts/glyphicons-halflings-regular.eot');
   src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
-#currenttrack {
-  vertical-align: middle;
-}
 .glyphicon {
+  position: relative;
+  top: 1px;
   display: inline-block;
   font-family: 'Glyphicons Halflings';
-  vertical-align: middle;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
 
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -2420,6 +2415,9 @@ input[type="button"].btn-block {
 .glyphicon-heart:before {
   content: "\e005";
 }
+.glyphicon-star:before {
+  content: "\e006";
+}
 .glyphicon-star-empty:before {
   content: "\e007";
 }
@@ -2459,6 +2457,9 @@ input[type="button"].btn-block {
 .glyphicon-cog:before {
   content: "\e019";
 }
+.glyphicon-trash:before {
+  content: "\e020";
+}
 .glyphicon-home:before {
   content: "\e021";
 }
@@ -2486,6 +2487,9 @@ input[type="button"].btn-block {
 .glyphicon-play-circle:before {
   content: "\e029";
 }
+.glyphicon-repeat:before {
+  content: "\e030";
+}
 .glyphicon-refresh:before {
   content: "\e031";
 }
@@ -2693,6 +2697,9 @@ input[type="button"].btn-block {
 .glyphicon-leaf:before {
   content: "\e103";
 }
+.glyphicon-fire:before {
+  content: "\e104";
+}
 .glyphicon-eye-open:before {
   content: "\e105";
 }
@@ -2708,6 +2715,12 @@ input[type="button"].btn-block {
 .glyphicon-calendar:before {
   content: "\e109";
 }
+.glyphicon-random:before {
+  content: "\e110";
+}
+.glyphicon-comment:before {
+  content: "\e111";
+}
 .glyphicon-magnet:before {
   content: "\e112";
 }
@@ -2804,6 +2817,9 @@ input[type="button"].btn-block {
 .glyphicon-heart-empty:before {
   content: "\e143";
 }
+.glyphicon-link:before {
+  content: "\e144";
+}
 .glyphicon-phone:before {
   content: "\e145";
 }
@@ -2864,6 +2880,9 @@ input[type="button"].btn-block {
 .glyphicon-record:before {
   content: "\e165";
 }
+.glyphicon-save:before {
+  content: "\e166";
+}
 .glyphicon-open:before {
   content: "\e167";
 }
@@ -3191,7 +3210,7 @@ input[type="button"].btn-block {
 }
 .btn-group-lg > .btn {
   padding: 10px 16px;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
diff --git a/htdocs/index.html b/htdocs/index.html
index bb51006..066029a 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -170,19 +170,19 @@
         <div class="btn-toolbar">
           <div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
             <button id="btnrandom" type="button" class="btn btn-default">
-              <span class="glyphicon">&#xe110;</span><span class="btn-label">Random</span>
+              <span class="glyphicon glyphicon-random"></span> Random
             </button>
             <button id="btnconsume" type="button" class="btn btn-default">
-              <span class="glyphicon">&#xe104;</span><span class="btn-label">Consume</span>
+              <span class="glyphicon glyphicon-fire"></span> Consume
             </button>
             <button id="btnsingle" type="button" class="btn btn-default">
-              <span class="glyphicon">&#xe006;</span><span class="btn-label">Single</span>
+              <span class="glyphicon glyphicon-star"></span> Single
             </button>
             <button id="btncrossfade" type="button" class="btn btn-default">
-              <span class="glyphicon">&#xe144;</span><span class="btn-label">Crossfade</span>
+              <span class="glyphicon glyphicon-link"></span> Crossfade
             </button>
             <button id="btnrepeat" type="button" class="btn btn-default">
-              <span class="glyphicon">&#xe030;</span><span class="btn-label">Repeat</span>
+              <span class="glyphicon glyphicon-repeat"></span> Repeat
             </button>
           </div>
           <div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg">
@@ -205,18 +205,18 @@
 
           <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg">
             <button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');">
-              <span class="glyphicon">&#xe020;</span><span class="btn-label">Clear queue</span>
+              <span class="glyphicon glyphicon-trash"></span> Clear queue
             </button>
             <a href="#" data-toggle="modal" data-target="#savequeue" class="btn btn-default">
-              <span class="glyphicon">&#xe166;</span><span class="btn-label">Save queue</span>
+              <span class="glyphicon glyphicon-save"></span> Save queue
             </a>
           </div>
 
-  	      <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
-  	        <button type="button" class="btn btn-default" id="btnnotify">
-                    <span class="glyphicon">&#xe111;</span><span class="btn-label">Notifications</span>
-  	        </button>
-  	      </div>
+            <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
+              <button type="button" class="btn btn-default" id="btnnotify">
+               <span class="glyphicon glyphicon-comment"></span> Notifications
+              </button>
+            </div>
         </div>
       </div><!-- /.col-md-2 -->
     </div><!-- /.row -->
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 40a5048..b6e7644 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -539,7 +539,7 @@ function webSocketConnect() {
                 case "outputnames":
                     $('#btn-outputs-block button').remove();
                     $.each(obj.data, function(id, name){
-                        var btn = $('<button id="btnoutput'+id+'" class="btn btn-default" onclick="toggleoutput(this, '+id+')"><span class="glyphicon">&#xe038;</span><span class="btn-label" title="'+name+'">'+name+'</span></button>');
+                        var btn = $('<button id="btnoutput'+id+'" class="btn btn-default" onclick="toggleoutput(this, '+id+')"><span class="glyphicon glyphicon-volume-up"></span> '+name+'</button>');
                         btn.appendTo($('#btn-outputs-block'));
                     });
                     /* remove cache, since the buttons have been recreated */
-- 
2.20.1