From ea906db4c53cd3bcff5b7eddb5f1a36483784a5c Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 6 May 2015 16:40:38 -0400 Subject: [PATCH] First pass simple material theme --- src/definitions/modules/dropdown.less | 1 + src/themes/default/modules/dropdown.variables | 11 ++++++----- src/themes/material/modules/dropdown.overrides | 2 +- src/themes/material/modules/dropdown.variables | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index db3e3aa77..2ad940d33 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -398,6 +398,7 @@ select.ui.dropdown { min-width: @menuMinWidth; outline: none; + border-radius: @selectionMenuBorderRadius; box-shadow: @selectionMenuBoxShadow; transition: @selectionMenuTransition; } diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables index 0ced4a5f7..c461d20d1 100644 --- a/src/themes/default/modules/dropdown.variables +++ b/src/themes/default/modules/dropdown.variables @@ -28,7 +28,7 @@ @menuMargin: 0em; @menuPadding: 0em 0em; @menuTop: 100%; -@menuWrap: nowrap; +@menuWrap: normal; @menuTextAlign: left; @menuBorderWidth: 1px; @@ -51,8 +51,8 @@ @itemHeight: auto; @itemDivider: none; @itemColor: @textColor; -@itemVerticalPadding: @relativeMini; -@itemHorizontalPadding: @relativeLarge; +@itemVerticalPadding: @mini; +@itemHorizontalPadding: @large; @itemPadding: @itemVerticalPadding @itemHorizontalPadding; @itemFontWeight: normal; @itemLineHeight: 1em; @@ -119,8 +119,8 @@ --------------------*/ /* Selection */ @selectionMinWidth: 200px; -@borderEmWidth: 0.0785em; /* 2px / em size */ -@selectionMinHeight: @defaultInputLineHeight + (@selectionVerticalPadding * 2) - @borderEmWidth; +@selectionBorderEmWidth: 0.0785em; /* 2px / em size */ +@selectionMinHeight: @defaultInputLineHeight + (@selectionVerticalPadding * 2) - @selectionBorderEmWidth; @selectionBackground: @white; @selectionDisplay: inline-block; @selectionVerticalPadding: 0.78571em; @@ -154,6 +154,7 @@ @selectionIconPadding: @selectionIconHitbox; @selectionIconTransition: opacity @transitionDuration @transitionEasing; +@selectionMenuBorderRadius: 0em 0em @borderRadius @borderRadius; @selectionMenuBoxShadow: @raisedShadow; @selectionMenuItemBoxShadow: none; diff --git a/src/themes/material/modules/dropdown.overrides b/src/themes/material/modules/dropdown.overrides index 87ec61cbd..40fcd920e 100644 --- a/src/themes/material/modules/dropdown.overrides +++ b/src/themes/material/modules/dropdown.overrides @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Roboto); +@import url(http://fonts.googleapis.com/css?family=Roboto:400,700); .ui.dropdown { font-family: 'Roboto'; diff --git a/src/themes/material/modules/dropdown.variables b/src/themes/material/modules/dropdown.variables index 2103dcd62..03e460a2d 100644 --- a/src/themes/material/modules/dropdown.variables +++ b/src/themes/material/modules/dropdown.variables @@ -2,4 +2,19 @@ Menu *******************************/ +@menuBorderRadius: @borderRadius; +@menuBorderColor: #DADADA; +@menuBoxShadow: 0px 2px 4px rgba(0, 0, 0, 0.2); +@menuPadding: 0.5714em 0em; +@itemVerticalPadding: 1em; +@itemHorizontalPadding: 1.5em; + +@menuHeaderFontSize: @small; +@menuHeaderFontWeight: bold; +@menuHeaderTextTransform: none; + +@selectionBorderEmWidth: 0em; +@selectionItemDivider: none; + +@labelBoxShadow: none; \ No newline at end of file