Skip to content

Commit

Permalink
fix up some css styling (#1551)
Browse files Browse the repository at this point in the history
  • Loading branch information
ascobie authored Aug 22, 2018
1 parent d2c50b1 commit c29fa0a
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class AccountDetailsComponent implements OnInit, OnDestroy {

public tableConfig: TableConfig = {
resizableColumn: false,
hideHeader: true,
};

public account: AccountResource;
Expand Down
2 changes: 0 additions & 2 deletions app/components/account/details/account-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ <h2>Job status</h2>
<div *blCellDef="let job">{{job.id}}</div>
</bl-column>
<bl-column name="state" [defaultWidth]="75">
<div *blHeadCellDef>State</div>
<div *blCellDef="let job">{{job.state}}</div>
</bl-column>
</bl-table>
Expand Down Expand Up @@ -83,7 +82,6 @@ <h2>Pool status</h2>
<div *blCellDef="let pool">{{pool.id}}</div>
</bl-column>
<bl-column name="state" [defaultWidth]="30">
<div *blHeadCellDef>State</div>
<div *blCellDef="let pool"><bl-pool-os-icon [pool]="pool"></bl-pool-os-icon></div>
</bl-column>
<bl-column name="nodes" [defaultWidth]="60">
Expand Down
4 changes: 4 additions & 0 deletions app/components/account/details/account-details.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ bl-account-details {
.section-title {
padding: 10px;
}

bl-getting-started-card {
margin-bottom: 15px;
}
}
2 changes: 2 additions & 0 deletions app/components/account/home/account-home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { Set } from "immutable";
import { distinctUntilChanged } from "rxjs/operators";
import { BatchAccountCreateComponent } from "../action/add";

import "./account-home.scss";

@Component({
selector: "bl-account-home",
templateUrl: "account-home.html",
Expand Down
15 changes: 15 additions & 0 deletions app/components/account/home/account-home.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@import "app/styles/variables";

bl-account-home {
display: block;
height: $contentview-height;
width: 100%;

.quicksearch {
margin: 0 10px;
}

.pre-quicksearch {
width: 200px;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</bl-clickable>
</div>
<div *ngIf="recentSubmissions.length === 0" class="no-recent">
You haven't run any template recently.
You haven't run any templates recently.
</div>
</div>
15 changes: 12 additions & 3 deletions app/styles/account/browse.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@

@import "app/styles/variables";

bl-account-home {
}

bl-account-list {
bl-quick-list-row-render:hover {
.fa-star {
color: $athensGrey;
}
}

.fa-star {
font-size: 2em;
color: #d5d5d5;
color: $alto;

&:hover {
color: map-get($primary, 100);
color: map-get($primary, 100) !important;
}

&.favorite {
color: map-get($primary, 400);
color: map-get($primary, 400) !important;
}
}
}
5 changes: 5 additions & 0 deletions src/@batch-flask/ui/table/table.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ export interface TableConfig extends AbstractListBaseConfig {
* If the table should allow column to be resized. Default true.
*/
resizableColumn?: boolean;

/**
* If the table should hide the header. Default false.
*/
hideHeader?: boolean;
}

export const tableDefaultConfig = {
Expand Down
2 changes: 1 addition & 1 deletion src/@batch-flask/ui/table/table.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="table-head" [class.no-scroll]="!showScrollShadow">
<div *ngIf="!config.hideHeader" class="table-head" [class.no-scroll]="!showScrollShadow">
<bl-thead [columns]="columnManager.columns"></bl-thead>
</div>
<div class="table-body">
Expand Down

0 comments on commit c29fa0a

Please sign in to comment.