Browse Source

FSearch: Fixes border radius, matching box shadow with global, increases vertical padding

pull/2403/head
jlukic 9 years ago
parent
commit
5eb6a489b3
2 changed files with 41 additions and 12 deletions
  1. 31
      src/definitions/modules/search.less
  2. 22
      src/themes/default/modules/search.variables

31
src/definitions/modules/search.less

@ -80,8 +80,15 @@
border-radius: @resultsBorderRadius;
box-shadow: @resultsBoxShadow;
border: @resultsBorder;
z-index: @resultsZIndex;
}
.ui.search > .results :first-child {
border-radius: @resultsBorderRadius @resultsBorderRadius 0em 0em;
}
.ui.search > .results :last-child {
border-radius: 0em 0em @resultsBorderRadius @resultsBorderRadius;
}
/*--------------
Result
@ -176,6 +183,16 @@
States
*******************************/
/*--------------------
Focus
---------------------*/
.ui.search > .prompt:focus {
border-color: @promptFocusBorderColor;
background: @promptFocusBackground;
color: @promptFocusColor;
}
/*--------------------
Loading
---------------------*/
@ -232,10 +249,10 @@
Active
---------------*/
.ui.search > .results .category.active {
.ui.category.search > .results .category.active {
background: @categoryActiveBackground;
}
.ui.search > .results .category.active > .name {
.ui.category.search > .results .category.active > .name {
color: @categoryNameActiveColor;
}
@ -272,10 +289,20 @@
border-bottom: @categoryDivider;
transition: @categoryTransition;
}
/* Last Category */
.ui.category.search > .results .category:last-child {
border-bottom: none;
}
/* First / Last */
.ui.category.search > .results .category:first-child .name + .result {
border-radius: 0em @resultsBorderRadius 0em 0em;
}
.ui.category.search > .results .category:last-child .result:last-child {
border-radius: 0em 0em @resultsBorderRadius 0em;
}
/* Category Result */
.ui.category.search > .results .category .result {
background: @categoryResultBackground;

22
src/themes/default/modules/search.variables

@ -25,11 +25,12 @@
@resultsBackground: #FFFFFF;
@resultsDistance: 0.5em;
@resultsBorderRadius: @defaultBorderRadius;
@resultsBoxShadow: 0px 1px 3px 1px @borderColor;
@resultsBorder: 1px solid @solidBorderColor;
@resultsBoxShadow: @floatingShadow;
/* Result */
@resultFontSize: 1em;
@resultVerticalPadding: @relativeMini;
@resultVerticalPadding: @relativeTiny;
@resultHorizontalPadding: @relativeLarge;
@resultPadding: @resultVerticalPadding @resultHorizontalPadding;
@resultTextColor: @textColor;
@ -84,6 +85,11 @@
States
*******************************/
/* Focus */
@promptFocusBackground: @promptBackground;
@promptFocusBorderColor: @selectedBorderColor;
@promptFocusColor: @selectedTextColor;
/* Hover */
@resultHoverBackground: @offWhite;
@actionHoverBackground: #E0E0E0;
@ -99,7 +105,7 @@
@categoryNameActiveColor: @textColor;
/* Active Result */
@resultActiveBorderLeft: transparent;
@resultActiveBorderLeft: @internalBorderColor;
@resultActiveBackground: @darkWhite;
@resultActiveBoxShadow: none;
@resultActiveTitleColor: @darkTextColor;
@ -114,10 +120,10 @@
/* Category */
@categoryBackground: @darkWhite;
@categoryBoxShadow: none;
@categoryDivider: 1px solid @borderColor;
@categoryDivider: 1px solid @internalBorderColor;
@categoryTransition:
background 0.2s ease,
border-color 0.2s ease
background @defaultDuration @defaultEasing,
border-color @defaultDuration @defaultEasing
;
@categoryResultsWidth: 28em;
@ -137,7 +143,3 @@
@categoryNamePadding: 0.4em 1em;
@categoryNameFontWeight: bold;
@categoryNameColor: @lightTextColor;
/* Sizes */
@medium: 1em;
@large: 1.1em;
Loading…
Cancel
Save