From a7fdff3b1e41dce79ecee484a2787b3e11e081a8 Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Fri, 26 Jul 2013 04:20:34 -0500 Subject: [PATCH] Things --- app/library/Assets.php | 3 +++ public/scripts/app/app.coffee | 2 +- public/styles/components.less | 19 +++++++++++++++++++ public/styles/layout.less | 3 +++ public/templates/account/content/tracks.html | 2 +- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/library/Assets.php b/app/library/Assets.php index 2d3e0361..9b1a7b55 100644 --- a/app/library/Assets.php +++ b/app/library/Assets.php @@ -44,9 +44,11 @@ if ($area == 'app') return new AssetCollection([ 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/angular.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 AssetCollection([ new GlobAsset('scripts/shared/*.coffee'), @@ -69,6 +71,7 @@ $lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]); $css = new AssetCollection([ + new FileAsset('styles/base/jquery-ui.css'), new FileAsset('styles/app.less'), new CacheBusterAsset($lastModifiedCollection->getLastModified()) ], [new \Assetic\Filter\LessFilter('node')]); diff --git a/public/scripts/app/app.coffee b/public/scripts/app/app.coffee index b0d6f0eb..ee202c43 100644 --- a/public/scripts/app/app.coffee +++ b/public/scripts/app/app.coffee @@ -1,4 +1,4 @@ -angular.module 'ponyfm', ['ui.bootstrap', 'ui.state'], [ +angular.module 'ponyfm', ['ui.bootstrap', 'ui.state', 'ui.date'], [ '$routeProvider', '$locationProvider', '$stateProvider', '$dialogProvider' (route, location, state, $dialogProvider) -> diff --git a/public/styles/components.less b/public/styles/components.less index 2687fe57..ce02027a 100644 --- a/public/styles/components.less +++ b/public/styles/components.less @@ -21,6 +21,25 @@ 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 { .clearfix(); diff --git a/public/styles/layout.less b/public/styles/layout.less index 336d9025..db268ffc 100644 --- a/public/styles/layout.less +++ b/public/styles/layout.less @@ -9,6 +9,9 @@ html body { background: #2D2D2D; height: 100%; 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 { diff --git a/public/templates/account/content/tracks.html b/public/templates/account/content/tracks.html index cf529302..0319b4d5 100644 --- a/public/templates/account/content/tracks.html +++ b/public/templates/account/content/tracks.html @@ -114,7 +114,7 @@
- +
{{errors.released_at}}