PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-24 22:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Things

Browse source
This commit is contained in:
nelsonlaquet 2013-07-26 04:20:34 -05:00
parent b35a132876
commit a7fdff3b1e
5 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/library/Assets.php
View file

@ -44,9 +44,11 @@
if ($area == 'app') if ($area == 'app')
return new AssetCollection([ return new AssetCollection([
new FileAsset('scripts/base/jquery-2.0.2.js'), new FileAsset('scripts/base/jquery-2.0.2.js'),
new FileAsset('scripts/base/jquery-ui.js'),
new FileAsset('scripts/base/underscore.js'), new FileAsset('scripts/base/underscore.js'),
new FileAsset('scripts/base/angular.js'), new FileAsset('scripts/base/angular.js'),
new FileAsset('scripts/base/ui-bootstrap-tpls-0.4.0.js'), new FileAsset('scripts/base/ui-bootstrap-tpls-0.4.0.js'),
new FileAsset('scripts/base/angular-ui-date.js'),
new FileAsset('scripts/base/angular-ui-router.js'), new FileAsset('scripts/base/angular-ui-router.js'),
new AssetCollection([ new AssetCollection([
new GlobAsset('scripts/shared/*.coffee'), new GlobAsset('scripts/shared/*.coffee'),
@ -69,6 +71,7 @@
$lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]); $lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]);
$css = new AssetCollection([ $css = new AssetCollection([
new FileAsset('styles/base/jquery-ui.css'),
new FileAsset('styles/app.less'), new FileAsset('styles/app.less'),
new CacheBusterAsset($lastModifiedCollection->getLastModified()) new CacheBusterAsset($lastModifiedCollection->getLastModified())
], [new \Assetic\Filter\LessFilter('node')]); ], [new \Assetic\Filter\LessFilter('node')]);

2
public/scripts/app/app.coffee
View file

@ -1,4 +1,4 @@
angular.module 'ponyfm', ['ui.bootstrap', 'ui.state'], [ angular.module 'ponyfm', ['ui.bootstrap', 'ui.state', 'ui.date'], [
'$routeProvider', '$locationProvider', '$stateProvider', '$dialogProvider' '$routeProvider', '$locationProvider', '$stateProvider', '$dialogProvider'
(route, location, state, $dialogProvider) -> (route, location, state, $dialogProvider) ->

19
public/styles/components.less
View file

@ -21,6 +21,25 @@
opacity:1; opacity:1;
} }
html body {
.ui-datepicker {
.border-radius(0px);
font-size: 9pt;
padding: 3px;
.ui-datepicker-header {
.border-radius(0px);
border: none;
border-bottom: 1px solid #777;
margin: -3px;
}
.ui-datepicker-calendar {
}
}
}
.dropdowns { .dropdowns {
.clearfix(); .clearfix();

3
public/styles/layout.less
View file

@ -9,6 +9,9 @@ html body {
background: #2D2D2D; background: #2D2D2D;
height: 100%; height: 100%;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
background-image: url('http://mlpforums.com/public/style_images/mlp/bg1-night-lightsout.png'), url('http://mlpforums.com/public/style_images/mlp/bg3-night.jpg');
background-position: bottom center, 50% 350px;
} }
.site-content { .site-content {

2
public/templates/account/content/tracks.html
View file

@ -114,7 +114,7 @@
</div> </div>
<div class="form-row span6" ng-class="{'has-error': errors.released_at != null}"> <div class="form-row span6" ng-class="{'has-error': errors.released_at != null}">
<label for="released_at" class="strong">Release Date:</label> <label for="released_at" class="strong">Release Date:</label>
<input type="text" id="released_at" ng-change="touchModel()" ng-model="edit.released_at" /> <input type="text" id="released_at" ui-date ng-model="edit.released_at" ng-change="touchModel()" ui-date-format="yy-mm-dd" />
<div class="error">{{errors.released_at}}</div> <div class="error">{{errors.released_at}}</div>
</div> </div>
</div> </div>