Skip to content

Commit

Permalink
ui: Update Breadcrumbs styling (#7687)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaxcode authored Apr 23, 2020
1 parent ccfad0d commit b6313e7
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 54 deletions.
22 changes: 5 additions & 17 deletions ui-v2/app/styles/base/components/breadcrumbs/index.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
@import './skin';
@import './layout';
%breadcrumbs li > * {
@extend %breadcrumb;
}
%breadcrumbs strong {
@extend %breadcrumb-selected;
%breadcrumbs li a {
@extend %crumbs;
}
%breadcrumbs-milestone {
@extend %breadcrumbs;
%breadcrumbs li:not(:first-child) a {
@extend %breadcrumb;
}
%breadcrumbs-milestone li:first-child > * {
%breadcrumbs li:first-child a {
@extend %breadcrumb-milestone;
}
%breadcrumbs-filesystem {
@extend %breadcrumbs;
}
%breadcrumbs-filesystem li:not(:first-child) > * {
@extend %breadcrumb-path;
}
%breadcrumbs-filesystem li:first-child > * {
@extend %breadcrumb-folder;
}
18 changes: 11 additions & 7 deletions ui-v2/app/styles/base/components/breadcrumbs/layout.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
%breadcrumbs {
%breadcrumbs > li {
list-style-type: none;
display: inline-flex;
}
%breadcrumbs li > * {
display: inline-flex;
align-items: center;
%breadcrumb-milestone::before {
margin-right: 4px;
display: inline-block;
}
%breadcrumb {
margin-left: 8px;
}
%breadcrumbs li > *::before,
%breadcrumbs li {
margin-right: 0.5em;
%breadcrumb::before {
margin-right: 8px;
display: inline-block;
}
41 changes: 12 additions & 29 deletions ui-v2/app/styles/base/components/breadcrumbs/skin.scss
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
%breadcrumbs li {
list-style-type: none;
%crumbs {
color: $gray-500;
text-decoration: none;
}
%breadcrumb::before {
line-height: 1;
font-size: 0.7em;
margin-top: 0.2em;
%crumbs:hover {
color: $blue-500;
text-decoration: underline;
}
%breadcrumb::before {
content: '';
%crumbs::before {
text-decoration: none;
}
%breadcrumb-milestone::before {
content: '❮❮';
}
%breadcrumb-path::before {
content: '/';
}
%breadcrumb-folder::before {
position: relative;
top: 2px;
margin-top: -4px;
@extend %with-folder-outline-color-icon;
@extend %as-pseudo;
}
%breadcrumb {
color: $color-action;
}
%breadcrumb-selected {
color: $gray-400;
@extend %with-chevron-left-mask, %as-pseudo;
background-color: $gray-500;
}
%breadcrumb::before {
color: rgba($color-action, 0.5);
}
%breadcrumb-selected::before {
color: $gray-300;
content: '/';
color: $gray-500;
}
1 change: 0 additions & 1 deletion ui-v2/app/templates/dc/services/instance.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<ol>
<li><a data-test-back href={{href-to 'dc.services'}}>All Services</a></li>
<li><a data-test-back href={{href-to 'dc.services.show'}}>Service ({{item.Service}})</a></li>
<li><strong>Instance</strong></li>
</ol>
</BlockSlot>
<BlockSlot @name="header">
Expand Down

0 comments on commit b6313e7

Please sign in to comment.