diff --git a/client/cssFiles/SEAWebClientMain.css b/client/cssFiles/SEAWebClientMain.css index a9a89bc..b69e0fb 100644 --- a/client/cssFiles/SEAWebClientMain.css +++ b/client/cssFiles/SEAWebClientMain.css @@ -112,6 +112,27 @@ meta, body { vertical-align: top; } +#control_bar { + border: none; +} + +.control-global{ + width: 20px !important; + height: 20px !important; + margin-top: 2px; +} + +.menu-title-container img, +#export-popup-header img { + margin-top: 3px !important; + height: 20px !important; + width: 20px !important; + } + + .panel .menu { + border: 1px solid #303030; + } + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ /* CENTER */ #center { diff --git a/client/jsFiles/SEAWebClientGraphics.js b/client/jsFiles/SEAWebClientGraphics.js index a6aeebb..bb6097e 100644 --- a/client/jsFiles/SEAWebClientGraphics.js +++ b/client/jsFiles/SEAWebClientGraphics.js @@ -223,7 +223,8 @@ let globalControls = (function (){ controlBar.id = "control_bar"; panel.appendChild(controlBar); - let xyControl = new Control("res/x_zoom_white_wide.png", "res/y_zoom_white_wide.png", "Time<->Y zoom (one graph)", graphs.toggleZoomMode, graphs.toggleZoomMode); + // let xyControl = new Control("res/x_zoom_white_wide.png", "res/y_zoom_white_wide.png", "Time<->Y zoom (one graph)", graphs.toggleZoomMode, graphs.toggleZoomMode); + let xyControl = new Control("res/icon_width.png", "res/icon_height.png", "Time<->Y zoom (one graph)", graphs.toggleZoomMode, graphs.toggleZoomMode); controlBar.appendChild(xyControl); @@ -340,7 +341,8 @@ function loadGraphicsMenu(panel){ menuGraphicsPopup.addEntry(aboutCurvesSettingsHelpEntry); menuGraphicsPopup.addEntry(aboutTopRightHandCornerCrossHelpEntry); - let graphicsMenuControl = new Control("res/menu_white_wide.png", "res/menu_white_wide.png", "Menu", () => { + // let graphicsMenuControl = new Control("res/menu_white_wide.png", "res/menu_white_wide.png", "Menu", () => { + let graphicsMenuControl = new Control("res/icon_menu_graphics.png", "icon_menu_graphics.png.png", "Menu", () => { datesPopup.hide(); exportPopup.hide(); curvesSettingsPopup.hide(); @@ -351,8 +353,8 @@ function loadGraphicsMenu(panel){ menuGraphicsPopup.getContainer().style.right = "20px"; menuGraphicsPopup.style.position = "absolute"; panel.appendChild(graphicsMenuControl); - graphicsMenuControl.style.marginLeft="6px"; - graphicsMenuControl.style.marginRight="22px"; + graphicsMenuControl.style.marginLeft="0px"; + graphicsMenuControl.style.marginRight="28px"; graphicsMenuControl.style.marginTop="2px"; } diff --git a/client/res/close.png b/client/res/close.png index a2961e7..fff2688 100644 Binary files a/client/res/close.png and b/client/res/close.png differ diff --git a/client/res/icon_height.png b/client/res/icon_height.png new file mode 100644 index 0000000..747cf51 Binary files /dev/null and b/client/res/icon_height.png differ diff --git a/client/res/icon_menu_graphics.png b/client/res/icon_menu_graphics.png new file mode 100644 index 0000000..21868c9 Binary files /dev/null and b/client/res/icon_menu_graphics.png differ diff --git a/client/res/icon_width.png b/client/res/icon_width.png new file mode 100644 index 0000000..1bacbdc Binary files /dev/null and b/client/res/icon_width.png differ