diff options
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_minimap.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/rooms/_walls.js | 9 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 23 |
3 files changed, 33 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js index fabbdb9..d7280b9 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js @@ -7,6 +7,7 @@ Map.UI.Minimap = function(map){ base.creating = base.dragging = base.resizing = false +/* base.mouse = new mouse({ el: map.el, down: down, @@ -15,6 +16,7 @@ Map.UI.Minimap = function(map){ up: up, rightclick: rightclick, }) +*/ base.wheel = new wheel({ el: map.el, diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index 7438cd4..5ff53fe 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -125,6 +125,15 @@ wall: function(rgb){ var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity) + var rgbColor = rgb_string(rgb) + + var rgb_max = Math.max.apply(0, rgb) + var rgb_min = Math.min.apply(255, rgb) + var luminance = (rgb_max + rgb_min ) / 2 + + $("#header").toggleClass("black", luminance < 128) + $("body").css("background-color", rgbColor) + Walls.colors.wall = rgb Walls.list.forEach(function(wall){ wall.outline(rgbaColor, null) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index cef90a9..b4d176f 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -71,6 +71,27 @@ a{ left: 0; z-index: 6; } +#header.black .logo:hover { + background: white; +} +#header.black .logo:hover path { + fill: black; +} +#header.black path { + fill: white; +} +#header.black .topLinks a { + color: white; +} +#header.black .topLinks a:hover { + color: black; + background-color: white; +} +#header.black a#help-button:hover { + background-color: transparent; + text-shadow: 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff; +} + #help-button { display: none; border-right:0px!important; @@ -1566,7 +1587,7 @@ input[type="range"]::-webkit-slider-thumb { bottom: 10px; right: 10px; font-size: 12px; - -webkit-transform: translateY(450px); + -webkit-transform: translateY(500px); -webkit-transition: -webkit-transform 0.2s ease-in-out; transform: translateY(450px); transition: -webkit-transform 0.2s ease-in-out; |
