mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js
This commit is contained in:
Luke Pulverenti 2015-06-07 17:23:05 -04:00
commit 4a0f78149a
16 changed files with 433 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/card.css
View file

@ -44,7 +44,7 @@
}
.cardBox {
margin: 3px;
margin: 2px;
}
.largeCardMargin .cardBox {
@ -55,7 +55,7 @@
margin: 4px;
}
@media all and (max-width: 600px) {
@media all and (max-width: 800px) {
.cardBox {
margin: 1px;

2
dashboard-ui/css/librarymenu.css
View file

@ -282,7 +282,7 @@
}
}
@media all and (max-width: 1200px) {
@media all and (max-width: 800px) {
/* They can use the left menu */
.dashboardEntryHeaderButton {