From b6bd3d2c0a9c9a2c4f3cca8a35dcc21f8b5c0a5d Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Tue, 23 Jun 2020 17:32:12 -0600 Subject: [PATCH 1/2] add text-transform to horizontal-nav, add fill-space to l-center --- .../horizontal-nav/properties/index.html | 4 +-- .../horizontal-nav/properties/index.ts | 6 ++++ dev-app/routes/layouts/center/index.html | 26 +++++++++++++++- dev-app/routes/layouts/center/index.ts | 6 ++++ dev-app/routes/layouts/cover/index.html | 30 +++++++++++++++---- dev-app/routes/layouts/overview/index.html | 14 +++++++++ dev-app/stylesheets/fonts.css | 29 ------------------ .../c-nav-horizontal/c-nav-horizontal.css | 4 +++ .../c-nav-horizontal/c-nav-horizontal.html | 5 +++- .../navs/c-nav-horizontal/c-nav-horizontal.ts | 2 ++ src/layouts/l-center/l-center.css | 5 ++++ src/layouts/l-center/l-center.html | 1 + src/layouts/l-center/l-center.test.ts | 16 ++++++++++ src/layouts/l-center/l-center.ts | 6 ++++ 14 files changed, 115 insertions(+), 39 deletions(-) diff --git a/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.html b/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.html index e8153881..25f51618 100644 --- a/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.html +++ b/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.html @@ -52,9 +52,9 @@
- background-color + background-color & text-transform - + diff --git a/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.ts b/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.ts index 18dc168d..cab2c72b 100644 --- a/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.ts +++ b/dev-app/routes/components/navs/horizontal/horizontal-nav/properties/index.ts @@ -71,5 +71,11 @@ export class HorizontalNav { name: 'state', value: 'hidden', }, + { + default: 'unset', + description: 'Set the text transform for the nav.', + name: 'text-transform', + value: 'capitalize | uppercase | lowercase | inital | inherit | unset', + }, ]; } diff --git a/dev-app/routes/layouts/center/index.html b/dev-app/routes/layouts/center/index.html index 6a7c5ab9..4b14fa01 100644 --- a/dev-app/routes/layouts/center/index.html +++ b/dev-app/routes/layouts/center/index.html @@ -65,6 +65,30 @@ +
+ + fill-space + + +
+ + + I fill all the space that I am put in. + + +
+
+
+ + +
max-width @@ -78,4 +102,4 @@
- \ No newline at end of file + diff --git a/dev-app/routes/layouts/center/index.ts b/dev-app/routes/layouts/center/index.ts index 43f75517..801cadc1 100644 --- a/dev-app/routes/layouts/center/index.ts +++ b/dev-app/routes/layouts/center/index.ts @@ -35,6 +35,12 @@ export class CenterProperties { name: 'intrinsic', value: 'boolean', }, + { + default: 'false', + description: 'Set to true if you want height: 100% set on the main center div.', + name: 'fill-space', + value: 'boolean', + }, { default: 'none', description: 'Set the max width size of the centered item.', diff --git a/dev-app/routes/layouts/cover/index.html b/dev-app/routes/layouts/cover/index.html index 5dc4691f..406d3d32 100644 --- a/dev-app/routes/layouts/cover/index.html +++ b/dev-app/routes/layouts/cover/index.html @@ -42,7 +42,10 @@
Sidebar Area
- +
I am at the top
@@ -75,7 +78,10 @@
Sidebar Area
- +
I am at the top
@@ -110,7 +116,10 @@
Sidebar Area
- +
I am at the top
@@ -145,8 +154,14 @@
Sidebar Area
- - + +
I am at the top
Setting height on this container will happen from the surrounding layout option. @@ -198,7 +213,10 @@
Sidebar Area
- +
I am at the top
diff --git a/dev-app/routes/layouts/overview/index.html b/dev-app/routes/layouts/overview/index.html index 09b954a3..36615917 100644 --- a/dev-app/routes/layouts/overview/index.html +++ b/dev-app/routes/layouts/overview/index.html @@ -170,6 +170,20 @@ + + + +
+ + ■■■■ + +
+ + Icon + +
+
+
diff --git a/dev-app/stylesheets/fonts.css b/dev-app/stylesheets/fonts.css index 4375d4a2..bd20224f 100644 --- a/dev-app/stylesheets/fonts.css +++ b/dev-app/stylesheets/fonts.css @@ -10,7 +10,6 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project /** * HAAS GROTESK DISPLAY * HELVETICA NEUE COND - * PROXIMA NOVA */ @@ -68,31 +67,3 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project font-family: 'HN_67_Cond_It'; src: url('../assets/fonts/HN67ConIt.woff') format('woff'); } - - - - - -/*------------------------------------*\ - !PROXIMA NOVA -\*------------------------------------*/ - -@font-face{ - font-family: 'Proxima_Nova_Reg'; - src: url('../assets/fonts/ProximaNova-Reg-webfont.woff') format('woff'); -} - -@font-face{ - font-family: 'Proxima_Nova_Reg_Italic'; - src: url('../assets/fonts/ProximaNova-RegIt-webfont.woff') format('woff'); -} - -@font-face{ - font-family: 'Proxima_Nova_Semi_Bold'; - src: url('../assets/fonts/ProximaNova-Sbold-webfont.woff') format('woff'); -} - -@font-face{ - font-family: 'Proxima_Nova_Bold'; - src: url('../assets/fonts/ProximaNova-Bold-webfont.woff') format('woff'); -} diff --git a/src/components/navs/c-nav-horizontal/c-nav-horizontal.css b/src/components/navs/c-nav-horizontal/c-nav-horizontal.css index 33d9227b..133270aa 100644 --- a/src/components/navs/c-nav-horizontal/c-nav-horizontal.css +++ b/src/components/navs/c-nav-horizontal/c-nav-horizontal.css @@ -36,6 +36,10 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project list-style: none; } +.nav-horizontal ul li{ + text-transform: var(--nav-text-transform); +} + diff --git a/src/components/navs/c-nav-horizontal/c-nav-horizontal.html b/src/components/navs/c-nav-horizontal/c-nav-horizontal.html index 2218e0e7..6c75ad30 100644 --- a/src/components/navs/c-nav-horizontal/c-nav-horizontal.html +++ b/src/components/navs/c-nav-horizontal/c-nav-horizontal.html @@ -11,7 +11,10 @@ ${styles.navHorizontal} ${styles[size]} " - css="--nav-background-color: ${backgroundColor}" + css=" + --nav-background-color: ${backgroundColor}; + --nav-text-transform: ${textTransform}; + " hide.bind="state === 'hidden'" >