Skip to content

Commit

Permalink
Merge 5b13800 into 2f57617
Browse files Browse the repository at this point in the history
  • Loading branch information
huaxing-yuan authored Jun 15, 2023
2 parents 2f57617 + 5b13800 commit 01bcf02
Show file tree
Hide file tree
Showing 23 changed files with 339 additions and 298 deletions.
2 changes: 1 addition & 1 deletion src/AxaFrance.WebEngine/Report/ReportHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static string GenerateHtmlReport(TestSuiteReport report, string testname,
Directory.CreateDirectory(imgPath);
foreach(ScreenshotReport img in GetScreenshots(report))
{
string targetPath = Path.Combine(imgPath, img.Id + ".jpg");
string targetPath = Path.Combine(imgPath, img.Id + ".png");
File.WriteAllBytes(targetPath, img.Data);
}
return reportFullPath;
Expand Down
Binary file modified src/AxaFrance.WebEngine/html-report.zip
Binary file not shown.
44 changes: 25 additions & 19 deletions src/AxaFrance.WebEngine/html-report/assets/css/badge.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,44 @@
.badge{
.badge {
border-radius: 0rem !important;
}

.badge-container{
.badge-container {
margin-right: 5px;
transition: 200ms all ease-in-out;
}
/*.badge-container:hover {*/
/* transform: translateY(-4px);*/
/* cursor: pointer;*/
/*}*/

.badge-action{
color: #ffffff !important;
background-color: #000072 !important;
font-weight: bold !important;
border: 1px solid #CCD1D1;
font-size: 14px !important;
.badge-action {
font-weight: 350 !important;
background-color: #00008f !important;
color: white;
font-size: 16px !important;
display: inline-block;
padding: 0.8em 1.5em !important;
border-radius: 30px !important;
}

.badge-action-green{
color: #27AE60 !important;
.badge-action-green {
color: #27ae60 !important;
}

.badge-action-red{
color: #E74C3C !important;
.badge-action-red {
color: #e74c3c !important;
}

.badge-action-blue{
color: #3498DB !important;
.badge-action-blue {
color: #3498db !important;
}

.badge-action-gray{
color: #CCD1D1 !important;
.badge-action-gray {
color: #ccd1d1 !important;
}

.badge-action-hover:hover{
.badge-action-hover:hover {
cursor: pointer;
background-color: white !important;
color:gray !important;
color: gray !important;
}

Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.general-information {
display: flex;
justify-content: flex-start;
justify-content: center;
flex-wrap: wrap;
align-items: center;
height: 7%;
padding: 0px;
color: gray;
border-bottom: 1px solid #D7DBDD;
}
background-color: white;
margin: 1em 0;
}
21 changes: 8 additions & 13 deletions src/AxaFrance.WebEngine/html-report/assets/css/body-content.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,33 @@
justify-content: space-between;
padding: 10px;
color: gray;
height: 83%;
background-color: #F8F9F9;
height: 78%;
}

.body-left-container{
.body-left-container {
display: flex;
flex-wrap: wrap;
align-items: flex-start;
width: 40%;
height: 100%;
overflow: auto;
background-color: #ffffff;
background-color: white;
position: relative;
box-shadow: 0 1px 3px rgb(0 0 0 / 12%), 0 1px 2px rgb(0 0 0 / 24%);
border: 1px solid #e7e9eb;
}

.body-right-container{
.body-right-container {
display: flex;
flex-direction: column;
flex-wrap: wrap;
align-items: flex-start;
/*border: 1px solid #0d8bf2;*/
height: 100%;
width: 60%;
background-color: #ffffff;
background-color: white;
position: relative;
box-shadow: 0 1px 3px rgb(0 0 0 / 12%), 0 1px 2px rgb(0 0 0 / 24%);
margin-left: 20px;
overflow: auto;
border: 1px solid #e7e9eb;
}

.body-right-container-class{
}
.body-right-container-class {
}

46 changes: 9 additions & 37 deletions src/AxaFrance.WebEngine/html-report/assets/css/content-view.css
Original file line number Diff line number Diff line change
@@ -1,42 +1,14 @@
.information{
display: flex;
flex-direction: column;
gap: 10px;
align-items: center;
height: 100%;
.content-header-container {
padding: 1em;
margin-bottom: 1em;
width: 100%;
padding:5px;
padding-top: 10px;
height: 8%;
}

.card {
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
width: 99%;
}

.card:hover {
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
}

.card-header{
align-items: stretch;
color: #000000;
height: 25%;
padding: 0!important;
padding-left: 5px!important;
padding-left: 5px!important;
align-items: center;
}

.card-header-image{
height: 10%;
}

.card-text-container{
height: 20%;
.content-container{
width: 100%;
height: 90%;
overflow: auto;
background-color: #ffffff;
}

.card-image-container{
height: 55%;
}
46 changes: 20 additions & 26 deletions src/AxaFrance.WebEngine/html-report/assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* Layout */
@import url("https://fonts.googleapis.com/css2?family=Raleway:wght@100;200;300;400;500;600;700;800;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@100;200;300;400;500;600;700;800;900&display=swap");
html {
display: flex;
flex-direction: column;
Expand All @@ -12,7 +14,8 @@ body {
min-height: 100vh; /*toute la hauteur du viewport (compatible IE9+) */
margin: 0;
background: #fff;
font-family: Source Sans Pro, sans-serif;
/* font-family: Source Sans Pro, sans-serif; */
font-family: "Raleway";
font-size: 14px !important;
height: 100%;
width: 100%;
Expand All @@ -33,21 +36,27 @@ section {
}

.common-font {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
"Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji";
font-weight: 600;
line-height: 2;
color: #515a5a;
}

.title {
color: #F1948A;
color: #f1948a;
}

.label-in-tab {
width: 100%;
height: 100%;
margin-bottom: 0px;
cursor: pointer;
font-weight: 700;
font-size: 1.2em;
color: #00008f;
font-family: "Poppins" !important;
}

.shadow {
Expand All @@ -57,7 +66,8 @@ section {
}

.selected-line {
color: #000072!important;
color: #000072 !important;
font-weight: bold;
}

a {
Expand All @@ -70,29 +80,29 @@ a {
#style-srollbar::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
background-color: #f5f5f5;
}

#style-srollbar::-webkit-scrollbar {
width: 12px;
background-color: #F5F5F5;
background-color: #f5f5f5;
}

#style-srollbar::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
background-color: #D62929;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
background-color: #d62929;
}

/* ***********************footer*********************** */
footer {
background: #F8F9F9;
background: #f8f9f9;
text-align: center;
position: fixed;
left: 0;
bottom: 0;
width: 100%;
color: #7F8C8D;
color: #7f8c8d;
}

/* ***********************Responsive*********************** */
Expand All @@ -116,19 +126,3 @@ footer {
}
}

















39 changes: 22 additions & 17 deletions src/AxaFrance.WebEngine/html-report/assets/css/header.css
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
/*----------------------------------HEADER----------------------------------*/
.site-header {
display: flex;
justify-content: space-between;
height: 10%;
padding: 20px;
color: gray;
border-bottom: 1px solid #D7DBDD;
box-shadow: 0 1px 6px 0 rgba(32, 33, 36, .28);
box-shadow: 0 1px 6px 0 rgba(32, 33, 36, 0.28);
background-color: #00008f;
text-align: center;
border-radius: 2em 2em 0em 0em;
}
.site-header .fa-registered {
color: white;
}

.site-header-section {
display: flex;
align-items: center;
justify-content:center;
justify-content: center;
flex-grow: 1;
}

.site-header-section-left{
justify-content:flex-start!important;
}
/* .site-header-section-left {
justify-content: flex-start !important;
} */

.site-header-section-right{
justify-content: flex-end!important;
align-items: center!important;
.site-header-section-right {
justify-content: flex-end !important;
align-items: center !important;
}

.site-header-section-center {
flex-grow: 3;
}

.site-header-item-center{
.site-header-item-center {
width: 100%;
text-align: center;
}
Expand All @@ -38,26 +42,27 @@
padding: 5px 15px;
color: #515a5a;
font-size: 25px;
color: #000072;
color: white;
}

.site-header-item + .site-header-item {
margin-left: 0px;
}

.site-header-icon {
font-size:30px;
color:#515a5a;
font-size: 30px;
color: #515a5a;
}

.site-header-icon-application {
color: #000072;
}

.site-header-search-button {
background: #E5E7E9;
background: #e5e7e9;
border: 0;
color:#c0392b;
color: #c0392b;
padding: 0.5rem;
border-radius: 0;
}
}

Loading

0 comments on commit 01bcf02

Please sign in to comment.