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

Merge main to develop #5

Merged
merged 35 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e8efb1e
0.0.3
itsenes Jun 4, 2021
ac7f3aa
0.0.4
itsenes Jun 4, 2021
64d0e5b
0.0.5
itsenes Jun 4, 2021
ec31889
workspace
itsenes Jun 4, 2021
30b65ad
...
itsenes Jun 4, 2021
5722ad1
0.0.6
itsenes Jun 4, 2021
b179d5c
...
itsenes Jun 4, 2021
086b2bf
0.0.7
itsenes Jun 4, 2021
cc97503
...
itsenes Jun 4, 2021
6defa8e
styles extractions for view layout - wip
itsenes Jun 4, 2021
427d1a7
extracting styles from components
itsenes Jun 4, 2021
c051995
model-view-layout fixes
itsenes Jun 7, 2021
dcd1ed5
extrancted cards css, added kpi tile component
itsenes Jun 7, 2021
4842a3e
kpi-tile title fix
itsenes Jun 7, 2021
17953d3
minor fixes and tile click action bug
itsenes Jun 7, 2021
43b973f
kpi tile fix
itsenes Jun 9, 2021
be0c749
inner-model-rightpane
Jun 9, 2021
2879c5b
named asides in all layouts
itsenes Jun 9, 2021
c653006
side pane changes
itsenes Jun 10, 2021
6897aff
footer styles fix
itsenes Jun 14, 2021
40216a0
removed bracket on side panel
Jun 15, 2021
0a348c5
Merge branch 'main' of https://github.com/indice-co/Indice.Angular in…
Jun 15, 2021
d40d472
custom header component injection
Jun 15, 2021
1ff4fed
model-view-lyaout fixes
itsenes Jun 16, 2021
67dd659
added sample app (wip)
itsenes Jun 16, 2021
5839b5a
give life to sample project
Jun 17, 2021
0eec9da
remove conflicting packages + add missing
vaggelanos Jun 17, 2021
fba59ba
Merge remote-tracking branch 'origin/main' into feature/custom-header…
Jun 17, 2021
e0f5e34
dynamic component loading for header/footer
Jun 17, 2021
c0d38bd
Merge pull request #4 from indice-co/feature/custom-header-footer-com…
vaggelanos Jun 17, 2021
cf11f70
comment out vscode bullshit
Jun 17, 2021
c472b01
shell fixes
itsenes Jun 17, 2021
78ffe32
bump ng-components version
Jun 17, 2021
6aa809f
Merge branch 'main' of Indice.Angular into main
itsenes Jun 17, 2021
0acf5b3
Merge branch 'main' of https://github.com/indice-co/Indice.Angular in…
itsenes Jun 17, 2021
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
2 changes: 1 addition & 1 deletion projects/ng-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@indice/ng-components",
"version": "0.1.68",
"version": "0.1.75",
"description": "Indice common components for Angular v12",
"repository": {
"type": "git",
Expand Down
86 changes: 75 additions & 11 deletions projects/ng-components/src/assets/styles/shell-layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@
@apply w-full mx-auto min-h-screen;
}

.shell-footer-container {
@apply bg-gradient-to-r from-gray-800 to-gray-900 mt-10 pt-6;
}

.shell-footer-container-inner {
@apply max-w-7xl mx-auto;
}

.shell-footer-container-inner-fluid {
@apply w-full mx-auto;
}

.side-pane-overlay {
@apply absolute bg-gray-500 bg-opacity-25 inset-0;
Expand Down Expand Up @@ -166,4 +155,79 @@
@apply mt-3 px-2 space-y-1;
}

.shell-footer-container {
@apply bg-gradient-to-r from-gray-800 to-gray-900 mt-10 pt-6;
}

.shell-footer-container-inner {
@apply max-w-7xl mx-auto;
}

.shell-footer-container-inner-fluid {
@apply w-full mx-auto;
}

.shell-footer-component-container {
@apply text-gray-300;
}

.shell-footer-component-container-inner {
@apply max-w-screen-xl mx-auto;
}

.shell-footer-logo-h {
@apply h-12;
}


.shell-footer-sections-container {
@apply grid grid-cols-8 md:grid-cols-9 lg:grid-cols-8 divide-gray-700 divide-y-2 md:divide-x-2 md:divide-y-0 md:-mx-8;
}

.shell-footer-section {
@apply col-span-8 md:col-span-3 lg:col-span-2 md:px-8 py-4 md:py-0;
}

.shell-footer-section nav {
@apply mt-4;
}

.shell-footer-section ul {
@apply space-y-2;
}

.shell-footer-section-links {
@apply col-span-8 md:col-span-3 lg:col-span-2 md:px-8 py-4 md:py-0;
}

.shell-footer-section-links ul {
@apply grid lg:grid-cols-2;
}

.shell-footer-section-links li {
@apply mb-2;
}

.shell-footer-section-title {
@apply text-xl font-semibold text-white;
}


.shell-footer-social {
@apply flex space-x-2 font-normal text-base hover:text-gray-100;
}

.shell-footer-social-icon {
@apply h-6 w-6;
}

.shell-footer-link {
@apply font-normal text-base hover:text-gray-100;
}

.shell-footer-copyright {
@apply max-w-screen-xl mx-auto flex flex-col md:flex-row justify-between items-center space-y-4 mt-8 lg:mt-12 border-t-2 border-gray-700 py-5;
}
}


Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<footer class="text-gray-300 px-6 lg:px-8 py-12">
<div class="max-w-screen-xl mx-auto ">
<div class="grid grid-cols-8 md:grid-cols-9 lg:grid-cols-8 divide-gray-700 divide-y-2 md:divide-x-2 md:divide-y-0 md:-mx-8">
<div class="col-span-8 md:col-span-3 lg:col-span-2 md:px-8 py-4 md:py-0">
<img class="h-12" src="/assets/images/branding/indice.png" alt="INDICE logo">
<footer class="shell-footer-component-container">
<div class="shell-footer-component-container-inner">
<div class="shell-footer-sections-container">
<div class="shell-footer-section">
<img class="shell-footer-logo-h" src="/assets/images/branding/indice.png" alt="INDICE logo">
<nav class="mt-4">
<ul class="space-y-2">
<ng-container *ngFor="let link of links.brand">
<li>
<a [href]="link.path" class="font-normal text-base hover:text-gray-100">{{link.text}}</a>
<a [href]="link.path" class="shell-footer-link">{{link.text}}</a>
</li>
</ng-container>
</ul>
</nav>
</div>
<div class="col-span-8 md:col-span-3 lg:col-span-3 md:px-8 py-4 md:py-0">
<h5 class="text-xl font-semibold text-white">Legal</h5>
<div class="shell-footer-section-links">
<h5 class="shell-footer-section-title">Legal</h5>
<nav class="mt-4">
<ul class="grid lg:grid-cols-2">
<ng-container *ngFor="let link of links.legal">
<li class="mb-2">
<a [href]="link.path" class="font-normal text-base hover:text-gray-100">{{link.text}}</a>
<a [href]="link.path" class="shell-footer-link">{{link.text}}</a>
</li>
</ng-container>
</ul>
</nav>
</div>
<div class="col-span-8 md:col-span-3 lg:col-span-3 md:px-8 py-4 md:py-0">
<h5 class="text-xl font-semibold text-white">Follow us</h5>
<div class="shell-footer-section-links">
<h5 class="shell-footer-section-title">Follow us</h5>
<nav class="mt-4">
<ul class="grid lg:grid-cols-2">
<li class="mb-2">
<a href="#" class="flex space-x-2 font-normal text-base hover:text-gray-100">
<svg class="h-6 w-6" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<a href="#" class="shell-footer-social">
<svg class="shell-footer-social-icon" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
</svg>
<span>
Expand All @@ -40,8 +40,8 @@ <h5 class="text-xl font-semibold text-white">Follow us</h5>
</a>
</li>
<li class="mb-2">
<a href="#" class="flex space-x-2 font-normal text-base hover:text-gray-100">
<svg class="h-6 w-6" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<a href="#" class="shell-footer-social">
<svg class="shell-footer-social-icon" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z" clip-rule="evenodd" />
</svg>
<span>
Expand All @@ -50,8 +50,8 @@ <h5 class="text-xl font-semibold text-white">Follow us</h5>
</a>
</li>
<li class="mb-2">
<a href="#" class="flex space-x-2 font-normal text-base hover:text-gray-100">
<svg class="h-6 w-6" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<a href="#" class="shell-footer-social">
<svg class="shell-footer-social-icon" aria-hidden="true" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd" />
</svg>
<span>
Expand All @@ -64,7 +64,7 @@ <h5 class="text-xl font-semibold text-white">Follow us</h5>
</div>
</div>
</div>
<div class="max-w-screen-xl mx-auto flex flex-col md:flex-row justify-between items-center space-y-4 mt-8 lg:mt-12 border-t-2 border-gray-700 pt-8">
<div class="shell-footer-copyright">
<!--<nav class="flex flex-wrap justify-center space-x-6">
<a href="#" class="font-normal text-sm hover:text-gray-100 mb-2">Cookie settings</a>
</nav>-->
Expand Down