eggman20339/CNSA-216-FP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	FWA_MAIN/bin/FWA_MAIN.dll
#	FWA_MAIN/bin/FWA_MAIN.pdb
#	FWA_MAIN/obj/Debug/FWA_MAIN.dll
#	FWA_MAIN/obj/Debug/FWA_MAIN.pdb
This commit is contained in:
cadenjmoore 2024-04-03 15:21:49 -04:00
commit 1af5fa7a4f
8 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FWA_MAIN/Default.aspx
View File

@ -4,12 +4,41 @@
<head>
<link href="main.css" rel="stylesheet" type="text/css" />
<style>
.parent {
position: relative;
height: 100%;
}
.child {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
h1{
text-align: center;
}
</style>
</head>
<body runat="server">
<div class="standardcontentpage">
<div class="parent">
<h1>Hello</h1>
<div class="child">
<h1>Welcome to Louis' Pharmacy!</h1>
<br/><br/>
<h1>Use the pane on the left to navigate</h1>
<h1>Make a selection and right click for more options</h1>
</div>
</div></body>

BIN
FWA_MAIN/bin/FWA_MAIN.dll
View File

Binary file not shown.

BIN
FWA_MAIN/bin/FWA_MAIN.pdb
View File

Binary file not shown.

BIN
FWA_MAIN/obj/Debug/FWA_MAIN.dll
View File

Binary file not shown.

BIN
FWA_MAIN/obj/Debug/FWA_MAIN.pdb
View File

Binary file not shown.

33
FWA_MAIN/obj/Debug/Package/PackageTmp/Default.aspx
View File

@ -4,12 +4,41 @@
<head>
<link href="main.css" rel="stylesheet" type="text/css" />
<style>
.parent {
position: relative;
height: 100%;
}
.child {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
h1{
text-align: center;
}
</style>
</head>
<body runat="server">
<div class="standardcontentpage">
<div class="parent">
<h1>Hello</h1>
<div class="child">
<h1>Welcome to Louis' Pharmacy!</h1>
<br/><br/>
<h1>Use the pane on the left to navigate</h1>
<h1>Make a selection and right click for more options</h1>
</div>
</div></body>

BIN
FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll
View File

Binary file not shown.

BIN
FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb
View File

Binary file not shown.