From 357119d2afdae2f3e74288f5543b82bd635c9efb Mon Sep 17 00:00:00 2001 From: archanid Date: Wed, 31 May 2017 12:23:43 -0500 Subject: [PATCH 1/3] Change menu to unordered list --- ui_framework/components/event/_event.scss | 20 +++++++++---------- ui_framework/components/menu/_menu.scss | 6 ++++++ ui_framework/dist/ui_framework.css | 7 ++++++- .../doc_site/src/views/menu/menu.html | 16 +++++++-------- .../src/views/menu/menu_contained.html | 16 +++++++-------- 5 files changed, 38 insertions(+), 27 deletions(-) diff --git a/ui_framework/components/event/_event.scss b/ui_framework/components/event/_event.scss index 3dee8c7cabf1c..654b67ae6b811 100644 --- a/ui_framework/components/event/_event.scss +++ b/ui_framework/components/event/_event.scss @@ -13,14 +13,14 @@ flex: 1 1 0%; } - .kuiEventBody__message { - font-size: $globalFontSize; - line-height: $globalLineHeight; - color: $globalFontColor; - } +.kuiEventBody__message { + font-size: $globalFontSize; + line-height: $globalLineHeight; + color: $globalFontColor; +} - .kuiEventBody__metadata { - font-size: $globalFontSize; - line-height: $globalLineHeight; - color: $globalSubduedTextColor; - } +.kuiEventBody__metadata { + font-size: $globalFontSize; + line-height: $globalLineHeight; + color: $globalSubduedTextColor; +} diff --git a/ui_framework/components/menu/_menu.scss b/ui_framework/components/menu/_menu.scss index 7a63a80ba23a4..3187ae66272bd 100644 --- a/ui_framework/components/menu/_menu.scss +++ b/ui_framework/components/menu/_menu.scss @@ -1,5 +1,10 @@ +.kuiMenu { + padding-left: 0; +} + .kuiMenu--contained { border: $globalBorderThin; + padding-left: 0; .kuiMenuItem { padding: 6px 10px; @@ -7,6 +12,7 @@ } .kuiMenuItem { + list-style: none; padding: 6px 0; & + & { diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css index c675fd16ee105..9a69d6e5d290b 100644 --- a/ui_framework/dist/ui_framework.css +++ b/ui_framework/dist/ui_framework.css @@ -1560,12 +1560,17 @@ body { font-size: 14px; font-weight: bold; } +.kuiMenu { + padding-left: 0; } + .kuiMenu--contained { - border: 1px solid #E4E4E4; } + border: 1px solid #E4E4E4; + padding-left: 0; } .kuiMenu--contained .kuiMenuItem { padding: 6px 10px; } .kuiMenuItem { + list-style: none; padding: 6px 0; } .kuiMenuItem + .kuiMenuItem { border-top: 1px solid #E4E4E4; } diff --git a/ui_framework/doc_site/src/views/menu/menu.html b/ui_framework/doc_site/src/views/menu/menu.html index 9407b80786f30..78a9735801a9f 100644 --- a/ui_framework/doc_site/src/views/menu/menu.html +++ b/ui_framework/doc_site/src/views/menu/menu.html @@ -1,13 +1,13 @@ -
-
+
    +
  • Item A

    -
+ -
+
  • Item B

    -
  • + -
    +
  • Item C

    -
  • -
    + + diff --git a/ui_framework/doc_site/src/views/menu/menu_contained.html b/ui_framework/doc_site/src/views/menu/menu_contained.html index 7d0866fc8887a..7ed3401a0128a 100644 --- a/ui_framework/doc_site/src/views/menu/menu_contained.html +++ b/ui_framework/doc_site/src/views/menu/menu_contained.html @@ -1,13 +1,13 @@ -
    -
    +
      +
    • Item A

      -
    + -
    +
  • Item B

    -
  • + -
    +
  • Item C

    -
  • -
    + + From bedf91921adc3a4b1b818ebbda3d32aa868b4d72 Mon Sep 17 00:00:00 2001 From: archanid Date: Wed, 31 May 2017 13:02:53 -0500 Subject: [PATCH 2/3] Add usage comments --- ui_framework/components/menu/_menu.scss | 8 ++++++++ ui_framework/dist/ui_framework.css | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/ui_framework/components/menu/_menu.scss b/ui_framework/components/menu/_menu.scss index 3187ae66272bd..e5ce0769982ce 100644 --- a/ui_framework/components/menu/_menu.scss +++ b/ui_framework/components/menu/_menu.scss @@ -1,3 +1,11 @@ +/** + * padding-left: 0 and list-style: none rules + * are meant for ul.kuiMenu and li.kuiMenuItem + * elements. + * + * kuiMenu and kuiMenuItems can classify both + * nonsemantic divs as well as lists (ul, li). + */ .kuiMenu { padding-left: 0; } diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css index 9a69d6e5d290b..afd80657b6272 100644 --- a/ui_framework/dist/ui_framework.css +++ b/ui_framework/dist/ui_framework.css @@ -1560,6 +1560,14 @@ body { font-size: 14px; font-weight: bold; } +/** + * padding-left: 0 and list-style: none rules + * are meant for ul.kuiMenu and li.kuiMenuItem + * elements. + * + * kuiMenu and kuiMenuItems can classify both + * nonsemantic divs as well as lists (ul, li). + */ .kuiMenu { padding-left: 0; } From 8b2167a30701162e43926579aba2dbd6b41501a8 Mon Sep 17 00:00:00 2001 From: archanid Date: Wed, 31 May 2017 13:03:17 -0500 Subject: [PATCH 3/3] Update events_sandbox example --- .../doc_site/src/views/event/events_sandbox.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui_framework/doc_site/src/views/event/events_sandbox.html b/ui_framework/doc_site/src/views/event/events_sandbox.html index 22b7eb68d6360..750f34039e19b 100644 --- a/ui_framework/doc_site/src/views/event/events_sandbox.html +++ b/ui_framework/doc_site/src/views/event/events_sandbox.html @@ -17,8 +17,8 @@

    -
    -
    +
      +
    • @@ -34,9 +34,9 @@

    -
    + -
    +
  • @@ -52,9 +52,9 @@

  • - + -
    +
  • @@ -70,8 +70,8 @@

  • - - + +