Skip to content

Commit

Permalink
Changed font weight definitions to variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
silviogutierrez committed May 5, 2014
1 parent 520ea11 commit 8902cde
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 47 deletions.
2 changes: 1 addition & 1 deletion scss/foundation/components/_alert-boxes.scss
Expand Up @@ -16,7 +16,7 @@ $alert-padding-opposite-direction: $alert-padding-top + rem-calc(10) !default;
$alert-padding-bottom: $alert-padding-top !default;

// We use these to control text style.
$alert-font-weight: normal !default;
$alert-font-weight: $font-weight-normal !default;
$alert-font-size: rem-calc(13) !default;
$alert-font-color: #fff !default;
$alert-font-color-alt: scale-color($secondary-color, $lightness: -66%) !default;
Expand Down
2 changes: 1 addition & 1 deletion scss/foundation/components/_buttons.scss
Expand Up @@ -27,7 +27,7 @@ $button-font-tny: rem-calc(11) !default;
$button-font-sml: rem-calc(13) !default;
$button-font-med: rem-calc(16) !default;
$button-font-lrg: rem-calc(20) !default;
$button-font-weight: normal !default;
$button-font-weight: $font-weight-normal !default;
$button-font-align: center !default;

// We use these to control various hover effects.
Expand Down
6 changes: 3 additions & 3 deletions scss/foundation/components/_forms.scss
Expand Up @@ -16,7 +16,7 @@ $form-spacing: rem-calc(16) !default;
// We use these to style the labels in different ways
$form-label-pointer: pointer !default;
$form-label-font-size: rem-calc(14) !default;
$form-label-font-weight: normal !default;
$form-label-font-weight: $font-weight-normal !default;
$form-label-line-height: 1.5 !default;
$form-label-font-color: scale-color(#000, $lightness: 30%) !default;
$form-label-small-transform: capitalize !default;
Expand Down Expand Up @@ -44,7 +44,7 @@ $fieldset-margin: rem-calc(18 0) !default;

// We use these to style the legends when you use them
$legend-bg: #fff !default;
$legend-font-weight: bold !default;
$legend-font-weight: $font-weight-bold !default;
$legend-padding: rem-calc(0 3) !default;

// We use these to style the prefix and postfix input elements
Expand All @@ -60,7 +60,7 @@ $input-prefix-font-color-alt: #fff !default;
$input-error-message-padding: rem-calc(6 9 9) !default;
$input-error-message-top: -1px !default;
$input-error-message-font-size: rem-calc(12) !default;
$input-error-message-font-weight: normal !default;
$input-error-message-font-weight: $font-weight-normal !default;
$input-error-message-font-style: italic !default;
$input-error-message-font-color: #fff !default;
$input-error-message-font-color-alt: #333 !default;
Expand Down
6 changes: 5 additions & 1 deletion scss/foundation/components/_global.scss
Expand Up @@ -164,11 +164,15 @@ $base-line-height: 150% !default;
clip: auto;
}

// We use these to define default font weights
$font-weight-normal: normal !default;
$font-weight-bold: bold !default;

// We use these to control various global styles
$body-bg: #fff !default;
$body-font-color: #222 !default;
$body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
$body-font-weight: normal !default;
$body-font-weight: $font-weight-normal !default;
$body-font-style: normal !default;

// We use this to control font-smoothing
Expand Down
6 changes: 3 additions & 3 deletions scss/foundation/components/_joyride.scss
Expand Up @@ -20,7 +20,7 @@ $joyride-tip-position-offset: 22px !default;
// Here, we're setting the tip font styles
$joyride-tip-font-color: #fff !default;
$joyride-tip-font-size: rem-calc(14) !default;
$joyride-tip-header-weight: bold !default;
$joyride-tip-header-weight: $font-weight-bold !default;

// This changes the nub size
$joyride-tip-nub-size: 10px !default;
Expand All @@ -33,7 +33,7 @@ $joyride-tip-timer-color: #666 !default;
// This changes up the styles for the close button
$joyride-tip-close-color: #777 !default;
$joyride-tip-close-size: 24px !default;
$joyride-tip-close-weight: normal !default;
$joyride-tip-close-weight: $font-weight-normal !default;

// When Joyride is filling the screen, we use this style for the bg
$joyride-screenfill: rgba(0,0,0,0.5) !default;
Expand All @@ -57,7 +57,7 @@ $joyride-screenfill: rgba(0,0,0,0.5) !default;
top: 0;
#{$default-float}: 2.5%;
font-family: inherit;
font-weight: normal;
font-weight: $font-weight-normal;
width: 95%;
}

Expand Down
2 changes: 1 addition & 1 deletion scss/foundation/components/_labels.scss
Expand Up @@ -15,7 +15,7 @@ $label-radius: $global-radius !default;

// We use these to style the label text
$label-font-sizing: rem-calc(11) !default;
$label-font-weight: normal !default;
$label-font-weight: $font-weight-normal !default;
$label-font-color: #333 !default;
$label-font-color-alt: #fff !default;
$label-font-family: $body-font-family !default;
Expand Down
4 changes: 2 additions & 2 deletions scss/foundation/components/_offcanvas.scss
Expand Up @@ -22,7 +22,7 @@ $tabbar-right-section-border: $tabbar-left-section-border;

// Off Canvas Tab Bar Headers
$tabbar-header-color: #fff !default;
$tabbar-header-weight: bold !default;
$tabbar-header-weight: $font-weight-bold !default;
$tabbar-header-line-height: $tabbar-height !default;
$tabbar-header-margin: 0 !default;

Expand All @@ -34,7 +34,7 @@ $off-canvas-bg: #333 !default;
$off-canvas-label-padding: 0.3rem rem-calc(15) !default;
$off-canvas-label-color: #999 !default;
$off-canvas-label-text-transform: uppercase !default;
$off-canvas-label-font-weight: bold !default;
$off-canvas-label-font-weight: $font-weight-bold !default;
$off-canvas-label-bg: #444 !default;
$off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%) !default;
$off-canvas-label-border-bottom: none !default;
Expand Down
2 changes: 1 addition & 1 deletion scss/foundation/components/_orbit.scss
Expand Up @@ -217,7 +217,7 @@ $orbit-timer-hide-for-small: true !default;
top: 10px;
#{$default-float}: 10px;
font-size: 12px;
span { font-weight: 700; padding: $orbit-slide-number-padding;}
span { font-weight: $font-weight-bold; padding: $orbit-slide-number-padding;}
color: $orbit-slide-number-font-color;
background: $orbit-slide-number-bg;
z-index: 10;
Expand Down
2 changes: 1 addition & 1 deletion scss/foundation/components/_pagination.scss
Expand Up @@ -33,7 +33,7 @@ $pagination-link-unavailable-bg-active: transparent !default;
// We use these for currently selected anchor links
$pagination-link-current-background: $primary-color !default;
$pagination-link-current-font-color: #fff !default;
$pagination-link-current-font-weight: bold !default;
$pagination-link-current-font-weight: $font-weight-bold !default;
$pagination-link-current-cursor: default !default;
$pagination-link-current-active-bg: $primary-color !default;

Expand Down
10 changes: 5 additions & 5 deletions scss/foundation/components/_pricing-tables.scss
Expand Up @@ -20,7 +20,7 @@ $price-title-bg: #333 !default;
$price-title-padding: rem-calc(15 20) !default;
$price-title-align: center !default;
$price-title-color: #eee !default;
$price-title-weight: normal !default;
$price-title-weight: $font-weight-normal !default;
$price-title-size: rem-calc(16) !default;
$price-title-font-family: $body-font-family !default;

Expand All @@ -29,7 +29,7 @@ $price-money-bg: #f6f6f6 !default;
$price-money-padding: rem-calc(15 20) !default;
$price-money-align: center !default;
$price-money-color: #333 !default;
$price-money-weight: normal !default;
$price-money-weight: $font-weight-normal !default;
$price-money-size: rem-calc(32) !default;
$price-money-font-family: $body-font-family !default;

Expand All @@ -40,7 +40,7 @@ $price-desc-color: #777 !default;
$price-desc-padding: rem-calc(15) !default;
$price-desc-align: center !default;
$price-desc-font-size: rem-calc(12) !default;
$price-desc-weight: normal !default;
$price-desc-weight: $font-weight-normal !default;
$price-desc-line-height: 1.4 !default;
$price-desc-bottom-border: dotted 1px #ddd !default;

Expand All @@ -49,7 +49,7 @@ $price-item-color: #333 !default;
$price-item-padding: rem-calc(15) !default;
$price-item-align: center !default;
$price-item-font-size: rem-calc(14) !default;
$price-item-weight: normal !default;
$price-item-weight: $font-weight-normal !default;
$price-item-bottom-border: dotted 1px #ddd !default;

// We use these to control the CTA area styles
Expand Down Expand Up @@ -147,4 +147,4 @@ $price-cta-padding: rem-calc(20 20 0) !default;
}

}
}
}
4 changes: 2 additions & 2 deletions scss/foundation/components/_reveal.scss
Expand Up @@ -27,7 +27,7 @@ $reveal-close-font-size: rem-calc(40) !default;
$reveal-close-top: rem-calc(8) !default;
$reveal-close-side: rem-calc(11) !default;
$reveal-close-color: #aaa !default;
$reveal-close-weight: bold !default;
$reveal-close-weight: $font-weight-bold !default;

// We use this to set the default radius used throughout the core.
$reveal-radius: $global-radius !default;
Expand Down Expand Up @@ -213,4 +213,4 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
dialog, .#{$reveal-modal-class} {background: #fff !important;}
}
}
}
}
2 changes: 1 addition & 1 deletion scss/foundation/components/_side-nav.scss
Expand Up @@ -23,7 +23,7 @@ $side-nav-link-color: $primary-color !default;
$side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%) !default;
$side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%) !default;
$side-nav-font-size: rem-calc(14) !default;
$side-nav-font-weight: normal !default;
$side-nav-font-weight: $font-weight-normal !default;
$side-nav-font-weight-active: $side-nav-font-weight !default;
$side-nav-font-family: $body-font-family !default;
$side-nav-font-family-active: $side-nav-font-family !default;
Expand Down
4 changes: 2 additions & 2 deletions scss/foundation/components/_sub-nav.scss
Expand Up @@ -23,7 +23,7 @@ $sub-nav-list-padding-top: rem-calc(4) !default;
$sub-nav-font-family: $body-font-family !default;
$sub-nav-font-size: rem-calc(14) !default;
$sub-nav-font-color: #999 !default;
$sub-nav-font-weight: normal !default;
$sub-nav-font-weight: $font-weight-normal !default;
$sub-nav-text-decoration: none !default;
$sub-nav-padding: rem-calc(3 16) !default;
$sub-nav-border-radius: 3px !default;
Expand All @@ -32,7 +32,7 @@ $sub-nav-font-color-hover: scale-color($sub-nav-font-color, $lightness: -25%) !d

// We use these to control the active item styles

$sub-nav-active-font-weight: normal !default;
$sub-nav-active-font-weight: $font-weight-normal !default;
$sub-nav-active-bg: $primary-color !default;
$sub-nav-active-bg-hover: scale-color($sub-nav-active-bg, $lightness: -14%) !default;
$sub-nav-active-color: #fff !default;
Expand Down
4 changes: 2 additions & 2 deletions scss/foundation/components/_switch.scss
Expand Up @@ -82,7 +82,7 @@ $switch-label-outline: 1px dotted #888 !default;
width: 50%;
height: 100%;
margin: 0;
font-weight: bold;
font-weight: $font-weight-bold;
text-align: $default-float;

// Transition for the switch label to follow paddle
Expand Down Expand Up @@ -291,4 +291,4 @@ $switch-label-outline: 1px dotted #888 !default;

}
}
}
}
4 changes: 2 additions & 2 deletions scss/foundation/components/_tables.scss
Expand Up @@ -28,7 +28,7 @@ $table-border-color: #ddd !default;
$table-head-bg: #f5f5f5 !default;
$table-head-font-size: rem-calc(14) !default;
$table-head-font-color: #222 !default;
$table-head-font-weight: bold !default;
$table-head-font-weight: $font-weight-bold !default;
$table-head-padding: rem-calc(8 10 10) !default;

// These control the row padding and font styles
Expand Down Expand Up @@ -94,4 +94,4 @@ $table-margin-bottom: rem-calc(20) !default;
@include table;
}
}
}
}
8 changes: 4 additions & 4 deletions scss/foundation/components/_tooltips.scss
Expand Up @@ -10,7 +10,7 @@
$include-html-tooltip-classes: $include-html-classes !default;

$has-tip-border-bottom: dotted 1px #ccc !default;
$has-tip-font-weight: bold !default;
$has-tip-font-weight: $font-weight-bold !default;
$has-tip-font-color: #333 !default;
$has-tip-border-bottom-hover: dotted 1px scale-color($primary-color, $lightness: -55%) !default;
$has-tip-font-color-hover: $primary-color !default;
Expand All @@ -19,11 +19,11 @@ $has-tip-cursor-type: help !default;
$tooltip-padding: rem-calc(12) !default;
$tooltip-bg: #333 !default;
$tooltip-font-size: rem-calc(14) !default;
$tooltip-font-weight: normal !default;
$tooltip-font-weight: $font-weight-normal !default;
$tooltip-font-color: #fff !default;
$tooltip-line-height: 1.3 !default;
$tooltip-close-font-size: rem-calc(10) !default;
$tooltip-close-font-weight: normal !default;
$tooltip-close-font-weight: $font-weight-normal !default;
$tooltip-close-font-color: #777 !default;
$tooltip-font-size-sml: rem-calc(14) !default;
$tooltip-radius: $global-radius !default;
Expand Down Expand Up @@ -137,4 +137,4 @@ $tooltip-pip-size: 5px !default;
}

}
}
}
10 changes: 5 additions & 5 deletions scss/foundation/components/_top-bar.scss
Expand Up @@ -20,14 +20,14 @@ $topbar-height: 45px !default;
$topbar-margin-bottom: 0 !default;

// Controlling the styles for the title in the top bar
$topbar-title-weight: normal !default;
$topbar-title-weight: $font-weight-normal !default;
$topbar-title-font-size: rem-calc(17) !default;

// Style the top bar dropdown elements
$topbar-dropdown-bg: #333 !default;
$topbar-dropdown-link-color: #fff !default;
$topbar-dropdown-link-bg: #333 !default;
$topbar-dropdown-link-weight: normal !default;
$topbar-dropdown-link-weight: $font-weight-normal !default;
$topbar-dropdown-toggle-size: 5px !default;
$topbar-dropdown-toggle-color: #fff !default;
$topbar-dropdown-toggle-alpha: 0.4 !default;
Expand All @@ -37,7 +37,7 @@ $topbar-link-color: #fff !default;
$topbar-link-color-hover: #fff !default;
$topbar-link-color-active: #fff !default;
$topbar-link-color-active-hover: #fff !default;
$topbar-link-weight: normal !default;
$topbar-link-weight: $font-weight-normal !default;
$topbar-link-font-size: rem-calc(13) !default;
$topbar-link-hover-lightness: -10% !default; // Darken by 10%
$topbar-link-bg: $topbar-bg !default;
Expand All @@ -53,14 +53,14 @@ $topbar-button-top: 7px !default;

$topbar-dropdown-label-color: #777 !default;
$topbar-dropdown-label-text-transform: uppercase !default;
$topbar-dropdown-label-font-weight: bold !default;
$topbar-dropdown-label-font-weight: $font-weight-bold !default;
$topbar-dropdown-label-font-size: rem-calc(10) !default;
$topbar-dropdown-label-bg: #333 !default;

// Top menu icon styles
$topbar-menu-link-transform: uppercase !default;
$topbar-menu-link-font-size: rem-calc(13) !default;
$topbar-menu-link-weight: bold !default;
$topbar-menu-link-weight: $font-weight-bold !default;
$topbar-menu-link-color: #fff !default;
$topbar-menu-icon-color: #fff !default;
$topbar-menu-link-color-toggled: #888 !default;
Expand Down

0 comments on commit 8902cde

Please sign in to comment.