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

Commit

Permalink
Sandstone 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 b67b2af commit efab891
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 28 deletions.
23 changes: 11 additions & 12 deletions vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Sandstone 3.2.0
// Sandstone 3.3.4
// Bootswatch
// -----------------------------------------------------

Expand Down Expand Up @@ -68,10 +68,6 @@ input,
}
}

.input-sm {
padding: 15px 10px;
}

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

.nav {
Expand Down Expand Up @@ -182,13 +178,16 @@ input,

.panel {
@include box-shadow(none);
}

.panel-heading,
.panel-title,
.panel-footer {
@include sandstone();
color: #fff;
.panel-heading,
.panel-title {
@include sandstone();
color: #fff;
}

.panel-footer {
@include sandstone();
}
}

.panel-default {
Expand All @@ -197,4 +196,4 @@ input,
.panel-footer {
color: $gray;
}
}
}
48 changes: 32 additions & 16 deletions vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Sandstone 3.2.0
// Sandstone 3.3.4
// Variables
// --------------------------------------------------

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

$gray: #98978B !default;
$gray-base: #000 !default;
$gray-darker: #3E3F3A !default;
$gray-dark: #8E8C84 !default;
$gray: #98978B !default;
$gray-light: #DFD7CA !default;
$gray-lighter: #F8F5F0 !default;

Expand All @@ -33,6 +34,8 @@ $text-color: #3E3F3A !default;
$link-color: $brand-success !default;
//** Link hover color set via `darken()` function.
$link-hover-color: darken($link-color, 10%) !default;
//** Link hover decoration.
$link-hover-decoration: underline !default;


//== Typography
Expand Down Expand Up @@ -67,9 +70,6 @@ $headings-font-weight: 400 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;

$navbar-default-color: $gray-dark !default;
$navbar-default-bg: $gray-darker !default;
$navbar-default-border: $gray-darker !default;

//== Iconography
//
Expand Down Expand Up @@ -98,7 +98,7 @@ $padding-small-horizontal: 10px !default;
$padding-xs-vertical: 1px !default;
$padding-xs-horizontal: 5px !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: 4px !default;
Expand Down Expand Up @@ -144,7 +144,7 @@ $table-border-color: $gray-light !default;
$btn-font-weight: normal !default;

$btn-default-color: #fff !default;
$btn-default-bg: $navbar-default-bg !default;
$btn-default-bg: $gray-darker !default;
$btn-default-border: hsla(0, 100%, 100%, 0) !default;

$btn-primary-color: #fff !default;
Expand Down Expand Up @@ -183,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
$input-color: $text-color !default;
//** `<input>` border color
$input-border: $gray-light !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: hsla(0, 100%, 100%, 0) !default;

Expand All @@ -198,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: $headings-color !default;
$legend-border-color: transparent !default;

Expand All @@ -206,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 @@ -317,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 All @@ -344,6 +358,10 @@ $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
$navbar-collapse-max-height: 340px !default;

$navbar-default-color: $gray-dark !default;
$navbar-default-bg: $gray-darker !default;
$navbar-default-border: $gray-darker !default;

// Navbar links
$navbar-default-link-color: $gray !default;
$navbar-default-link-hover-color: #fff !default;
Expand Down Expand Up @@ -401,8 +419,6 @@ $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: $gray-light !default;

Expand Down Expand Up @@ -527,7 +543,7 @@ $popover-title-bg: $gray-lighter !default;
//** Popover arrow width
$popover-arrow-width: 10px !default;
//** Popover arrow color
$popover-arrow-color: #fff !default;
$popover-arrow-color: $popover-bg !default;

//** Popover outer arrow width
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
Expand Down Expand Up @@ -626,6 +642,8 @@ $alert-danger-border: hsla(0, 100%, 100%, 0) !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 Down Expand Up @@ -840,5 +858,3 @@ $page-header-border-color: $gray-lighter !default;
$dl-horizontal-offset: $component-offset-horizontal !default;
//** Horizontal line color.
$hr-border: $gray-lighter !default;


0 comments on commit efab891

Please sign in to comment.