Browse Source

Update global emotive colors, fix segment attachment again

pull/1177/head
jlukic 10 years ago
parent
commit
88e53b1b81
4 changed files with 31 additions and 32 deletions
  1. 2
      src/definitions/elements/segment.less
  2. 9
      src/themes/packages/default/collections/message.variables
  3. 1
      src/themes/packages/default/elements/segment.variables
  4. 51
      src/themes/packages/default/globals/site.variables

2
src/definitions/elements/segment.less

@ -454,6 +454,8 @@
top: 0px;
bottom: 0px;
margin: 0em @attachedHorizontalOffset;
width: @attachedWidth;
max-width: @attachedWidth;
border-radius: 0px;
box-shadow: @attachedBoxShadow;
border: @attachedBorder;

9
src/themes/packages/default/collections/message.variables

@ -17,12 +17,13 @@
@lineHeight: 1.3;
@lineHeightOffset: ((@lineHeight - 1em) / 2);
@borderRadius: 0.25em;
@borderRadius: @defaultBorderRadius;
@borderWidth: 1px;
@borderShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.15) inset;
@borderShadow: 0px 0px 0px @borderWidth @borderColor inset;
@shadowShadow: 0px 0px 0px 0px transparent;
@boxShadow:
@borderShadow,
@subtleShadow
@shadowShadow
;
@transition:
@ -73,7 +74,7 @@
/* Attached */
@attachedXOffset: -1px;
@attachedYOffset: -1px;
@attachedBoxShadow: 0em 0em 0em 1px rgba(0, 0, 0, 0.1) inset;
@attachedBoxShadow: 0em 0em 0em @borderWidth rgba(0, 0, 0, 0.1) inset;
@attachedBottomBoxShadow:
@attachedBoxShadow,
@subtleShadow

1
src/themes/packages/default/elements/segment.variables

@ -59,6 +59,7 @@
@attachedTopOffset: 0px;
@attachedBottomOffset: 0px;
@attachedHorizontalOffset: -1px;
@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")";
@attachedBoxShadow: none;
@attachedBorder: 1px solid @solidBorderColor;
@attachedBottomBoxShadow:

51
src/themes/packages/default/globals/site.variables

@ -180,35 +180,34 @@
Emotive Colors
--------------------*/
/* Mood */
/* Positive */
@positiveColor : @green;
@negativeColor : @red;
@positiveBackgroundColor : #E4F5DD;
@negativeBackgroundColor : #FAE8E8;
@positiveBackgroundColor : #EEFFE7;
@positiveBorderColor : #B7CAA7;
@negativeBorderColor : #DBB1B1;
@positiveHeaderColor : #356E36;
@positiveTextColor : #3C763D;
@negativeTextColor : #A94442;
/* Negative */
@negativeColor : @red;
@negativeBackgroundColor : #FFF0F0;
@negativeBorderColor : #DBB1B1;
@negativeHeaderColor : #912D2B;
@negativeTextColor : #A94442;
/* Status */
/* Info */
@infoColor : #31CCEC;
@warningColor : #F2C037;
@successColor : @positiveColor;
@errorColor : @negativeColor;
@infoBackgroundColor : #E5F6FB;
@warningBackgroundColor : #FCF8E3;
@infoBackgroundColor : #E9FAFF;
@infoBorderColor : #AAD6DF;
@warningBorderColor : #D3C4A5;
@warningTextColor : #8A6D3B;
@infoHeaderColor : #297187;
@infoTextColor : #337B92;
/* Warning */
@warningColor : #F2C037;
@warningBorderColor : #D9CAAB;
@warningBackgroundColor : #FFFBE6;
@warningHeaderColor : #825C01;
@warningTextColor : #876A38;
/*-------------------
Neutral Text
@ -295,20 +294,16 @@
@lineHeightOffset : ((@lineHeight - 1em) / 2);
/* Positive / Negative Dupes */
@successColor : @positiveColor;
@errorColor : @negativeColor;
@successBackgroundColor : @positiveBackgroundColor;
@errorBackgroundColor : @negativeBackgroundColor;
@successTextColor : @positiveTextColor;
@errorTextColor : @negativeTextColor;
@successBorderColor : @positiveBorderColor;
@errorBorderColor : @negativeBorderColor;
/* Header Colors */
@positiveHeaderColor : darken(@positiveTextColor, 5);
@negativeHeaderColor : darken(@negativeTextColor, 5);
@infoHeaderColor : darken(@infoTextColor, 5);
@warningHeaderColor : darken(@warningTextColor, 5);
@successHeaderColor : darken(@successTextColor, 5);
@errorHeaderColor : darken(@errorTextColor, 5);
@successHeaderColor : @positiveHeaderColor;
@errorHeaderColor : @negativeHeaderColor;
/* Responsive */
@largestMobileScreen : (@tabletBreakpoint - 1px);

Loading…
Cancel
Save