diff --git a/server/documents/collections/breadcrumb.html.eco b/server/documents/collections/breadcrumb.html.eco index 3e5d7e850..3c4828170 100755 --- a/server/documents/collections/breadcrumb.html.eco +++ b/server/documents/collections/breadcrumb.html.eco @@ -39,9 +39,9 @@ type : 'UI Collection'

A breadcrumb can contain a divider to show the relationship between sections, this can be formatted as an icon or text.

diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index 644060875..08077a44b 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -52,9 +52,6 @@ .ui.menu > .item:first-child { border-radius: @borderRadius 0px 0px @borderRadius; } -.ui.menu > .item:last-child { - border-radius: 0px @borderRadius @borderRadius 0px; -} /*-------------- Colors @@ -128,13 +125,12 @@ position: absolute; content: ''; top: 0%; - left: 0px; + right: 0px; width: @dividerSize; height: 100%; background: @dividerBackground; } -.ui.menu > .menu:not(.right):first-child > .item:first-child:before, -.ui.menu .item:first-child:before { +.ui.menu > .right.menu:first-child { display: none; } .ui.menu .menu.right .item:before, @@ -1434,6 +1430,9 @@ padding-right: 0px !important; text-align: center; } +.ui.item.menu > .item:last-child { + border-radius: 0px @borderRadius @borderRadius 0px; +} .ui.menu.two.item .item { width: 50%; } diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less index 801ca28b1..6b54a7998 100755 --- a/src/definitions/elements/label.less +++ b/src/definitions/elements/label.less @@ -72,6 +72,11 @@ a.ui.label { opacity: 1; } +/* Icon */ +.ui.label .icon { + width: auto; + margin: 0em @iconDistance 0em 0em; +} /* Detail */ .ui.label .detail { display: inline-block; @@ -79,13 +84,11 @@ a.ui.label { font-weight: bold; opacity: @detailOpacity; } - -/* Icon */ -.ui.label .icon { - width: auto; - margin: 0em @iconDistance 0em 0em; +.ui.label .detail .icon { + margin: 0em @detailIconDistance 0em 0em; } + /* Removable label */ .ui.label .delete.icon { cursor: pointer; diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less index 43aae842e..f8f2da88c 100755 --- a/src/definitions/globals/site.less +++ b/src/definitions/globals/site.less @@ -55,7 +55,7 @@ h2, h3, h4, h5 { - margin: 1em 0em 1rem; + margin: @headerMargin; padding: 0em; } diff --git a/src/themes/packages/default/collections/grid.variables b/src/themes/packages/default/collections/grid.variables index 48887672b..802c6bcb5 100755 --- a/src/themes/packages/default/collections/grid.variables +++ b/src/themes/packages/default/collections/grid.variables @@ -17,42 +17,6 @@ @firstRowSpacing: 0rem; @columnMaxImageWidth: 100%; -@columnCount: 16; - -@oneWide : (1 / @columnCount * 100%); -@twoWide : (2 / @columnCount * 100%); -@threeWide : (3 / @columnCount * 100%); -@fourWide : (4 / @columnCount * 100%); -@fiveWide : (5 / @columnCount * 100%); -@sixWide : (6 / @columnCount * 100%); -@sevenWide : (7 / @columnCount * 100%); -@eightWide : (8 / @columnCount * 100%); -@nineWide : (9 / @columnCount * 100%); -@tenWide : (10 / @columnCount * 100%); -@elevenWide : (11 / @columnCount * 100%); -@twelveWide : (12 / @columnCount * 100%); -@thirteenWide : (13 / @columnCount * 100%); -@fourteenWide : (14 / @columnCount * 100%); -@fifteenWide : (15 / @columnCount * 100%); -@sixteenWide : (16 / @columnCount * 100%); - -@oneColumn : (1 / 1 * 100%); -@twoColumn : (1 / 2 * 100%); -@threeColumn : (1 / 3 * 100%); -@fourColumn : (1 / 4 * 100%); -@fiveColumn : (1 / 5 * 100%); -@sixColumn : (1 / 6 * 100%); -@sevenColumn : (1 / 7 * 100%); -@eightColumn : (1 / 8 * 100%); -@nineColumn : (1 / 9 * 100%); -@tenColumn : (1 / 10 * 100%); -@elevenColumn : (1 / 11 * 100%); -@twelveColumn : (1 / 12 * 100%); -@thirteenColumn : (1 / 13 * 100%); -@fourteenColumn : (1 / 14 * 100%); -@fifteenColumn : (1 / 15 * 100%); -@sixteenColumn : (1 / 16 * 100%); - /******************************* Variations diff --git a/src/themes/packages/default/collections/menu.variables b/src/themes/packages/default/collections/menu.variables index fe6ea69a0..dcbf6295c 100755 --- a/src/themes/packages/default/collections/menu.variables +++ b/src/themes/packages/default/collections/menu.variables @@ -85,10 +85,10 @@ /* Input */ @inputSize: 0.875em; -@inputVerticalMargin: -0.8em; -@inputOffset: -0.05em; +@inputVerticalMargin: -0.6em; +@inputOffset: 0em; @inputVerticalPadding: 0.5em; -@inputIconOffset: -0.3em; +@inputIconOffset: -0.25em; @smallInputOffset: 0em; @smallInputVerticalPadding: 0.4em; diff --git a/src/themes/packages/default/collections/table.variables b/src/themes/packages/default/collections/table.variables index 24135edc4..bad41577d 100644 --- a/src/themes/packages/default/collections/table.variables +++ b/src/themes/packages/default/collections/table.variables @@ -162,8 +162,8 @@ @paddedVerticalPadding: 0.8em; @paddedHorizontalPadding: 1em; -@compactVerticalPadding: 0.2em; -@compactHorizontalPadding: 0.5em; +@compactVerticalPadding: 0.5em; +@compactHorizontalPadding: 0.8em; /* Sizes */ @small: 0.875em; diff --git a/src/themes/packages/default/elements/icon.overrides b/src/themes/packages/default/elements/icon.overrides index 42fb6330b..16587431f 100755 --- a/src/themes/packages/default/elements/icon.overrides +++ b/src/themes/packages/default/elements/icon.overrides @@ -554,6 +554,7 @@ i.icon.picture:before { content: "\f03e"; } i.icon.pencil:before { content: "\f040"; } i.icon.compose:before { content: "\f040"; } i.icon.point:before { content: "\f041"; } +i.icon.signup:before { content: "\f044"; } i.icon.plus.circle:before { content: "\f055"; } i.icon.minus.circle:before { content: "\f056"; } i.icon.dont:before { content: "\f05e"; } diff --git a/src/themes/packages/default/elements/label.variables b/src/themes/packages/default/elements/label.variables index b8f2c663d..f8116eba3 100755 --- a/src/themes/packages/default/elements/label.variables +++ b/src/themes/packages/default/elements/label.variables @@ -39,8 +39,9 @@ @iconDistance: 0.75em; @detailOpacity: 0.8; - +@detailIconDistance: 0.25em; @detailMargin: 0.5em; + @deleteMargin: 0.5em; /*------------------- diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index 0a382936d..db5f2e96e 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -17,6 +17,7 @@ @fontSize : 14px; @textColor : rgba(0, 0, 0, 0.8); +@headerMargin : 1em 0em 1rem; @paragraphMargin : 1em 0em; @linkColor : #009FDA; @@ -26,6 +27,47 @@ @highlightBackground : #FFFFCC; @highlightColor : @textColor; +/*------------------- + Grid +--------------------*/ + +@columnCount: 16; + +@oneWide : (1 / @columnCount * 100%); +@twoWide : (2 / @columnCount * 100%); +@threeWide : (3 / @columnCount * 100%); +@fourWide : (4 / @columnCount * 100%); +@fiveWide : (5 / @columnCount * 100%); +@sixWide : (6 / @columnCount * 100%); +@sevenWide : (7 / @columnCount * 100%); +@eightWide : (8 / @columnCount * 100%); +@nineWide : (9 / @columnCount * 100%); +@tenWide : (10 / @columnCount * 100%); +@elevenWide : (11 / @columnCount * 100%); +@twelveWide : (12 / @columnCount * 100%); +@thirteenWide : (13 / @columnCount * 100%); +@fourteenWide : (14 / @columnCount * 100%); +@fifteenWide : (15 / @columnCount * 100%); +@sixteenWide : (16 / @columnCount * 100%); + +@oneColumn : (1 / 1 * 100%); +@twoColumn : (1 / 2 * 100%); +@threeColumn : (1 / 3 * 100%); +@fourColumn : (1 / 4 * 100%); +@fiveColumn : (1 / 5 * 100%); +@sixColumn : (1 / 6 * 100%); +@sevenColumn : (1 / 7 * 100%); +@eightColumn : (1 / 8 * 100%); +@nineColumn : (1 / 9 * 100%); +@tenColumn : (1 / 10 * 100%); +@elevenColumn : (1 / 11 * 100%); +@twelveColumn : (1 / 12 * 100%); +@thirteenColumn : (1 / 13 * 100%); +@fourteenColumn : (1 / 14 * 100%); +@fifteenColumn : (1 / 15 * 100%); +@sixteenColumn : (1 / 16 * 100%); + + /*------------------- Breakpoints --------------------*/