Merge branch 'master' of https://github.com/Musare/Musare

app/client/stylesheets/app.css

@@ -7,6 +7,7 @@ body {
 
 main {
     flex: 1 0 auto;
+    padding-top: 4.5vw;
 }
 
 main h4.thin{
@@ -55,7 +56,7 @@ hr{
 }
 
 .brand-logo {
-    margin-left: 10px;
+    margin-left: 16px;
     font-weight: 300 !important;
 }
 
@@ -220,10 +221,6 @@ input[type="range"] + .thumb {
     /* Weird hack... No clue why this is needed but it is.*/
 }
 
-#room-content {
-  padding-top: 15px;
-}
-
 #thumbs_up, #thumbs_down {
   color: white;
   cursor: pointer;
@@ -537,4 +534,4 @@ input[type=range]::-ms-thumb {
 .hidden {
     display: none;
     height: 0;
-}
+}

app/client/templates/communityStation.html

@@ -205,7 +205,7 @@
                 <select id="edit_room_privacy">
                     <option value="public" {{getSelected 'public' room.privacy}}>Public</option>
                     <option value="unlisted" {{getSelected 'unlisted' room.privacy}}>Unlisted</option>
-                    <option value="community" {{getSelected 'community' room.privacy}}>Private</option>
+                    <option value="private" {{getSelected 'private' room.privacy}}>Private</option>
                 </select>
                 <label>Room Privacy</label>
             </div>