localhots/beathaven
1
0
Fork 0
Code Releases Activity

Boostrap 2.1

Browse Source
This commit is contained in:
Gregory Eremin
2012-09-10 20:45:17 +04:00
parent baa680e7b5
commit a29f4433ca
15 changed files with 104 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/application.js.coffee
+6 -8
View File
@@ -2,7 +2,11 @@
#= require jquery_ujs
#= require jquery.autocomplete
# require soundmanager
#= require bootstrap-dropdown
#= require bootstrap-tooltip
#= require bootstrap-popover
#= require soundmanager
#= require vk_music
#= require hogan
@@ -14,10 +18,4 @@
#= require backbone/beat_haven
#= require locale/en
#= require locale/ru
#= require bootstrap-dropdown
#= require bootstrap-tooltip
#= require bootstrap-popover
#= require_tree .
#= require_tree ./bindings
app/assets/javascripts/backbone/beat_haven.js.coffee
+1 -2
View File
@@ -5,7 +5,6 @@
#= require_tree ./collections
#= require_tree ./views
#= require_tree ./routers
#= require ./i18n
window.BeatHaven =
Modules: {}
@@ -29,7 +28,7 @@ window.BeatHaven =
@VK = new BeatHaven.Models.VK()
@I18n = new BeatHaven.Modules.I18n()
# @VK.init()
@VK.init()
Backbone.history.start(pushState: true);
$("a").live "click", (e) ->
app/assets/javascripts/backbone/models/track.js.coffee
+3 -3
View File
@@ -15,9 +15,9 @@ class BeatHaven.Models.Track extends Backbone.Model
artists: @.get("artists")
track: @.get("title")
)
# unless @.get("sm_obj")?
# this.add_to_library(autoload: true, autoplay: false)
# BH.Player.play(this)
unless @.get("sm_obj")?
this.add_to_library(autoload: true, autoplay: false)
BH.Player.play(this)
$(".artist-page .tracks li[data-id]").removeClass("now-playing").removeClass("paused")
this.node().addClass("now-playing")
app/assets/javascripts/backbone/templates/album/show.mustache
+2 -2
View File
@@ -9,12 +9,12 @@
<span data-translate-contents="artist.album.add">{{i18n_add}}</span>
</a>
</div>
<div class="bh-underlay-green">
<!-- <div class="bh-underlay-green">
<a href="" class="btn btn-bh-dark album-play">
<i class="icon-play icon-white"></i>
<span data-translate-contents="artist.album.play">{{i18n_play}}</span>
</a>
</div>
</div> -->
</div>
<ul class="tracks">
{{#album_tracks}}
app/assets/javascripts/backbone/templates/artist/show.mustache
+30 -28
View File
@@ -1,15 +1,15 @@
<div class="artist-page">
<h1>{{artist_title}}</h1>
<div class="artist-info">
<div class="pic">
<div class="row artist-info">
<div class="span4 pic">
<img src="{{artist_pic}}" alt="{{artist_title}}">
</div>
<div class="bio">{{& artist_bio}}</div>
<div class="span8 bio">{{& artist_bio}}</div>
</div>
<div class="albums">
{{#artist_albums}}
<div class="album">
<div class="pic">
<div class="row album">
<div class="span4 pic">
<img src="{{album_pic}}" alt="{{album_title}}"><br>
<div class="bh-underlay-blue">
<a href="" class="btn btn-bh-dark album-add">
@@ -17,35 +17,37 @@
<span data-translate-contents="artist.album.add">{{i18n_add}}</span>
</a>
</div>
<div class="bh-underlay-green">
<!-- <div class="bh-underlay-green">
<a href="" class="btn btn-bh-dark album-play">
<i class="icon-play icon-white"></i>
<span data-translate-contents="artist.album.play">{{i18n_play}}</span>
</a>
</div>
</div> -->
</div>
<h2 class="title">{{album_title}} ({{album_year}})</h2>
<ul class="tracks">
{{#album_tracks}}
<li data-id="{{track_id}}">
<a href="" class="btn btn-round track-play" data-translate-title="artist.album.track.play" title="{{i18n_play}}">
<i class="icon-play"></i>
</a>
<a href="" class="btn btn-round track-pause" data-translate-title="artist.album.track.pause" title="{{i18n_pause}}">
<i class="icon-pause"></i>
</a>
<div class="title">
<div class="inner">
<a href="{{track_url}}" class="track-link">{{track_title}}</a>
<div class="span8">
<h2 class="title">{{album_title}} ({{album_year}})</h2>
<ul class="tracks">
{{#album_tracks}}
<li data-id="{{track_id}}">
<a href="" class="btn btn-round track-play" data-translate-title="artist.album.track.play" title="{{i18n_play}}">
<i class="icon-play"></i>
</a>
<a href="" class="btn btn-round track-pause" data-translate-title="artist.album.track.pause" title="{{i18n_pause}}">
<i class="icon-pause"></i>
</a>
<div class="title">
<div class="inner">
<a href="{{track_url}}" class="track-link">{{track_title}}</a>
</div>
</div>
</div>
<span class="length">{{track_length}}</span>
<a href="" class="btn btn-round track-add" data-translate-title="artist.album.track.add" title="{{i18n_add}}">
<i class="icon-plus"></i>
</a>
</li>
{{/album_tracks}}
</ul>
<span class="length">{{track_length}}</span>
<a href="" class="btn btn-round track-add" data-translate-title="artist.album.track.add" title="{{i18n_add}}">
<i class="icon-plus"></i>
</a>
</li>
{{/album_tracks}}
</ul>
</div>
</div>
{{/artist_albums}}
</div>
app/assets/javascripts/bindings/autocomplete.js.coffee
+3 -3
View File
@@ -1,10 +1,10 @@
$ ->
$(".navbar-search input").focus ->
$(this).animate(width: 249)
$(this).animate(width: 244)
$(".player").animate(width: 368)
$(".navbar-search input").blur ->
$(this).animate(width: 99)
$(".player").animate(width: 518)
$(this).animate(width: 133)
$(".player").animate(width: 467)
window.desired = $(".navbar-search input").autocomplete
serviceUrl: "/api/search/complete.json"
app/assets/stylesheets/album-track.css.scss
+9 -8
View File
@@ -1,10 +1,11 @@
.artist-page .album .tracks {
margin-left: 265px;
margin: 0 0 10px 0;
& > li {
position: relative;
display: block;
width: 100%;
margin: 0 0 0 -5px;
width: 625px;
height: 38px;
list-style: none;
font-family: "Source Sans Pro", $helvetica;
@@ -15,7 +16,7 @@
&:after {
content: "";
display: block;
width: 627px;
width: 578px;
float: right;
border-bottom: #e0e0e0 1px solid;
margin: 0 5px 0 0;
@@ -54,12 +55,12 @@
}
.btn-round {
width: 10px;
width: 2px;
height: 22px;
border-radius: 50px;
i {
margin: 6px 0 0 -2px;
margin: 5px 0 0 -6px;
}
}
@@ -82,11 +83,11 @@
top: 5px;
left: 42px;
height: 28px;
max-width: 580px;
max-width: 530px;
overflow: hidden;
.inner {
width: 1000px;
width: 10000px;
.track-link {
color: #303030;
@@ -135,7 +136,7 @@
display: none;
i {
margin-left: -3px;
margin-left: -7px;
}
}
app/assets/stylesheets/application.css.scss
+7 -4
View File
@@ -9,7 +9,7 @@
@import "album-track";
@import "player";
@import "playlist";
@import "auth";
@import "preferences";
@import "popup";
@import "tour";
@@ -27,6 +27,7 @@ body {
.navbar {
background-color: #0a3a82;
background: url($blue_noise);
@include box-shadow(0 0 5px rgba(0, 0, 0, .5));
.navbar-inner {
background: none;
@@ -37,10 +38,11 @@ body {
}
}
a.brand {
margin-top: 1px;
margin-top: -1px;
font-family: "Lobster Two", $helvetica;
font-style: italic;
font-size: 24px;
line-height: 24px;
color: #fafafa;
letter-spacing: 1px;
text-shadow: 1px 1px 0 rgba(255, 255, 255, .2);
@@ -51,11 +53,12 @@ body {
}
}
.navbar-search {
margin-top: 8px;
margin: 6px;
input {
width: 99px;
width: 133px;
line-height: 16px;
color: #ffffff;
border-color: rgba(0, 0, 0, .4);
background-color: rgba(0, 0, 0, .3);
app/assets/stylesheets/artist.css.scss
+6 -10
View File
@@ -5,20 +5,19 @@
weight: 700;
size: 42px;
}
line-height: 64px;
line-height: 48px;
letter-spacing: 1px;
text-shadow: 0 0 1px rgba(0, 0, 0, .3);
}
.artist-info {
min-height: 250px;
min-height: 300px;
margin-bottom: 20px;
.pic {
float: left;
img {
width: 250px;
width: 100%;
margin-top: 5px;
border: {
size: 1px;
@@ -30,7 +29,6 @@
}
}
.bio {
margin-left: 270px;
font-family: "Source Sans Pro", $helvetica;
font-size: 22px;
line-height: 26px;
@@ -46,19 +44,17 @@
font: {
family: "Lobster Two", $helvetica;
weight: 700;
size: 26px;
size: 28px;
}
margin: 5px 0;
text-shadow: 0 0 1px rgba(0, 0, 0, .3);
}
.pic {
float: left;
height: 300px;
text-align: center;
img {
background-color: #a0a0a0;
width: 250px;
height: 250px;
width: 100%;
margin-top: 5px;
border: {
size: 1px;
app/assets/stylesheets/autocomplete.css.scss
+9 -11
View File
@@ -1,25 +1,24 @@
.autocomplete-w1 {
margin: 10px 0 0 0;
width: 268px;
margin: 8px 0 0 0;
width: 274px;
background: {
color: #f0f0f0;
color: rgba(240, 243, 246, .95);
color: #124ba8;
color: rgba(18, 75, 158, .95);
}
@include box-shadow(5px 14px 5px rgba(0, 0, 0, .15));
.autocomplete {
max-height: 330px !important;
div {
width: 258px;
width: 264px;
padding: 5px 5px;
border: {
color: transparent;
style: solid;
width: 1px;
}
background: {
color: #f0f0f0;
color: rgba(240, 243, 246, .95);
}
color: #f0f0f0;
&:last-child {
border-bottom: {
@@ -30,8 +29,7 @@
&.selected {
color: #ffffff;
background-color: #49AFCD;
background-color: rgba(73, 175, 205, .95);
background-color: rgba(255, 255, 255, .3);
border-radius: 5px;
}
}
app/assets/stylesheets/player.css.scss
+7 -7
View File
@@ -1,13 +1,13 @@
.player {
width: 518px;
width: 467px;
.controls {
float: left;
margin: 3px 0 0 -96px;
margin: 1px 0 0 -109px;
a {
@include inline-block;
margin: 11px 2px 0 0;
margin: 11px 6px 0 0;
font-size: 22px;
color: #e0e0e0;
text-shadow: 0 0 2px rgba(255, 255, 255, .6);
@@ -26,8 +26,8 @@
.progress-bar {
position: relative;
width: 100%;
height: 26px;
margin: 8px 0 0;
height: 28px;
margin: 6px 0 0;
background-color: rgba(0, 0, 0, .3);
border: {
style: solid;
@@ -40,7 +40,7 @@
.bar {
position: absolute;
width: 0%;
height: 26px;
height: 28px;
background-color: rgba(255, 255, 255, .1);
@include box-shadow(inset 0 0 2px rgba(255, 255, 255, .2));
@include border-radius(4px 0px 0px 4px);
@@ -52,7 +52,7 @@
family: "Source Sans Pro", $helvetica;
size: 14px;
}
line-height: 24px;
line-height: 26px;
color: #ffffff;
text-shadow: 1px 1px 0 rgba(80, 80, 80, .4);
}
app/assets/stylesheets/playlist.css.scss
+3 -3
View File
@@ -1,9 +1,9 @@
.playlist {
display: none;
position: absolute;
position: fixed;
top: 41px;
right: 50%;
width: 618px;
width: 578px;
margin-right: -430px;
padding: 7px 0 3px 0;
background-color: #124ba8;
@@ -45,7 +45,7 @@
}
.length {
position: absolute;
right: 9391px;
right: 9431px;
}
}
}
app/assets/stylesheets/auth.css.scss → app/assets/stylesheets/preferences.css.scss
+1 -1
View File
@@ -1,6 +1,6 @@
.navbar {
.preferences {
margin: 14px 10px 0 15px;
margin: 12px 10px 0 15px;
.toggle-button {
@include inline-block;