From 7f4b39f4ebc8eaef7ad01eb304314cb4d2e6e161 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 23 Apr 2015 20:24:00 -0400 Subject: [PATCH] Adjusting themes to match with changes in 2.0 --- src/definitions/collections/menu.less | 3 +-- src/themes/amazon/elements/button.variables | 1 + src/themes/basic/views/card.variables | 10 ++++++---- src/themes/default/collections/menu.variables | 6 ++++-- src/themes/default/elements/button.variables | 4 ++-- src/themes/default/elements/label.variables | 8 ++++---- src/themes/github/collections/menu.variables | 3 +-- src/themes/github/elements/button.variables | 4 ++-- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index d7af478c9..f31cfb589 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -637,8 +637,7 @@ Floated Menu / Item border-right: @tabularBorderWidth solid @tabularBorderColor; } .ui.vertical.tabular.menu .item { - background-color: transparent; - + background: none; border-left: @tabularBorderWidth solid transparent; border-bottom: @tabularBorderWidth solid transparent; border-top: @tabularBorderWidth solid transparent; diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index 7581081fc..a03905bb4 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -14,6 +14,7 @@ background @transitionDuration @transitionEasing ; +@hoverBackgroundColor: #E0E0E0; @borderRadius: 3px; @verticalPadding: 0.8em; diff --git a/src/themes/basic/views/card.variables b/src/themes/basic/views/card.variables index 0df2bccfd..e612fe4f6 100644 --- a/src/themes/basic/views/card.variables +++ b/src/themes/basic/views/card.variables @@ -21,13 +21,15 @@ @extraBoxShadow: none; @extraPadding: 0.5em 0em; -@extraLinkColor: @linkColor; -@extraLinkHoverColor: @linkColor; +@extraLinkColor: @textColor; +@extraLinkHoverColor: @linkHoverColor; -@headerFontSize: 1.2em; -@headerLinkColor: @linkColor; +@headerFontSize: @relativeLarge; +@headerLinkColor: @textColor; +@headerLinkHoverColor: @linkHoverColor; @imageBorderRadius: @borderRadius; @imageBorder: 1px solid @borderColor; +@linkHoverBackground: transparent; @linkHoverBoxShadow: none; \ No newline at end of file diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index e154268c4..63a6a7291 100644 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -91,8 +91,8 @@ @arrowZIndex: 11; @arrowHoverColor: #FAFAFA; -@arrowActiveColor: #F7F7F7; -@arrowActiveHoverColor: @arrowHoverColor; +@arrowActiveColor: #F4F4F4; +@arrowActiveHoverColor: @arrowActiveColor; @arrowVerticalHoverColor: @arrowHoverColor; @arrowVerticalActiveColor: @arrowActiveColor; @@ -336,6 +336,8 @@ @textMenuItemMargin: 0em @textMenuItemSpacing; @textMenuItemTransition: opacity @transitionDuration @transitionEasing; +@textMenuSubMenuMargin: 0em; + @textMenuActiveItemFontWeight: bold; @textMenuActiveItemColor: @selectedTextColor; diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index 1111b6175..aa14e3c42 100644 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -85,8 +85,8 @@ /* Hovered */ @hoverBackgroundColor: #CACACA; -@hoverBackgroundImage: none; -@hoverBoxShadow: none; +@hoverBackgroundImage: @backgroundImage; +@hoverBoxShadow: @boxShadow; @hoverColor: @hoveredTextColor; @iconHoverOpacity: 0.85; diff --git a/src/themes/default/elements/label.variables b/src/themes/default/elements/label.variables index 872a88401..a7c8e3843 100644 --- a/src/themes/default/elements/label.variables +++ b/src/themes/default/elements/label.variables @@ -138,13 +138,13 @@ /* Corner */ @cornerSizeRatio: 1; @cornerTransition: color @labelTransitionDuration @labelTransitionEasing; -@cornerTriangleSize: 3.25em; +@cornerTriangleSize: 4em; @cornerTriangleTransition: border-color @labelTransitionDuration @labelTransitionEasing; @cornerTriangleZIndex: 1; -@cornerIconSize: 1em; -@cornerIconTopOffset: 0.4em; -@cornerIconLeftOffset: 0.75em; +@cornerIconSize: @relativeLarge; +@cornerIconTopOffset: 0.6428rem; +@cornerIconLeftOffset: 0.7857rem; /* Corner Text */ @cornerTextWidth: 3em; diff --git a/src/themes/github/collections/menu.variables b/src/themes/github/collections/menu.variables index 82fe8160a..7f4000b39 100644 --- a/src/themes/github/collections/menu.variables +++ b/src/themes/github/collections/menu.variables @@ -17,8 +17,7 @@ @activeHoverBackground: rgba(0, 0, 0, 0.04); @boxShadow: - 0px 1px 2px 0px rgba(0, 0, 0, 0.15), - 0px 0px 0px 1px rgba(0, 0, 0, 0.1) + 0px 1px 2px 0px rgba(0, 0, 0, 0.15) ; @headerBackground: rgba(0, 0, 0, 0.08); diff --git a/src/themes/github/elements/button.variables b/src/themes/github/elements/button.variables index 1e9d10032..3967fa58d 100644 --- a/src/themes/github/elements/button.variables +++ b/src/themes/github/elements/button.variables @@ -31,9 +31,9 @@ 0 1px 3px rgba(0, 0, 0, 0.05) ; -@hoverBackgroundColor: ''; +@hoverBackgroundColor: #E0E0E0; @hoverBackgroundImage: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.08)); -@hoverBoxShadow: ''; +@hoverBoxShadow: @boxShadow; @downBackgroundColor: ''; @downBackgroundImage: '';