Skip to content
This repository has been archived by the owner on Jan 8, 2023. It is now read-only.

Commit

Permalink
Yeti to 3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@esbanarango
esbanarango committed May 24, 2015
1 parent 8c9b81d commit 6734751
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 31 deletions.
7 changes: 6 additions & 1 deletion vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Yeti 3.2.0
// Yeti 3.3.4
// Bootswatch
// -----------------------------------------------------

Expand Down Expand Up @@ -246,6 +246,11 @@ label,
font-weight: normal;
}

input[type="radio"],
input[type="checkbox"] {
margin-top: 1px;
}

// Navs =======================================================================

.nav {
Expand Down
75 changes: 45 additions & 30 deletions vendor/assets/stylesheets/bootswatch/yeti/_variables.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Yeti 3.2.0
// Yeti 3.3.4
// Variables
// --------------------------------------------------

Expand All @@ -7,11 +7,12 @@
//
//## Gray and brand colors for use across Bootstrap.

$gray-base: #000 !default;
$gray-darker: lighten($gray-base, 13.5%) !default; // #222
$gray-dark: lighten($gray-base, 20%) !default; // #333
$gray: #6f6f6f !default; // #555
$gray-darker: lighten(#000, 13.5%) !default; // #222
$gray-dark: lighten(#000, 20%) !default; // #333
$gray-light: lighten(#000, 60%) !default; // #999
$gray-lighter: lighten(#000, 93.5%) !default; // #eee
$gray-light: lighten($gray-base, 60%) !default; // #999
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee

$brand-primary: #008cba !default;
$brand-success: #43ac6a !default;
Expand All @@ -32,7 +33,9 @@ $text-color: $gray-darker !default;
//** Global textual link color.
$link-color: $brand-primary !default;
//** Link hover color set via `darken()` function.
$link-hover-color: darken($link-color, 15%) !default;
$link-hover-color: $link-color !default;
//** Link hover decoration.
$link-hover-decoration: underline !default;


//== Typography
Expand All @@ -57,7 +60,7 @@ $font-size-h5: $font-size-base !default;
$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px

//** Unit-less `line-height` for use in components like buttons.
$line-height-base: 1.428571429 !default; // 20/14
$line-height-base: 1.4 !default;
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px

Expand Down Expand Up @@ -95,7 +98,7 @@ $padding-small-horizontal: 12px !default;
$padding-xs-vertical: 4px !default;
$padding-xs-horizontal: 6px !default;

$line-height-large: 1.33 !default;
$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
$line-height-small: 1.5 !default;

$border-radius-base: 0 !default;
Expand Down Expand Up @@ -142,7 +145,7 @@ $btn-font-weight: normal !default;

$btn-default-color: $gray-dark !default;
$btn-default-bg: #e7e7e7 !default;
$btn-default-border: #dadada !default;
$btn-default-border: #ccc !default;

$btn-primary-color: #fff !default;
$btn-primary-bg: $brand-primary !default;
Expand Down Expand Up @@ -180,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
$input-color: $gray !default;
//** `<input>` border color
$input-border: #ccc !default;
//** `<input>` border radius

// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
//** Default `.form-control` border radius
// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
$input-border-radius: $border-radius-base !default;
//** Large `.form-control` border radius
$input-border-radius-large: $border-radius-large !default;
//** Small `.form-control` border radius
$input-border-radius-small: $border-radius-small !default;

//** Border color for inputs on focus
$input-border-focus: #66afe9 !default;

Expand All @@ -195,6 +206,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
//** Small `.form-control` height
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;

//** `.form-group` margin
$form-group-margin-bottom: 15px !default;

$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;

Expand All @@ -203,6 +217,9 @@ $input-group-addon-bg: $gray-lighter !default;
//** Border color for textual input addons
$input-group-addon-border-color: $input-border !default;

//** Disabled cursor for form controls and buttons.
$cursor-disabled: not-allowed !default;


//== Dropdowns
//
Expand Down Expand Up @@ -314,17 +331,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
//## Define the maximum width of `.container` for different screen sizes.

// Small screen / tablet
$container-tablet: ((720px + $grid-gutter-width)) !default;
$container-tablet: (720px + $grid-gutter-width) !default;
//** For `@screen-sm-min` and up.
$container-sm: $container-tablet !default;

// Medium screen / desktop
$container-desktop: ((940px + $grid-gutter-width)) !default;
$container-desktop: (940px + $grid-gutter-width) !default;
//** For `@screen-md-min` and up.
$container-md: $container-desktop !default;

// Large screen / wide desktop
$container-large-desktop: ((1140px + $grid-gutter-width)) !default;
$container-large-desktop: (1140px + $grid-gutter-width) !default;
//** For `@screen-lg-min` and up.
$container-lg: $container-large-desktop !default;

Expand Down Expand Up @@ -402,18 +419,16 @@ $nav-link-hover-bg: $gray-lighter !default;
$nav-disabled-link-color: $gray-light !default;
$nav-disabled-link-hover-color: $gray-light !default;

$nav-open-link-hover-color: #fff !default;

//== Tabs
$nav-tabs-border-color: #ddd !default;
$nav-tabs-border-color: $table-border-color !default;

$nav-tabs-link-hover-border-color: $gray-lighter !default;

$nav-tabs-active-link-hover-bg: $body-bg !default;
$nav-tabs-active-link-hover-color: $gray !default;
$nav-tabs-active-link-hover-border-color: #ddd !default;
$nav-tabs-active-link-hover-border-color: $table-border-color !default;

$nav-tabs-justified-link-border-color: #ddd !default;
$nav-tabs-justified-link-border-color: $table-border-color !default;
$nav-tabs-justified-active-link-border-color: $body-bg !default;

//== Pills
Expand Down Expand Up @@ -627,6 +642,8 @@ $alert-danger-border: $state-danger-border !default;
$progress-bg: #f5f5f5 !default;
//** Progress bar text color
$progress-bar-color: #fff !default;
//** Variable for setting rounded corners on progress bar.
$progress-border-radius: $border-radius-base !default;

//** Default progress bar color
$progress-bar-bg: $brand-primary !default;
Expand All @@ -647,7 +664,7 @@ $progress-bar-info-bg: $brand-info !default;
//** Background color on `.list-group-item`
$list-group-bg: #fff !default;
//** `.list-group-item` border color
$list-group-border: #ddd !default;
$list-group-border: $table-border-color !default;
//** List group border radius
$list-group-border-radius: $border-radius-base !default;

Expand Down Expand Up @@ -685,11 +702,11 @@ $panel-footer-padding: $panel-heading-padding !default;
$panel-border-radius: $border-radius-base !default;

//** Border color for elements within panels
$panel-inner-border: #ddd !default;
$panel-inner-border: $table-border-color !default;
$panel-footer-bg: #f5f5f5 !default;

$panel-default-text: $gray-dark !default;
$panel-default-border: #ddd !default;
$panel-default-border: $table-border-color !default;
$panel-default-heading-bg: #f5f5f5 !default;

$panel-primary-text: #fff !default;
Expand Down Expand Up @@ -722,7 +739,7 @@ $thumbnail-padding: 4px !default;
//** Thumbnail background color
$thumbnail-bg: $body-bg !default;
//** Thumbnail border color
$thumbnail-border: #ddd !default;
$thumbnail-border: $table-border-color !default;
//** Thumbnail border radius
$thumbnail-border-radius: $border-radius-base !default;

Expand All @@ -744,10 +761,10 @@ $well-border: darken($well-bg, 7%) !default;
//
//##

$badge-color: #777 !default;
$badge-color: #fff !default;
//** Linked badge text color on hover
$badge-link-hover-color: #fff !default;
$badge-bg: $btn-default-bg !default;
$badge-bg: $btn-primary-bg !default;

//** Badge text color in active nav link
$badge-active-color: $link-color !default;
Expand Down Expand Up @@ -833,13 +850,11 @@ $headings-small-color: $gray-light !default;
$blockquote-small-color: $gray !default;
//** Blockquote font size
$blockquote-font-size: ($font-size-base * 1.25) !default;
//** Horizontal line color.
$hr-border: #ddd !default;
//** Blockquote border color
$blockquote-border-color: $hr-border !default;
$blockquote-border-color: $table-border-color !default;
//** Page header border color
$page-header-border-color: $hr-border !default;
$page-header-border-color: $table-border-color !default;
//** Width of horizontal description list titles
$dl-horizontal-offset: $component-offset-horizontal !default;


//** Horizontal line color.
$hr-border: $table-border-color !default;

0 comments on commit 6734751

Please sign in to comment.