Skip to content

Commit

Permalink
fix(): footer & expansion theme, update logo docs (closes #578) (#689)
Browse files Browse the repository at this point in the history
* fix(): dark expansion theme

* fix(home): dark layout footer

* update(docs): better logo docs (closes #578)
  • Loading branch information
kyleledbetter authored and emoralesb05 committed Jun 13, 2017
1 parent 2606b75 commit 574e6d1
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/app/components/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ <h3 md-line>Feature Requests & Bugs</h3>
</div>
</div>
</section>
<td-layout-footer class="theme-dark" tdMediaToggle="xs" [mediaClasses]="['text-center']">
<td-layout-footer color="primary" tdMediaToggle="xs" [mediaClasses]="['text-center']">
<div layout-gt-xs="row" layout-align="start center">
<div class="md-caption">Copyright &copy; 2016 - 2017 Teradata. All rights reserved</div>
<span flex></span>
Expand Down
74 changes: 50 additions & 24 deletions src/app/components/style-guide/logo/logo.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<md-card>
<md-card-title>Logo Placement</md-card-title>
<md-card-title>Including Your Logo</md-card-title>
<md-divider></md-divider>
<md-card-content>
<p class="md-body-1">Your company logo can be implemented with <code>md-icon</code>.</p>
Expand All @@ -10,47 +10,73 @@
<md-icon class="md-icon-logo" svgIcon="assets:teradata"></md-icon>
]]>
</td-highlight>
<p class="md-body-1">The code above will output a 100x26px inline SVG:</p>
<p class="md-body-1">The code above will output an inline SVG with 100px width and auto height:</p>
<md-icon class="md-icon-logo" svgIcon="assets:teradata"></md-icon>
<md-divider class="push-top push-bottom"></md-divider>
<td-message class="push-bottom" sublabel="Tip: if you need a custom logo size use this snippet with your logo size in /src/styles.scss" color="light-blue" icon="info"></td-message>
<td-highlight lang="css">
<![CDATA[
md-toolbar .mat-icon.md-icon-logo { width: 100px; height: 100px; }
]]>
</td-highlight>
</md-card-content>
<md-divider></md-divider>
<md-card-actions>
<a md-button color="primary" [routerLink]="['iconography']" class="text-upper">Iconography</a>
<a md-button color="primary" [routerLink]="['/docs/icons']" class="text-upper">Icon Docs</a>
</md-card-actions>
</md-card>

<md-card>
<md-card-title>Toolbar Placement</md-card-title>
<md-card-title>Toolbar Logo Placement</md-card-title>
<md-card-subtitle>place the logo in the top toolbar next to the title</md-card-subtitle>
<md-divider></md-divider>
<md-card-content>
<td-layout-nav logo="assets:teradata" toolbarTitle="App Title">
</td-layout-nav>
<md-divider class="push-top push-bottom"></md-divider>
<td-highlight lang="html">
<![CDATA[
<td-layout-nav logo="assets:teradata" toolbarTitle="App Title">
]]>
</td-highlight>
</md-card-content>
<md-divider></md-divider>
<md-card-actions>
<a md-button color="primary" [routerLink]="['/layouts']" class="text-upper">Layout Docs</a>
</md-card-actions>
</md-card>

<md-card>
<md-card-title>Sidenav Placement</md-card-title>
<md-card-title>Navigation Drawer (Sidenav) Logo Placement</md-card-title>
<md-card-subtitle>place the logo in the sidenav toolbar next to the title, above the user info</md-card-subtitle>
<md-divider></md-divider>
<md-card-content>
<md-sidenav-container>
<md-sidenav opened="true" mode="side">
<md-toolbar layout="row">
<md-icon class="md-icon-logo" svgIcon="assets:teradata"></md-icon>
<span flex>App Title</span>
</md-toolbar>
<div class="md-padding">
<p>Sidenav content</p>
<div class="md-padding bgc-grey-200">
<td-layout mode="side" opened="true">
<td-navigation-drawer flex logo="assets:teradata" sidenavTitle="App Title" name="Firstname Lastname" email="[email protected]">
<div class="pad">
sidenav content
</div>
</td-navigation-drawer>
<div class="pad">
main content
</div>

</md-sidenav>

<div>
<md-card class="md-padding">
<p>Main Content</p>
<p>Main Content</p>
<button md-raised-button>Example Button</button>
</md-card>
</div>
</md-sidenav-container>
</td-layout>
</div>
<md-divider class="push-top push-bottom"></md-divider>
<td-highlight lang="html">
<![CDATA[
<td-layout>
<td-navigation-drawer flex logo="assets:teradata" sidenavTitle="App Title" name="Firstname Lastname" email="[email protected]">
sidenav content
</td-navigation-drawer>
main content
</td-layout>
]]>
</td-highlight>
</md-card-content>
<md-divider></md-divider>
<md-card-actions>
<a md-button color="primary" [routerLink]="['navigation-drawer']" class="text-upper">Navigation Drawer</a>
</md-card-actions>
</md-card>
7 changes: 7 additions & 0 deletions src/app/components/style-guide/logo/logo.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
:host /deep/ {
.mat-sidenav-container[fullscreen] {
position: static;
width: 100%;
height: 300px;
}
}
3 changes: 2 additions & 1 deletion src/app/components/style-guide/style-guide.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdToolbarModu
MdTooltipModule, MdProgressBarModule } from '@angular/material';

import { CovalentLayoutModule, CovalentMediaModule, CovalentSearchModule, CovalentPagingModule,
CovalentExpansionPanelModule, CovalentDialogsModule } from '../../../platform/core';
CovalentExpansionPanelModule, CovalentDialogsModule, CovalentMessageModule } from '../../../platform/core';
import { CovalentHighlightModule } from '../../../platform/highlight';

import { ToolbarModule } from '../../components/toolbar/toolbar.module';
Expand Down Expand Up @@ -70,6 +70,7 @@ import { ToolbarModule } from '../../components/toolbar/toolbar.module';
CovalentExpansionPanelModule,
CovalentHighlightModule,
CovalentDialogsModule,
CovalentMessageModule,
styleGuideRoutes,
ToolbarModule,
],
Expand Down
2 changes: 1 addition & 1 deletion src/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ md-nav-list {
}

// Expansion panels
.theme-dark td-expansion-panel {
.theme-dark .td-expansion-panel {
background-color: mat-color($mat-blue-grey, 800);
}

Expand Down

0 comments on commit 574e6d1

Please sign in to comment.