diff --git a/app/images/bay-1920x1080.jpg b/app/images/bay-1920x1080.jpg index 1fd003db..0f0a1f0f 100644 Binary files a/app/images/bay-1920x1080.jpg and b/app/images/bay-1920x1080.jpg differ diff --git a/app/images/deep-space-1920x1080.jpg b/app/images/deep-space-1920x1080.jpg new file mode 100644 index 00000000..af8018ea Binary files /dev/null and b/app/images/deep-space-1920x1080.jpg differ diff --git a/app/images/deep-space.jpg b/app/images/deep-space.jpg deleted file mode 100644 index 321b6239..00000000 Binary files a/app/images/deep-space.jpg and /dev/null differ diff --git a/app/images/docking-bay.jpg b/app/images/docking-bay.jpg deleted file mode 100644 index a6aea6a9..00000000 Binary files a/app/images/docking-bay.jpg and /dev/null differ diff --git a/app/js/directives/directive-header.js b/app/js/directives/directive-header.js index e6f027ab..5c1740c7 100644 --- a/app/js/directives/directive-header.js +++ b/app/js/directives/directive-header.js @@ -9,7 +9,6 @@ angular.module('app').directive('shipyardHeader', ['$rootScope', 'Persist', func scope.ships = DB.ships; scope.allBuilds = Persist.builds; scope.bs = Persist.state; - console.log(scope); $rootScope.$on('$stateChangeStart',function(){ scope.openedMenu = null; diff --git a/app/less/app.less b/app/less/app.less index f0337710..3159d243 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -2,6 +2,7 @@ @import 'fonts'; @import 'utilities'; @import 'icons'; +@import 'background-images'; @import 'header'; @import 'shipyard'; @import 'list'; @@ -25,19 +26,9 @@ body { overflow-x: hidden; background-image: none; background-repeat: no-repeat; - background-position: center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; + background-position: center; + background-attachment: fixed; background-size: cover; - - &.deep-space { - background-image: url(images/deep-space.jpg); - } - - &.docking-bay { - background-image: url(images/bay-1920x1080.jpg); - } } #main { diff --git a/app/less/background-images.less b/app/less/background-images.less new file mode 100644 index 00000000..295dd50e --- /dev/null +++ b/app/less/background-images.less @@ -0,0 +1,8 @@ + +.deep-space { + background-image: url(images/deep-space-1920x1080.jpg); +} + +.docking-bay { + background-image: url(images/bay-1920x1080.jpg); +} \ No newline at end of file diff --git a/app/less/list.less b/app/less/list.less index ea72aa4f..77ef4f8d 100644 --- a/app/less/list.less +++ b/app/less/list.less @@ -36,15 +36,8 @@ color: @disabled; cursor: pointer; - &:hover { - color: @warning-disabled; - } - &.enabled { color: @fg; - &:hover { - color: @warning; - } } &.consumer {