Build related fixes

This commit is contained in:
Ufuk Kayserilioglu committed 2015-03-15 04:06:40 +02:00
1 parent 1292fb455e
commit 2c0f38a08f
2 files changed
+12 -3

No files matched your search

+10 -1
View File
@@ -56,7 +56,7 @@ set :images_dir, 'images'
# Build-specific configuration # Build-specific configuration
configure :build do configure :build do
# For example, change the Compass output style for deployment # For example, change the Compass output style for deployment
activate :minify_css # activate :minify_css
# Minify Javascript on build # Minify Javascript on build
activate :minify_javascript activate :minify_javascript
@@ -70,3 +70,12 @@ configure :build do
# Or use a different image path # Or use a different image path
# set :http_prefix, "/Content/images/" # set :http_prefix, "/Content/images/"
end end
activate :deploy do |deploy|
deploy.method = :git
# Optional Settings
# deploy.remote = 'custom-remote' # remote name or git url, default: origin
# deploy.branch = 'custom-branch' # default: gh-pages
# deploy.strategy = :submodule # commit strategy: can be :force_push or :submodule, default: :force_push
# deploy.commit_message = 'custom-message' # commit message (can be empty), default: Automated commit at `timestamp` by middleman-deploy `version`
end
+2 -2
View File
@@ -1,7 +1,7 @@
//= require_tree . //= require_tree .
angular.module('theme', []) angular.module('theme', [])
.controller('ThemeController', function($scope) { .controller('ThemeController', ['$scope', function($scope) {
$scope.$watch( $scope.$watch(
function() { return $scope.theme; }, function() { return $scope.theme; },
function(theme) { function(theme) {
@@ -15,4 +15,4 @@ angular.module('theme', [])
$scope.active_presence = parts[6]; $scope.active_presence = parts[6];
$scope.mention_badge = parts[7]; $scope.mention_badge = parts[7];
}); });
}); }]);