Skip to content

Add files via upload #10

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

Open
feialm wants to merge 1 commit into
base: elin-7-reportsidedone-hours-and-hh-byt-plats
Choose a base branch
from
Open

Add files via upload #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 52 additions & 75 deletions App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@ a{
text-decoration-line: none;
}

h1, td, input{
p, h1, td{
color: #C9C7CE;
font-family: "Roboto";
}

p{
font-size:calc(14px + .8vw);
color: #C9C7CE;

}

.h3{
Expand Down Expand Up @@ -75,7 +68,7 @@ display: inline-block;
.App-bottom{
position: fixed;
bottom: 0;
height: 100px;
height: 70px;
width: 100%;
z-index: 9;
background-color: #2C3535;
Expand All @@ -89,7 +82,7 @@ display: inline-block;
}

.head h1{
margin: 30px 0 0px 0;
margin: 30px 0 12px 0;
}

#root{
Expand All @@ -113,10 +106,6 @@ display: inline-block;
.orangeButton{
background-color: #e3871b;
}

.mainBody{
margin-bottom: 100px;
}
/*******************************************************************************************/


Expand All @@ -131,12 +120,9 @@ display: inline-block;
width: 100%;
}

.recTimeText{
font-size: calc(24px + .8vw);
}

.recTime{
position: absolute;
font-size: 24px;
width: 100%;
top: 38%;
}
Expand Down Expand Up @@ -181,18 +167,6 @@ display: inline-block;
/*******************************************************************************************/


input:focus {
background-color: #C9C7CE;
color: black;
}

input:focus::-webkit-input-placeholder {
color: transparent;
}

input::-webkit-input-placeholder{
color: #262e2e;
}


/*Bar*/
Expand All @@ -210,10 +184,25 @@ input{
border: none;
text-indent: 10px;
font-size: 20px;
font-family: "Roboto";
background-color: #4C5454;
color: #C9C7CE;
}

input:focus {
background-color: #C9C7CE;
color: black;
}

input:focus::-webkit-input-placeholder {
color: transparent;
}

input::-webkit-input-placeholder{
color: #262e2e;
}


#bars{
height: 100%;
}
Expand All @@ -223,7 +212,7 @@ input{
/*Bars - "child"*/
.wrapperActivity{
height: 65px;
width: 70%;
width: 80%;
margin: auto;
border-style: solid;
border-color: #C9C7CE;
Expand All @@ -233,7 +222,6 @@ input{
background-color: #262e2e;
}


.activityName{
text-align: left;
margin-top: 0;
Expand Down Expand Up @@ -288,11 +276,13 @@ input{
height: 100vh;
}

.wrapperOutline{
.wrapperAddActivity{
border-style: solid;
border-color: #C9C7CE;
border-width: 1px;
width: 80%;
justify-content: center;
margin: auto;
}

/*Activity name*/
Expand Down Expand Up @@ -391,12 +381,13 @@ input{
/*Buttons in "Add Activity"*/
.addActivityButton{
width: 80%;
height: 40px;
padding: 30px 0;
margin: auto;
}

#formSaveButton{
width: 215px;
width: 200px;
}

#resetButton{
Expand Down Expand Up @@ -504,7 +495,28 @@ text-align: left;
margin-bottom: 59%;
}
/* Textfields i ReportTime */
input{
height: 40px;
border: none;
text-indent: 10px;
font-size: 20px;
font-family: "Roboto";
background-color: #4C5454;
color: #C9C7CE;
}

input:focus {
background-color: #C9C7CE;
color: black;
}

input:focus::-webkit-input-placeholder {
color: transparent;
}

input::-webkit-input-placeholder{
color: #262e2e;
}

#hh{
width: 60px;
Expand Down Expand Up @@ -570,25 +582,25 @@ text-align: left;
#rhsText{
position: absolute;
text-align: center;
font-size: 20px;
width: 100%;
top: 29%;
color: #DDDDDD;
}
#rhsText p{
margin: 0px;
font-size: calc(22px);
}

#lhsText{
position: absolute;
text-align: center;
font-size: 20px;
width: 100%;
top: 32%;
color: #DDDDDD;
}
#lhsText p{
margin: 0px;
font-size: calc(22px);
margin: 0px;
}

.goal{
Expand Down Expand Up @@ -800,6 +812,8 @@ height: 100%;
width: 80%;
display: block;
margin-top: 0;
margin-left: auto;
margin-right: auto;
margin-bottom: 25px;
border-style: solid;
border-color: #C9C7CE;
Expand All @@ -824,41 +838,4 @@ height: 100%;
font-size: 16px;
margin-top: -16px;
}
/*******************************************************************************************/

.nextPage_left{
position: fixed;
top: 50%;
left:-32px;
background-color: hotpink;
height: 60px;
width: 60px;
z-index: 130;
border-radius: 20px;
text-align: right;
font-size: 30px;


}

.nextPage_right{
position: fixed;
top: 50%;
right:-32px;
background-color: green;
height: 60px;
width: 60px;
z-index: 130;
border-radius: 20px;
text-align: left;
}

.nextPage_right p{
font-size: 30px;
margin: 8px 0 0 5px;
}

.nextPage_left p{
font-size: 30px;
margin: 8px 5px 0 0;
}
/*******************************************************************************************/
16 changes: 7 additions & 9 deletions BarSite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ console.log(a);

//}//den här är tillaggd var sist förut!!!!!!!!!!!!
/*renderar sidelementen typ*/
function BarSite(HHH) {
function BarSite(HHH) {
// test
const [ToCourseInfo, setToCourseInfo] = useState(0);

Expand Down Expand Up @@ -269,7 +269,10 @@ function BarSite(HHH) {
{renderActivities(HHH)} {/*här ska vi rendera ActivityInfo, för att skriva ut kursinfo*/}
</div>


{/*Footer*/}
<div className="App-bottom">
<p className="dots">Bottom Header</p>
</div>

{/*Menu Button*/}
<div className="menuButton" onClick={HandleClickMenu}>
Expand All @@ -285,7 +288,7 @@ function BarSite(HHH) {
<div className="menuClass" style={{width: menuWidth}}>
<div className="menuID" style={{width: menuWidth}}></div>
<Link to="/ReportTime.js"><button className="reportButton" style={{width: buttonWidth}}>{reportTime()}</button></Link>
<Link to="/"><button className="addButton" style={{width: buttonWidth}}>{addActivity()}</button></Link>
<button className="addButton" style={{width: buttonWidth}}>{addActivity()}</button>
<button className="deleteButton" style={{width: buttonWidth}}>{deleteActivity()}</button>
</div>

Expand All @@ -294,14 +297,9 @@ function BarSite(HHH) {
{questionText()}
</div>

<Link to="/DonutSite.js"><div className="nextPage_right"><p>&#62;</p>
</div></Link>

<div>
{/*Footer*/}
<div className="App-bottom">
<p className="dots">Bottom Header</p>
</div>

</div>
);

Expand Down
9 changes: 3 additions & 6 deletions CourseInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,9 @@ function courseinfo() {
<button onClick={() =>( myData[0].id, myData[0].startDate,myData[0].endDate,myData[0].value)} className="editButton center">
<p className="buttonText" id="editButtonText">Edit activity</p>
</button>
</div>
{/*Footer*/}
<div className="App-bottom">
<p className="dots">Bottom Header</p>
</div>

</div>


</div>
);
}
Expand Down
Loading