Skip to content

Commit

Permalink
taskmanager v0.9.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@chinonso098
chinonso098 committed Nov 1, 2023
1 parent c904213 commit a2bf6fd
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 27 deletions.
71 changes: 51 additions & 20 deletions src/app/system-apps/taskmanager/taskmanager.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
min-height: 150px; /* Set the height of the card */

border: 1px solid #ccc; /* Add a border to the card */
border-radius: 1px; /* Add rounded corners to the card */
overflow-x:scroll;
overflow-y: scroll;
/* border-radius: 0; Add rounded corners to the card */
overflow-x:hidden;
overflow-y: hidden;
}

/* Custom styles for the card-body */
Expand Down Expand Up @@ -41,7 +41,7 @@
padding: 10px; /* Add padding inside columns */
background-color: #ffffff; /* Set a background color for columns */
border: 1px solid #cccccc; /* Add a border to columns */
border-radius: 1px; /* Add rounded corners to columns */
/* border-radius: 1px; Add rounded corners to columns */
color: #000; /* Set text color for columns */
}

Expand All @@ -62,7 +62,7 @@
background-color: #ffffff; /* Set a background color for col-md-2 */
padding: 10px; /* Add padding inside col-md-2 */
border: 1px solid #ccc; /* Add a border to col-md-2 */
border-radius: 0; /* Add rounded corners to col-md-2 */
/* border-radius: 0; Add rounded corners to col-md-2 */
color: #000; /* Set text color for col-md-2 */
min-width: 25px;
/* max-width: 100px; */
Expand All @@ -73,7 +73,7 @@
background-color: #ffffff; /* Set a background color for col-md-4 */
padding: 10px; /* Add padding inside col-md-4 */
border: 1px solid #ccc; /* Add a border to col-md-4 */
border-radius: 0; /* Add rounded corners to col-md-4 */
/* border-radius: 0; Add rounded corners to col-md-4 */
color: #000; /* Set text color for col-md-4 */
min-width: 25px;
/* max-width: 200px; */
Expand All @@ -84,7 +84,7 @@
background-color: #ffffff; /* Set a background color for col-md-6 */
padding: 10px; /* Add padding inside col-md-6 */
border: 1px solid #ccc; /* Add a border to col-md-6 */
border-radius: 0; /* Add rounded corners to col-md-6 */
/* border-radius: 0; Add rounded corners to col-md-6 */
color: #000; /* Set text color for col-md-6 */
min-width: 25px;
/* max-width: 300px; */
Expand All @@ -110,15 +110,24 @@
font-size: 13px;
height: 55px;
min-width: 90px;
border: 1px solid #ccc; /* Cell border */
border: 1px solid #ccc; /* Cell border */
border-top: none;
vertical-align: middle;

}

.table th:first-child th:last-child{
border-left: 0;
border-right: 0;
}

span {
display: block; /* Ensures each span is on a new line */
}
tbody{
border-left: 0;
border-right: 0;
}

/* Custom styles for table rows */
.table tr {
Expand All @@ -143,6 +152,11 @@ span {
border-top:none; border-bottom:none;
}

.table td:first-child td:last-child{
border-left: 0;
border-right: 0;
}

/* Add hover effect to table rows (optional) */
.table tr:hover {
background-color: #e8f4fc;
Expand All @@ -151,22 +165,22 @@ span {
/* Custom styles for .table-responsive (Optional) */
.table-responsive {
max-width: 100%; /* Set a maximum width for the responsive container */
min-width: 400px;
overflow: auto; /* Enable horizontal scrolling when needed */
/* min-width: 400px;*/
border-top: none;
}


figure{
align-items: center;
display:inline-flex;
min-width: 1px;
align-items: center;
display:inline-flex;
min-width: 1px;
}

figcaption{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}


Expand All @@ -182,9 +196,14 @@ img{
/* Styles for the tabbed window container */
.tabbed-window {
min-width: 100px; /* Adjust the width as needed */
border: 1px solid red; /**/
border: 1px solid #ccc; /**/
/* border-radius: 5px;
overflow: hidden; */
overflow: scroll; */
}

.tabbed-window:first-child .tabbed-window:last-child {
border-left: 0;
border-right: 0;
}

/* Styles for the tab navigation */
Expand All @@ -206,13 +225,16 @@ img{
font-size: 13px;
border-left: 1px solid #ccc;
border-right: 1px solid #ccc;
border-top: 1px solid #ccc;
max-width: fit-content;
max-height: fit-content;
}

.tab.active {
background-color: #ffffff; /*f2f2f2*/
border-left: 0px;
border-left: 0;
border-right: 0;
border-top: 1px solid #ccc;
color: #000;
}

Expand All @@ -230,6 +252,15 @@ img{
display: block;
}

.just-for-one-span{
color: #000;
font-weight: normal;
}

.just-for-one-span::first-letter{
text-decoration: underline;
}

.basediv{
display:block;
font-size: small;
Expand All @@ -242,7 +273,7 @@ img{
background-color: #ffffff; /* Primary button background color */
color: #333; /* Text color for the primary button */
border: 1px solid #ffffff; /* Border color for the primary button */
border-radius: 1px; /* Rounded corners for the primary button */
/* border-radius: 1px; Rounded corners for the primary button */
padding: 1px 10px; /* Padding for the primary button (adjust as needed) */
font-size: 13px; /* Font size for the text */
}
Expand All @@ -253,7 +284,7 @@ img{
background-color: #d0cccc; /* Primary button background color */
color: #75787c; /* Text color for the primary button */
border: 1px solid #bcbcbc; /* Border color for the primary button */
border-radius: 1px; /* Rounded corners for the primary button */
/* border-radius: 1px; Rounded corners for the primary button */
padding: 5px 25px; /* Padding for the primary button (adjust as needed) */
font-size: 12px; /* Font size for the text */
font-weight: normal;
Expand Down
17 changes: 11 additions & 6 deletions src/app/system-apps/taskmanager/taskmanager.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@
</li>
</ul>
</span>
<span style="height:2px; background-color: #ffffff; "></span>
<div class="tabbed-window">
<span style="height:3px; background-color: #ffffff; "></span>
<div class="tabs">
<div class="tab active">Processes</div>
<div class="tab">Performance</div>
<div class="tab">App history</div>
<div class="tab">Services</div>
</div>
<div class="tab-content">
<div class="tab-pane active">
Expand Down Expand Up @@ -145,14 +146,14 @@
</div>
<span class="basediv">
<span style="display: inline-block; width: 50%;
padding-top:15px; height:50px; margin-left: 0;">
<figure (click)="onFewerDetailsBtnClick()" style="padding-right: 65%;">
padding-top:15px; height:40px; margin-left: 0;">
<figure (click)="onFewerDetailsBtnClick()" style="padding-right: 72%;">
<img [src]="'osdrive/icons/arrow_up.png'">
<figcaption style="color: #000; font-weight: normal;">Fewer details</figcaption>
<figcaption class="just-for-one-span">Fewer details</figcaption>
</figure>
</span>
<span style="display: inline-block; height:50px; margin-top:10px; width:50%; margin-right: 0;">
<button (click)="onEndTaskBtnClick()" class="btn btn-primary" style="margin-left: 65%;" [ngClass]="activeFocus()">
<span style="display: inline-block; height:40px; margin-top:10px; width:50%; margin-right: 0;">
<button (click)="onEndTaskBtnClick()" class="btn btn-primary" style="margin-left: 72%;" [ngClass]="activeFocus()">
End task
</button>
</span>
Expand All @@ -167,6 +168,10 @@
<!-- Content for Tab 3 -->
<p> Somethings is coming</p>
</div>
<div class="tab-pane">
<!-- Content for Tab 4 -->
<p> Somethings is coming</p>
</div>
</div>
</div>
</cos-window>
2 changes: 1 addition & 1 deletion src/app/system-apps/window/window.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
justify-content: center;
align-items: center;
background: rgb(18, 18, 18);
border-radius: 4px;
/* border-radius: 4px; */
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
0 2px 2px 0 rgba(0, 0, 0, 0.14),
Expand Down

0 comments on commit a2bf6fd

Please sign in to comment.