Skip to content

Commit

Permalink
fix bug: switch playlist source cause layout chaos
Browse files Browse the repository at this point in the history
  • Loading branch information
listen1 committed May 23, 2016
1 parent b161ba5 commit 29d7466
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 6 deletions.
37 changes: 35 additions & 2 deletions css/player.css
Original file line number Diff line number Diff line change
Expand Up @@ -975,13 +975,46 @@ li {
right: -32px;
top: 0px;
z-index: 10;
text-align: center;
}

.source-list button{
.source-list div{
background-color: #333333;
color: #fff;
color: #ffffff;
height: 35px;
border: 1px solid #ffffff;
width: 75px;
cursor: pointer;
vertical-align: middle;
padding-top: 6px;
}

.source-list div:first-child:not(:last-child) {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}

.source-list div:last-child:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}

.source-list .active {
background-color: #e6e6e6;
color: #333333;
}

.source-list div:hover {
background-color: #ffffff;
color: #333333;
}



.settings-title {
font-size: 20px;
padding: 20px;
Expand Down
8 changes: 4 additions & 4 deletions listen1.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ <h3 class="masthead-brand" ng-click="showTag(2)">Listen 1</h3>
<div class="site-wrapper" ng-show="current_tag==2" ng-controller="PlayListController" ng-init="loadPlaylist();">
<div class="cover-container container-placeholder">
<!-- make empty placeholder div to position sidebar -->
<div class="btn-group-vertical source-list" ng-show="is_window_hidden==1">
<button type="button" class="btn btn-default" ng-class="{'active':isActiveTab(0)}" ng-click="changeTab(0)">网易</button>
<button type="button" class="btn btn-default" ng-class="{'active':isActiveTab(1)}" ng-click="changeTab(1)">虾米</button>
<button type="button" class="btn btn-default" ng-class="{'active':isActiveTab(2)}" ng-click="changeTab(2)">QQ音乐</button>
<div class="source-list" ng-show="is_window_hidden==1">
<div class="source-button" ng-class="{'active':isActiveTab(0)}" ng-click="changeTab(0)">网易</div>
<div class="source-button" ng-class="{'active':isActiveTab(1)}" ng-click="changeTab(1)">虾米</div>
<div class="source-button" ng-class="{'active':isActiveTab(2)}" ng-click="changeTab(2)">QQ音乐</div>
<!-- <button type="button" class="btn btn-default" ng-class="{'active':isActiveTab(3)}" ng-click="changeTab(3)" ng-show="isDoubanLogin">豆瓣</button> -->
</div>
</div>
Expand Down

0 comments on commit 29d7466

Please sign in to comment.