Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Image/Image.module.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// Image.module.less
//
@import "../styles/mixins.less";
@import "../styles/variables.less";

.image {
margin: 0 @lime-spotlight-outset;
width: 720px;
height: 480px;
.lime-spotlight-margin(0);
}
2 changes: 1 addition & 1 deletion Slider/Slider.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

.slider {
position: relative;
margin: 0 @lime-spotlight-outset;
// Set both the V and H sizes here, so they can be easily overridden, both internally below and by component consumers.
height: @lime-slider-bar-height;
width: @lime-slider-bar-height;
box-sizing: content-box;
direction: ltr;
touch-action: none;
.lime-spotlight-margin(0);

.progressBar {
position: relative;
Expand Down
4 changes: 2 additions & 2 deletions internal/DateComponentPicker/DateComponentPicker.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
vertical-align: inherit;

.label {
.lime-body-text();
text-align: center;
padding: 36px @lime-spotlight-outset;
white-space: nowrap;
.lime-body-text();
.lime-spotlight-padding(36px);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.description {
margin: 0 @lime-spotlight-outset 1em;
.lime-spotlight-margin(0, 1em);

p:first-child {
margin-top: 0;
Expand Down
64 changes: 4 additions & 60 deletions styles/color-mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,64 +10,16 @@
// Focus Shadow and background setup
// ---------------------------------------
.lime-bg-colors (@bg) {
//// Relocate the bg styling to a pseudo-element
// &::after {
@bg();
// }
@bg();
}
// .lime-shadow-colors (@shadow) {
// // &::before {
// @shadow();
// // }
// }

// Establish rules assignment for before focus has happened
.lime-spotlight-resting-bg-colors (@opacity: 0, @bg: {}, @shadow: {}) {
// These lines are really long, and occasionally repeated. Defining here as shorthand.
// @transition-opacity: opacity @lime-spotlight-focus-animation-duration ease-out;
// @transition-transform: transform @lime-spotlight-focus-animation-duration ease-out;
// @transition-filter: filter @lime-spotlight-focus-animation-duration ease-out;

opacity: @opacity;
// transition+: @transition-opacity;
// will-change+: opacity;

// Prep common aspects
// @pseudo-element-setup: {
// content: "";
// position: absolute;
// .position(0);
// border-radius: inherit;
// };

// // Shadow
// .lime-shadow-colors({
// @pseudo-element-setup();
// background-color: @lime-spotlight-bg-color;
// opacity: 0;

// // filter+: drop-shadow(@lime-spotlight-focus-shadow);
// box-shadow: @lime-spotlight-focus-shadow;

// //// Include a transform on the shadow for a better effect
// // transform+_: scale(0.9, 0.5); // Hard-coded values, not part of the design. This transform is responsible for tucking the shadow up inside the background so it can transition out.
// // transition+: @transition-opacity, @transition-transform;
// // will-change+: opacity, transition;

// //// Simple opacity change to the shadow (fade-in)
// transition+: @transition-opacity;
// will-change+: opacity;
// will-change+: box-shadow;

// @shadow();
// });

// Background coloration
.lime-bg-colors({
// @pseudo-element-setup();

background-color: @lime-spotlight-bg-color;
// transition+: @transition-filter;
will-change+: box-shadow;

@bg();
Expand All @@ -78,26 +30,18 @@
// Establish rules assignment for after focus has happened
.lime-spotlight-focus-bg-colors (@bg: {}, @shadow: {}) {
opacity: 1;

// Background coloration
.lime-bg-colors({
background-color: @lime-spotlight-bg-color;
box-shadow: @lime-spotlight-focus-shadow;

@bg();
@shadow();
});
}

// // Just the spotlight shadow (merge-safe)
// .lime-spotlight-focus-shadow-colors (@shadow: {}) {
// .lime-shadow-colors({
// transform: scale(1);
// opacity: 1;
// box-shadow: @lime-spotlight-focus-shadow;
// @shadow();
// });
// }

.lime-spotlight-focus-text-colors () {
// font-weight: @lime-spotlight-font-weight;
color: @lime-spotlight-text-color;
}

Expand Down
46 changes: 0 additions & 46 deletions styles/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
}
}

.lime-item-icon-tap-area-adjust() {
&.small > .small-icon-tap-area {
left: -@lime-spotlight-outset;
right: -@lime-spotlight-outset;
}
}

.lime-word-break() {
overflow-wrap: break-word;
word-break: keep-all;
Expand Down Expand Up @@ -179,23 +172,6 @@
//
// Custom Text Size Mixins
//
// 1 arg: Shorthand for just setting the font size in custom-text mode
.lime-custom-text-size(@latin-size) {
.lime-custom-text({
font-size: @latin-size;
});
}
// 2 args: Shorthand for just setting the font size of both latin and non-latin in custom-text mode
.lime-custom-text-size(@latin-size; @non-latin-size) {
.lime-custom-text(
{
font-size: @latin-size;
};
{
font-size: @non-latin-size;
});
}

// 1 arg: Generic rule applicator, accepts an entire rule-set to add for large text mode
.lime-custom-text(@lrules) when (isruleset(@lrules)) {
&:global(.largeText) {
Expand All @@ -220,20 +196,6 @@
// Text definitions
//

.lime-alert-title() {
.lime-font(@lime-alert-font-family; @lime-non-latin-font-family-light);
.enact-locale-line-height(@lime-alert-line-height; @lime-tallglyph-body-line-height);
font-size: @lime-alert-title-font-size;
font-weight: @lime-alert-font-weight;
}

.lime-alert-subtitle() {
.lime-font(@lime-alert-font-family; @lime-non-latin-font-family-light);
.enact-locale-line-height(@lime-alert-line-height);
font-size: @lime-alert-subtitle-font-size;
font-weight: @lime-alert-font-weight;
}

.lime-alert-overlay-content() {
.lime-font(@lime-alert-font-family; @lime-non-latin-font-family-light);
.enact-locale-line-height(@lime-alert-line-height; @lime-tallglyph-body-line-height);
Expand Down Expand Up @@ -292,14 +254,6 @@
.font-kerning();
}

// Uses Webkit specific styles to have multi-line ellipsis
.lime-multi-line-ellipsis(@lines) {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: @lines;
-webkit-box-orient: vertical;
}

// Add an extension to the .enact-locale-line-height mixin defined in ~@ui which has defaults specific to limestone.
//
// Set line-height for normal and tallglyphs with 0, 1 or 2 arguments
Expand Down
Loading