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.

Sign up for GitHub

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

[UI Framework] Change menu to unordered list 5.4 #12105

Closed
wants to merge 3 commits into from
Closed

[UI Framework] Change menu to unordered list 5.4 #12105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
357119d
Change menu to unordered list
May 31, 2017
bedf919
Add usage comments
May 31, 2017
8b2167a
Update events_sandbox example
May 31, 2017
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
20 changes: 10 additions & 10 deletions ui_framework/components/event/_event.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
14 changes: 14 additions & 0 deletions ui_framework/components/menu/_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
/**
* 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;
}

.kuiMenu--contained {
border: $globalBorderThin;
padding-left: 0;

.kuiMenuItem {
padding: 6px 10px;
}
}

.kuiMenuItem {
list-style: none;
padding: 6px 0;

& + & {
Expand Down
15 changes: 14 additions & 1 deletion ui_framework/dist/ui_framework.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,12 +1560,25 @@ 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; }

.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; }
Expand Down
16 changes: 8 additions & 8 deletions ui_framework/doc_site/src/views/event/events_sandbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h2 class="kuiSubTitle">
</div>
</div>

<div class="kuiMenu kuiVerticalRhythm">
<div class="kuiMenuItem">
<ul class="kuiMenu kuiVerticalRhythm">
<li class="kuiMenuItem">
<div class="kuiEvent">
<div class="kuiEventSymbol">
<span class="kuiIcon kuiIcon--info fa-info"></span>
Expand All @@ -34,9 +34,9 @@ <h2 class="kuiSubTitle">
</div>
</div>
</div>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<div class="kuiEvent">
<div class="kuiEventSymbol">
<span class="kuiIcon kuiIcon--error fa-warning"></span>
Expand All @@ -52,9 +52,9 @@ <h2 class="kuiSubTitle">
</div>
</div>
</div>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<div class="kuiEvent">
<div class="kuiEventSymbol">
<span class="kuiIcon kuiIcon--warning fa-bolt"></span>
Expand All @@ -70,8 +70,8 @@ <h2 class="kuiSubTitle">
</div>
</div>
</div>
</div>
</div>
</li>
</ul>

</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions ui_framework/doc_site/src/views/menu/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="kuiMenu">
<div class="kuiMenuItem">
<ul class="kuiMenu">
<li class="kuiMenuItem">
<p class="kuiText">Item A</p>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<p class="kuiText">Item B</p>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<p class="kuiText">Item C</p>
</div>
</div>
</li>
</ul>
16 changes: 8 additions & 8 deletions ui_framework/doc_site/src/views/menu/menu_contained.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="kuiMenu kuiMenu--contained">
<div class="kuiMenuItem">
<ul class="kuiMenu kuiMenu--contained">
<li class="kuiMenuItem">
<p class="kuiText">Item A</p>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<p class="kuiText">Item B</p>
</div>
</li>

<div class="kuiMenuItem">
<li class="kuiMenuItem">
<p class="kuiText">Item C</p>
</div>
</div>
</li>
</ul>