Skip to content

Commit

Permalink
Merge pull request #113 from amosproj/dev-#78
Browse files Browse the repository at this point in the history 
reconfiguration of the index.css
  • Loading branch information
@Waldleufer
Waldleufer authored Jun 10, 2021
2 parents 92f9c66 + 3ee89b6 commit 115565d
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 40 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/details/PieChartComponent.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const PieChartComponent = () => {
],
responsive: [
{
breakpoint: 5000,
breakpoint: 5600,
options: {
chart: {
height: '300px'
Expand Down
101 changes: 62 additions & 39 deletions frontend/src/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,36 @@ article > * + * {
margin-top: 1em;
}

:root {
/* --global--concept--size */
--global--header--color: #ededed;
--global--icon--color: #00b300;
--global--panel--color: 2rem;
--global--text--color: .5rem;


/* --global--concept--PropertyCamelCase */
--global--header-title--FontSize: 24px;
--global--header-icon-title--FontSize: 35px;
--global--header-back-icon-title--FontSize: 20px;
--global--panel-title--FontSize: 22px;
--global--icon-title--FontSize: 18px;
--global--text--FontSize: 18px;
--global--text-label--FontSize: 16px;
--global--text-title--FontSize: 20px;
--global--text-subtitle--FontSize: 19px;
--global--chart-items--FontSize: 10px;
--global--table-items--FontSize: 10px;
--global--button-title--FontSize: 14px;





/* --global--state--PropertyCamelCase */
--global--hover--BackgroundColor: #ccc;
}

/* Inherit fonts for inputs and buttons */
input,
button,
Expand All @@ -95,7 +125,7 @@ select {
}

body {
background-color: #ededed;
background-color: var(--global--header--color);
font-family: Muli;
font-style: normal;
font-weight: normal;
Expand Down Expand Up @@ -134,16 +164,16 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 24px;
font-size: var(--global--header-title--FontSize);
line-height: 16px;
letter-spacing: 0.5px;
margin-left: 30px;
color: #00b300;
}
/* Reconfiguration of the icon style on the header bar */
.HeaderIconSyle {
font-size: 35px;
color: #ededed;
font-size: var(--global--header-icon-title--FontSize);
color: var(--global--header--color);
padding-right: 100;
margin-right: 10px;
margin-top: 10px;
Expand All @@ -157,7 +187,7 @@ body {
padding: 12px;
background-color: #468c46 ;/* #466e78;*/
text-decoration: none;
font-size: 20px;
font-size: var( --global--header-back-icon-title--FontSize);
width: 20%; /* Four equal-width links. If you have two links, use 50%, and 33.33% for three links, etc.. */
text-align: right; /* If you want the text to be centered */
border-style: none;
Expand All @@ -182,7 +212,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 22px;
font-size: var(--global--panel-title--FontSize);
letter-spacing: 0.5px;
margin-left: 0px;
color: #dbdbdb;
Expand All @@ -204,7 +234,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18px;
font-size: var(--global--text--FontSize);
letter-spacing: 0.5px;
color: #000000;
margin-top:25px;
Expand All @@ -216,7 +246,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: bold;
font-size: 22px;
font-size: var(--global--text-title--FontSize);
letter-spacing: 0.5px;
color: #000000;
}
Expand All @@ -236,7 +266,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 8px;
font-size: var(--global--chart-items--FontSize);
margin-left: 0;
color: #000000;
margin-top:10px;
Expand All @@ -248,7 +278,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: bold;
font-size: 20px;
font-size: var(--global--text-title--FontSize);
letter-spacing: 0.5px;
color: #000000;
margin-bottom:10px;
Expand All @@ -257,20 +287,20 @@ body {
.CardTitle {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18;
font-weight: bold;
font-size: var(--global--text-title--FontSize);
letter-spacing: 0.5px;
padding-left: 17px;
color: #000000;
margin-bottom:10px;

padding-bottom:10px;
}

/* Reconfiguration of the subtitle style on table */
.TableSubTitle {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18px;
font-size: var(--global--text-subtitle--FontSize);
letter-spacing: 0.5px;
color: #000000;
margin-bottom:10px;
Expand All @@ -282,7 +312,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 12px;
font-size: var(--global--table-items--FontSize);
margin-left: 0;
color: #000000;
margin-top:10px;
Expand All @@ -296,7 +326,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18px;
font-size: var(--global--text--FontSize);
letter-spacing: 0.5px;
color: #000000;
margin-top: 10px;
Expand All @@ -306,7 +336,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 16px;
font-size: var(--global--text-label--FontSize);
letter-spacing: 0.5px;
color: #000000;
}
Expand All @@ -317,7 +347,7 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 14px;
font-size: var(--global--button-title--FontSize);
letter-spacing: 0.5px;
color: #000000;

Expand All @@ -343,7 +373,6 @@ body {

background-color: #FFFFFF;
/* border:0.5px solid #00b300; */
border-color: #00b300;
border-radius: 4px;
cursor: 'pointer';
min-width: 300;
Expand All @@ -362,13 +391,6 @@ body {
margin-right:10px;
margin-top:15px;

}
.miniCardContainer {
display: inline-block;
margin-right: 30;
margin-Left:0;
background-color: #FFFFFF;

}
.Separator {
border: 5px;
Expand All @@ -384,13 +406,24 @@ body {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18px;
color: #ededed;
font-size: var(--global--icon-title--FontSize);
color: var(--global--header--color);
padding-right: 100;
margin-bottom: 3px;
letter-spacing: 0.5px;
}

/* Reconfiguration of the title style on the side bar */
.SideBarTitle {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: var(--global--icon-title--FontSize);
letter-spacing: 0.2px;
color: var(--global--header--color);
margin-left: 5px;
}

/* Reconfiguration of the logo style on sidebar */
.TeamLogo{
height: fit-content;
Expand Down Expand Up @@ -436,16 +469,6 @@ body {
color: #00b300;
}

/* Reconfiguration of the title style on the side bar */
.SideBarTitle {
font-family: inherit;
font-style: normal;
font-weight: normal;
font-size: 18px;
letter-spacing: 0.2px;
color: #ededed;
margin-left: 5px;
}
.SideBarTitle:hover {
color: #00b300;
}
Expand Down

0 comments on commit 115565d

Please sign in to comment.