Skip to content

Commit

Permalink
Merge branch 'dev-channel'
Browse files Browse the repository at this point in the history
  • Loading branch information
Truiteseche committed Apr 8, 2024
2 parents 2b54a8d + 78be1c2 commit f98a9db
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/EdpUnblock/EdpUnblock.css
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
}

@media only screen and (max-width: 810px) {
#edpu-page:has(main:has(.suggested-browser)) {
#edpu-page:has(main .suggested-browser) {
height: max(100%, 1200px);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/components/Lab/Lab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import ProxyErrorNotification from "../Errors/ProxyErrorNotification";
import "./Lab.css";
import RadioButton from "../generic/UserInputs/RadioButton";
import ToggleSwitch from "../generic/UserInputs/ToggleSwitch";
import { getBrowser, getOS } from "../../utils/utils";

export default function Lab({ fetchGrades }) {
const addNotification = useCreateNotification()
Expand Down Expand Up @@ -277,6 +278,10 @@ export default function Lab({ fetchGrades }) {
<p>{toggleSwitchState ? "true" : "false"}</p>
<ToggleSwitch value={toggleSwitchState} onChange={(value) => setToggleSwitchState(!value)}/>

<h2>OS - BROWSER</h2>
<p>userOs: {getOS()}</p>
<p>userBrowser: {getBrowser()}</p>

{/* FOOTER */}
<div style={{ height: "100px" }}></div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/Login/Login.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

.dark #edp-unblock-ad {
background-color: rgba(var(--text-color-alt), .2);
-webkit-backdrop-filter: blur(8px) brightness(.5);
backdrop-filter: blur(8px) brightness(.5);
}
.light #edp-unblock-ad {
Expand Down

0 comments on commit f98a9db

Please sign in to comment.