Browse Source

Fixes #1353, fix many em values to be exact pixel calcs to avoid rounding errors

pull/1378/head
jlukic 10 years ago
parent
commit
bde983a572
8 changed files with 27 additions and 28 deletions
  1. 10
      src/themes/default/collections/form.variables
  2. 2
      src/themes/default/collections/menu.variables
  3. 2
      src/themes/default/elements/button.variables
  4. 4
      src/themes/default/elements/input.variables
  5. 23
      src/themes/default/elements/step.variables
  6. 8
      src/themes/default/modules/popup.variables
  7. 2
      src/themes/default/modules/search.variables
  8. 4
      src/themes/flat/collections/form.variables

10
src/themes/default/collections/form.variables

@ -17,9 +17,9 @@
@fieldMargin: 0em 0em @rowDistance; @fieldMargin: 0em 0em @rowDistance;
/* Form Label */ /* Form Label */
@labelDistance: 0.3rem;
@labelDistance: 0.2857rem;
@labelMargin: 0em 0em @labelDistance 0em; @labelMargin: 0em 0em @labelDistance 0em;
@labelFontSize: 0.9em;
@labelFontSize: 0.9285em;
@labelFontWeight: bold; @labelFontWeight: bold;
@labelTextTransform: none; @labelTextTransform: none;
@labelColor: @textColor; @labelColor: @textColor;
@ -27,9 +27,9 @@
/* Input */ /* Input */
@inputWidth: 100%; @inputWidth: 100%;
@inputFontSize: 1em; @inputFontSize: 1em;
@inputVerticalPadding: 0.8em;
@inputVerticalPadding: 0.78571em;
@inputHorizontalPadding: 1em; @inputHorizontalPadding: 1em;
@inputLineHeight: 1.2;
@inputLineHeight: 1.2142em;
@inputPadding: (@inputVerticalPadding + ((1em - @inputLineHeight) / 2)) @inputHorizontalPadding; @inputPadding: (@inputVerticalPadding + ((1em - @inputLineHeight) / 2)) @inputHorizontalPadding;
@inputBackground: #FFFFFF; @inputBackground: #FFFFFF;
@inputBorder: 1px solid @borderColor; @inputBorder: 1px solid @borderColor;
@ -56,7 +56,7 @@
@textAreaPadding: @inputVerticalPadding @inputHorizontalPadding; @textAreaPadding: @inputVerticalPadding @inputHorizontalPadding;
@textAreaHeight: 12em; @textAreaHeight: 12em;
@textAreaResize: vertical; @textAreaResize: vertical;
@textAreaLineHeight: 1.33;
@textAreaLineHeight: 1.2857;
@textAreaMinHeight: 8em; @textAreaMinHeight: 8em;
@textAreaMaxHeight: 24em; @textAreaMaxHeight: 24em;
@textAreaBackground: @inputBackground; @textAreaBackground: @inputBackground;

2
src/themes/default/collections/menu.variables

@ -16,7 +16,7 @@
--------------------*/ --------------------*/
@margin: 1rem 0rem; @margin: 1rem 0rem;
@verticalPadding: 0.83em;
@verticalPadding: 0.78571em;
@horizontalPadding: 0.95em; @horizontalPadding: 0.95em;
@background: #FFFFFF; @background: #FFFFFF;

2
src/themes/default/elements/button.variables

@ -12,7 +12,7 @@
/* Style */ /* Style */
@backgroundColor: #E0E0E0; @backgroundColor: #E0E0E0;
@backgroundImage: none; @backgroundImage: none;
@verticalPadding: 0.8em;
@verticalPadding: 0.78571em;
@horizontalPadding: 1.5em; @horizontalPadding: 1.5em;
/* Text */ /* Text */

4
src/themes/default/elements/input.variables

@ -8,10 +8,10 @@
@pageFont: "Helvetica Neue", "Helvetica", Arial; @pageFont: "Helvetica Neue", "Helvetica", Arial;
@verticalPadding: 0.8em;
@verticalPadding: 0.78571em;
@horizontalPadding: 1em; @horizontalPadding: 1em;
@lineHeight: 1.2em;
@lineHeight: 1.2142em;
@lineHeightOffset: ((@lineHeight - 1em) / 2); @lineHeightOffset: ((@lineHeight - 1em) / 2);
@padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding; @padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding;

23
src/themes/default/elements/step.variables

@ -9,24 +9,23 @@
@verticalMargin: 0em; @verticalMargin: 0em;
@horizontalMargin: 0em; @horizontalMargin: 0em;
@verticalPadding: 0.8em;
@verticalPadding: 0.9285em;
@horizontalPadding: 1.5em; @horizontalPadding: 1.5em;
@leftPadding: @horizontalPadding + (@arrowSize /2);
@leftPadding: @horizontalPadding + (@arrowSize / 2);
@transition: @transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
background-color @transitionDuration @transitionEasing,
opacity @transitionDuration @transitionEasing,
color @transitionDuration @transitionEasing,
box-shadow @transitionDuration @transitionEasing
; ;
@borderRadius: @defaultBorderRadius; @borderRadius: @defaultBorderRadius;
@lineHeight: 1.2;
@lineHeight: 1.142em;
@backgroundColor: #FFFFFF; @backgroundColor: #FFFFFF;
@background: @backgroundColor; @background: @backgroundColor;
@borderRadius: 0em; @borderRadius: 0em;
@boxShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
@boxShadow: 0px 0px 0px 1px @borderColor;
/* Icon */ /* Icon */
@iconDistance: 0.6em; @iconDistance: 0.6em;
@ -36,12 +35,12 @@
/* Title */ /* Title */
@titleFontFamily: @headerFont; @titleFontFamily: @headerFont;
@titleFontWeight: bold; @titleFontWeight: bold;
@titleFontSize: 1.1em;
@titleFontSize: 1.0714em;
@titleColor: @darkTextColor; @titleColor: @darkTextColor;
/* Description */ /* Description */
@descriptionDistance: 0.1em; @descriptionDistance: 0.1em;
@descriptionFontSize: 0.9em;
@descriptionFontSize: 0.9285em;
@descriptionFontWeight: normal; @descriptionFontWeight: normal;
@descriptionColor: @textColor; @descriptionColor: @textColor;
@ -52,7 +51,7 @@
@arrowBackgroundColor: @backgroundColor; @arrowBackgroundColor: @backgroundColor;
@arrowTopOffset: 50%; @arrowTopOffset: 50%;
@arrowRightOffset: 0em; @arrowRightOffset: 0em;
@arrowBorderColor: rgba(0, 0, 0, 0.1);
@arrowBorderColor: @borderColor;
/*------------------- /*-------------------

8
src/themes/default/modules/popup.variables

@ -15,7 +15,7 @@
@boxShadow: 0px 2px 4px rgba(0, 0, 0, 0.1); @boxShadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
@color: @textColor; @color: @textColor;
@verticalPadding: 0.8em;
@verticalPadding: 0.833em;
@horizontalPadding: 1em; @horizontalPadding: 1em;
@fontWeight: normal; @fontWeight: normal;
@fontStyle: normal; @fontStyle: normal;
@ -89,7 +89,7 @@
@invertedArrowColor: @black; @invertedArrowColor: @black;
/* Sizes */ /* Sizes */
@small: 0.8rem;
@medium: 0.875rem;
@small: 0.785714rem;
@medium: 0.85714rem;
@large: 1rem; @large: 1rem;
@huge: 1.1rem;
@huge: 1.14285rem;

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

@ -4,7 +4,7 @@
/* Search Prompt */ /* Search Prompt */
@promptFontSize: 1em; @promptFontSize: 1em;
@promptVerticalPadding: 0.8em;
@promptVerticalPadding: 0.78571em;
@promptHorizontalPadding: 1em; @promptHorizontalPadding: 1em;
@promptLineHeight: 1.2; @promptLineHeight: 1.2;
@promptPadding: (@promptVerticalPadding + ((1em - @promptLineHeight) / 2)) @promptHorizontalPadding; @promptPadding: (@promptVerticalPadding + ((1em - @promptLineHeight) / 2)) @promptHorizontalPadding;

4
src/themes/flat/collections/form.variables

@ -14,13 +14,13 @@
@fieldMargin: 0em 0em 1em; @fieldMargin: 0em 0em 1em;
/* Form Label */ /* Form Label */
@labelFontSize: 0.8em;
@labelFontSize: 0.7857em;
@labelTextTransform: uppercase; @labelTextTransform: uppercase;
@groupedLabelTextTransform: none; @groupedLabelTextTransform: none;
/* Input */ /* Input */
@inputVerticalPadding: 0.8em;
@inputVerticalPadding: 0.7857em;
@inputHorizontalPadding: 0.5em; @inputHorizontalPadding: 0.5em;
@inputBackground: transparent; @inputBackground: transparent;
@inputBorder: none; @inputBorder: none;

Loading…
Cancel
Save