Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dealt with Issue 881 and overflow in GM screen. #1009

Closed
wants to merge 5 commits into from
Closed

Dealt with Issue 881 and overflow in GM screen. #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce6488c
Dealt with Issue 881 and overflow in GM screen.
Navot-Ram Aug 2, 2022
ebabcc1
Resolved Tests
Navot-Ram Aug 3, 2022
711c660
Prettier?
Navot-Ram Aug 3, 2022
a0f3633
Prettify
Navot-Ram Aug 3, 2022
0a0d222
Merge branch 'master' into Navot-Issue-881
Navot-Ram Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions modules/browser/src/screens/gm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { targetRadarWidget } from '../widgets/target-radar';
// enable pixi dev-tools
// https://chrome.google.com/webstore/detail/pixijs-devtools/aamddddknhcagpehecnhphigffljadon
// window.PIXI = PIXI;

const driver = new Driver(window.location);
const gmWidgets = new GmWidgets(driver);
const dashboard = new Dashboard(
Expand All @@ -40,6 +41,20 @@ const dashboard = new Dashboard(
$('#menuContainer')
);

// Navot added jQuery
$('#collapseSidebar').on('click', function () {
$('#menuContainer').toggleClass('collapsed');
$('#collapseSidebar').toggleClass('collapsed');
$('#layoutContainer').toggleClass('collapsed');
$('#wrapper').toggleClass('collapsed');
const basic: number = $(window).width() || 1920;
if ($('#wrapper').hasClass('collapsed')) {
dashboard.updateSize($(window).width(), $(window).height());
} else {
dashboard.updateSize(basic * 0.8, $(window).height());
}
});

dashboard.registerWidget(gmWidgets.radar);
dashboard.registerWidget(gmWidgets.tweak);

Expand Down
1 change: 1 addition & 0 deletions modules/browser/templates/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
</head>
<body>
<div id="wrapper">
<div id="collapseSidebar"></div>
<ul id="menuContainer"></ul>
<div id="layoutContainer"></div>
</div>
Expand Down
198 changes: 129 additions & 69 deletions static/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,171 @@
@font-face {
font-family: "Bebas";
src: url(../fonts/BebasNeue-Regular.ttf);
font-family: 'Bebas';
src: url(../fonts/BebasNeue-Regular.ttf);
}

@font-face {
font-family: "Electrolize";
src: url(../fonts/Electrolize-Regular.ttf);
font-family: 'Electrolize';
src: url(../fonts/Electrolize-Regular.ttf);
}

@font-face {
font-family: "Titillium Web";
src: url(../fonts/TitilliumWeb-Regular.ttf);
font-family: 'Titillium Web';
src: url(../fonts/TitilliumWeb-Regular.ttf);
}

@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../fonts/MaterialIcons-Regular.woff2) format('woff2');
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../fonts/MaterialIcons-Regular.woff2) format('woff2');
}

.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 18px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
-webkit-font-feature-settings: 'liga';
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 18px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
-webkit-font-feature-settings: 'liga';
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;

/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;

/* Support for IE. */
font-feature-settings: 'liga';
/* Support for IE. */
font-feature-settings: 'liga';
}
.material-icons {
color: rgba(255, 255, 255, 1);
}
.material-icons.md-inactive {
color: rgba(255, 255, 255, 0.3);
}
.material-icons { color: rgba(255, 255, 255, 1); }
.material-icons.md-inactive { color: rgba(255, 255, 255, 0.3); }

h2 {
/* font: 14px Arial, sans-serif; */
color: #fff;
padding: 10px;
text-align: center;
/* font: 14px Arial, sans-serif; */
color: #fff;
padding: 10px;
text-align: center;
}

html,
body {
height: 100%;
height: 100%;
}

* {
margin: 0;
padding: 0;
list-style-type: none;
margin: 0;
padding: 0;
list-style-type: none;
}

#wrapper {
height: 100%;
position: relative;
width: 100%;
overflow: auto;
height: 100%;
max-height: 100vh;
position: relative;
width: 100%;
overflow: auto;
}

#menuContainer {
width: 20%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background: #222;
#collapseSidebar {
width: 30px;
background-color: #333;
height: 30px;
left: calc(20% - 54px);
top: 20px;
z-index: 10;
position: absolute;
border-radius: 20px;
box-shadow: 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow;
transition: all ease 0.2s;
}
#collapseSidebar.collapsed {
left: 4px;
transition: all ease 0.2s;
background-color: greenyellow;
}

#collapseSidebar:hover {
width: 30px;
background-color: greenyellow;
height: 30px;
top: 20px;
z-index: 10;
position: absolute;
border-radius: 20px;
box-shadow: 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow,
0 0 4px greenyellow, 0 0 4px greenyellow;
transition: all ease 0.2s;
}
#collapseSidebar:focus {
background-color: greenyellow;
box-shadow: 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow, 0 0 4px greenyellow,
0 0 4px greenyellow, 0 0 4px greenyellow;
transition: all ease 0.2s;
}
#menuContainer {
width: 20%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background: #222;
max-height: 100vh;
overflow: scroll;
overflow-x: hidden;
transition: all 0.3s ease;
}
#menuContainer.collapsed {
width: 0%;
transition: all 0.3s ease;
}
#menuContainer li {
cursor: move;
border-bottom: 1px solid #000;
border-top: 1px solid #333;
cursor: pointer;
padding: 10px 5px;
color: #bbb;
background: #1a1a1a;
/* font: 12px Arial, sans-serif; */
cursor: move;
border-bottom: 1px solid #000;
border-top: 1px solid #333;
cursor: pointer;
padding: 10px 5px;
color: #bbb;
background: #1a1a1a;
/* font: 12px Arial, sans-serif; */
}

#menuContainer li:hover {
background: #111;
color: #ccc;
background: #111;
color: #ccc;
}

#layoutContainer {
width: 80%;
height: 100%;
position: absolute;
top: 0;
left: 20%;
box-shadow: -3px 0px 9px 0px rgba(0, 0, 0, 0.4);
width: 80%;
height: 100%;
position: absolute;
top: 0;
left: 20%;
box-shadow: -3px 0px 9px 0px rgba(0, 0, 0, 0.4);
transition: 0.3s all ease;
}

#layoutContainer.collapsed {
width: 100%;
left: 0;
transition: 0.3s all ease;
}
.lm_root {
width: 80%;
}
.lm_root.collapsed {
width: 100vw !important;
}
.lm_content {
overflow-y: auto;
}
overflow-y: auto;
}