Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update caluma UI #292

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ember/app/application/template.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<main>
<NavBar @logo={{this.config.navBarLogo}} @text={{this.config.navBarText}} />
<Logo @logo={{this.config.navBarLogo}} @text={{this.config.navBarText}} />
<NavBar />
<div class="uk-padding uk-overflow-auto">
{{outlet}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion ember/app/components/cases-table/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{#if this.noCases}}
<div class="uk-width-2-3 uk-margin-auto">
<h1 class="uk-text-center">
{{t "documents.empty.welcome" appName="Building Permit Demo"}}
{{t "documents.empty.welcome" appName="Building Portal Demo"}}
</h1>

<p
Expand Down
6 changes: 6 additions & 0 deletions ember/app/components/logo/template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div class="logo">
<LinkTo @route="application" class="uk-navbar-item uk-logo uk-text-primary">
<img class="nav-bar-logo" src={{@logo}} alt={{@text}} />
{{@text}}
</LinkTo>
</div>
8 changes: 0 additions & 8 deletions ember/app/components/nav-bar/template.hbs
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
<nav class="uk-navbar-container uk-navbar-transparent nav-bar" uk-navbar>
<LinkTo @route="application" class="uk-navbar-item uk-logo uk-text-primary">
{{#if @logo}}
<img class="nav-bar-logo" src={{@logo}} alt={{@text}} />
{{else}}
{{@text}}
{{/if}}
</LinkTo>

<UkTab as |tab|>
<tab.item @href="/">{{t "nav.documents"}}</tab.item>
<tab.item @href="/form-builder">{{t "nav.form-builder"}}</tab.item>
Expand Down
1 change: 1 addition & 0 deletions ember/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $modal-z-index: 1;
@import "@projectcaluma/ember-form";
@import "@projectcaluma/ember-form-builder";
@import "components/nav-bar";
@import "components/logo";

main {
display: flex;
Expand Down
18 changes: 12 additions & 6 deletions ember/app/styles/components/_nav-bar.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
.nav-bar {
border-bottom: solid 1px $global-border;
padding-bottom: 25px;
padding-left: 15px;

& img.nav-bar-logo {
height: 50px;
}

& [uk-tab] {
.uk-tab {
margin: 0;

&::before {
border-bottom: none;
}

&,
& li {
height: 100%;
}

& a {
/* stylelint-disable-next-line scss/at-extend-no-missing-placeholder */
@extend .uk-flex, .uk-flex-middle;
Expand All @@ -26,7 +22,17 @@
height: calc(100% - 2px);
}

&,
& li {
height: 100%;

a {
font-size: large;
}
}

& .uk-active > a {
padding-bottom: 25px;
border-bottom: solid 2px $app-accent-color;
}
}
Expand Down
14 changes: 14 additions & 0 deletions ember/app/styles/components/logo.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.logo {
height: 100px;
margin-bottom: 50px;

a {
float: left;
margin-left: 50px;
margin-top: 14px;
}

img {
max-height: 75px;
}
}
2 changes: 1 addition & 1 deletion ember/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function (environment) {
// Here you can pass flags/options to your application document
// when it is created
navBarLogo: "/assets/nav-bar-logo.png",
navBarText: "Caluma Building Permit Demo",
navBarText: "Caluma Portal Demo",

caseStateIcons: {
RUNNING: "clock",
Expand Down
3 changes: 3 additions & 0 deletions ember/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
const EmberApp = require("ember-cli/lib/broccoli/ember-app");

module.exports = function (defaults) {
defaults.fingerprint = {
enabled: false,
};
const app = new EmberApp(defaults, {
emberApolloClient: {
keepGraphqlFileExtension: false,
Expand Down
2 changes: 1 addition & 1 deletion ember/translations/en.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
demo: "Caluma Building Permit Demo"
demo: "Caluma Portal Demo"

global:
continue: "Continue"
Expand Down