From 2805211d83528a69ef4118564ca2a86978e8d90c Mon Sep 17 00:00:00 2001 From: Andrew Scobie Date: Tue, 21 Aug 2018 16:09:31 +1200 Subject: [PATCH] fix up some css styling --- .../account/details/account-details.component.ts | 1 + .../account/details/account-details.html | 2 -- .../account/details/account-details.scss | 4 ++++ .../account/home/account-home.component.ts | 2 ++ app/components/account/home/account-home.scss | 15 +++++++++++++++ .../recent-template-list.html | 2 +- app/styles/account/browse.scss | 15 ++++++++++++--- src/@batch-flask/ui/table/table.component.ts | 5 +++++ src/@batch-flask/ui/table/table.html | 2 +- 9 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 app/components/account/home/account-home.scss diff --git a/app/components/account/details/account-details.component.ts b/app/components/account/details/account-details.component.ts index 1f5e340a2f..ac750dfa27 100644 --- a/app/components/account/details/account-details.component.ts +++ b/app/components/account/details/account-details.component.ts @@ -30,6 +30,7 @@ export class AccountDetailsComponent implements OnInit, OnDestroy { public tableConfig: TableConfig = { resizableColumn: false, + hideHeader: true, }; public account: AccountResource; diff --git a/app/components/account/details/account-details.html b/app/components/account/details/account-details.html index 293bdae1af..927f886bd6 100644 --- a/app/components/account/details/account-details.html +++ b/app/components/account/details/account-details.html @@ -53,7 +53,6 @@

Job status

{{job.id}}
-
State
{{job.state}}
@@ -83,7 +82,6 @@

Pool status

{{pool.id}}
-
State
diff --git a/app/components/account/details/account-details.scss b/app/components/account/details/account-details.scss index fd08ad503d..e97a6665f8 100644 --- a/app/components/account/details/account-details.scss +++ b/app/components/account/details/account-details.scss @@ -74,4 +74,8 @@ bl-account-details { .section-title { padding: 10px; } + + bl-getting-started-card { + margin-bottom: 15px; + } } diff --git a/app/components/account/home/account-home.component.ts b/app/components/account/home/account-home.component.ts index b8518d0e26..719b835fda 100644 --- a/app/components/account/home/account-home.component.ts +++ b/app/components/account/home/account-home.component.ts @@ -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", diff --git a/app/components/account/home/account-home.scss b/app/components/account/home/account-home.scss new file mode 100644 index 0000000000..10a4406767 --- /dev/null +++ b/app/components/account/home/account-home.scss @@ -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; + } +} diff --git a/app/components/market/home/recent-template-list/recent-template-list.html b/app/components/market/home/recent-template-list/recent-template-list.html index d0d891ef76..6363195197 100644 --- a/app/components/market/home/recent-template-list/recent-template-list.html +++ b/app/components/market/home/recent-template-list/recent-template-list.html @@ -12,6 +12,6 @@
- You haven't run any template recently. + You haven't run any templates recently.
diff --git a/app/styles/account/browse.scss b/app/styles/account/browse.scss index b5afb631fa..80bf081aca 100644 --- a/app/styles/account/browse.scss +++ b/app/styles/account/browse.scss @@ -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; } } } diff --git a/src/@batch-flask/ui/table/table.component.ts b/src/@batch-flask/ui/table/table.component.ts index 8dbd44ea7a..18e873a989 100644 --- a/src/@batch-flask/ui/table/table.component.ts +++ b/src/@batch-flask/ui/table/table.component.ts @@ -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 = { diff --git a/src/@batch-flask/ui/table/table.html b/src/@batch-flask/ui/table/table.html index 4bfa229aec..d6c8b90d11 100644 --- a/src/@batch-flask/ui/table/table.html +++ b/src/@batch-flask/ui/table/table.html @@ -1,4 +1,4 @@ -
+