diff options
| author | Jan Stevens <jan@playpass.be> | 2015-08-19 22:35:58 +0300 |
|---|---|---|
| committer | Jan Stevens <jan@playpass.be> | 2015-08-19 22:35:58 +0300 |
| commit | 4e41a47ea5f6ba70248eacab3967838f3fead06e (patch) | |
| tree | c2228f0f2a12e7bb39b06f3037b52058db0457bf /templates | |
| parent | 1f3b67a1018d144485ec323d6efd0adea45f1a49 (diff) | |
Updated the templates
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/project/_bootstrap-variables.sass | 818 | ||||
| -rw-r--r-- | templates/project/manifest.rb | 4 | ||||
| -rw-r--r-- | templates/project/styles.sass | 8 |
3 files changed, 290 insertions, 540 deletions
diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 6c6ec85..4ad488a 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -1,274 +1,325 @@ -// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5): +// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5.1): // -// Variables -// -------------------------------------------------- +// Copy settings from this file into the provided `_custom.scss` to override +// the Bootstrap defaults without modifying key, versioned files. -//== Colors +// Table of ontents // -//## Gray and brand colors for use across Bootstrap. +// Colors +// Options +// Spacing +// Body +// Links +// Grid breakpoints +// Grid containers +// Grid columns +// Fonts +// Components -// $gray-base: #000 -// $gray-darker: lighten($gray-base, 13.5%) // #222 -// $gray-dark: lighten($gray-base, 20%) // #333 -// $gray: lighten($gray-base, 33.5%) // #555 -// $gray-light: lighten($gray-base, 46.7%) // #777 -// $gray-lighter: lighten($gray-base, 93.5%) // #eee +// General variable structure +// +// Variable format should follow the `$component-modifier-state-property` order. + + +// Colors +// +// Grayscale and brand colors for use across Bootstrap. + +// $gray-dark: #373a3c +// $gray: #55595c +// $gray-light: #818a91 +// $gray-lighter: #eceeef +// $gray-lightest: #f7f7f9 + +// $brand-primary: #0275d8 +// $brand-success: #5cb85c +// $brand-info: #5bc0de +// $brand-warning: #f0ad4e +// $brand-danger: #d9534f + + +// Options +// +// Quickly modify global styling by enabling or disabling optional features. + +// $enable-flex: false +// $enable-rounded: true +// $enable-shadows: false +// $enable-gradients: false +// $enable-transitions: false +// $enable-hover-media-query: false + + +// Spacing +// +// Control the default styling of most Bootstrap elements by modifying these +// variables. Mostly focused on spacing. -// $brand-primary: darken(#428bca, 6.5%) // #337ab7 -// $brand-success: #5cb85c -// $brand-info: #5bc0de -// $brand-warning: #f0ad4e -// $brand-danger: #d9534f +// $spacer: 1rem +// $spacer-x: $spacer +// $spacer-y: $spacer +// $border-width: .0625rem -//== Scaffolding +// Body // -//## Settings for some of the most global styles. +// Settings for the `<body>` element. -//** Background color for `<body>`. -// $body-bg: #fff -//** Global text color on `<body>`. -// $text-color: $gray-dark +// $body-bg: #fff +// $body-color: $gray-dark -//** Global textual link color. -// $link-color: $brand-primary -//** Link hover color set via `darken()` function. -// $link-hover-color: darken($link-color, 15%) -//** Link hover decoration. -// $link-hover-decoration: underline +// Links +// +// Style anchor elements. + +// $link-color: $brand-primary +// $link-hover-color: darken($link-color, 15%) +// $link-hover-decoration: underline -//== Typography + +// Grid breakpoints // -//## Font, line-height, and color for body text, headings, and more. - -// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif -// $font-family-serif: Georgia, "Times New Roman", Times, serif -//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. -// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace -// $font-family-base: $font-family-sans-serif - -// $font-size-base: 14px -// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px -// $font-size-small: ceil(($font-size-base * 0.85)) // ~12px - -// $font-size-h1: floor(($font-size-base * 2.6)) // ~36px -// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px -// $font-size-h3: ceil(($font-size-base * 1.7)) // ~24px -// $font-size-h4: ceil(($font-size-base * 1.25)) // ~18px -// $font-size-h5: $font-size-base -// $font-size-h6: ceil(($font-size-base * 0.85)) // ~12px - -//** Unit-less `line-height` for use in components like buttons. -// $line-height-base: 1.428571429 // 20/14 -//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. -// $line-height-computed: floor(($font-size-base * $line-height-base)) // ~20px - -//** By default, this inherits from the `<body>`. -// $headings-font-family: inherit -// $headings-font-weight: 500 -// $headings-line-height: 1.1 -// $headings-color: inherit - - -//== Iconography +// Define the minimum and maximum dimensions at which your layout will change, +// adapting to different screen sizes, for use in media queries. + +// $grid-breakpoints: ( + // Extra small screen / phone + xs: 0, + // Small screen / phone + sm: 34em, + // Medium screen / tablet + md: 48em, + // Large screen / desktop + lg: 62em, + // Extra large screen / wide desktop + xl: 75em +) + + +// Grid containers // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +// Define the maximum width of `.container` for different screen sizes. -//** Load fonts from this directory. +// $container-max-widths: ( + sm: 34rem, // 480 + md: 45rem, // 720 + lg: 60rem, // 960 + xl: 72.25rem // 1140 +) -// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path. -// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths. -// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") -//** File name for all font files. -// $icon-font-name: "glyphicons-halflings-regular" -//** Element ID within SVG icon file. -// $icon-font-svg-id: "glyphicons_halflingsregular" +// Grid columns +// +// Set the number of columns and specify the width of the gutters. +// $grid-columns: 12 +// $grid-gutter-width: 1.875rem // 30px -//== Components + +// Typography // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +// Font, line-height, and color for body text, headings, and more. + +// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif +// $font-family-serif: Georgia, "Times New Roman", Times, serif +// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace +// $font-family-base: $font-family-sans-serif + +// Pixel value used to responsively scale all typography. Applied to the `<html>` element. +// $font-size-root: 16px + +// $font-size-base: 1rem +// $font-size-lg: 1.25rem +// $font-size-sm: .85rem +// $font-size-xs: .75rem + +// $font-size-h1: 2.5rem +// $font-size-h2: 2rem +// $font-size-h3: 1.75rem +// $font-size-h4: 1.5rem +// $font-size-h5: 1.25rem +// $font-size-h6: 1rem + +// $display1-size: 3.5rem +// $display2-size: 4.5rem +// $display3-size: 5.5rem +// $display4-size: 6rem -// $padding-base-vertical: 6px -// $padding-base-horizontal: 12px +// $display1-weight: 300 +// $display2-weight: 300 +// $display3-weight: 300 +// $display4-weight: 300 -// $padding-large-vertical: 10px -// $padding-large-horizontal: 16px +// $line-height: 1.5 -// $padding-small-vertical: 5px -// $padding-small-horizontal: 10px +// $headings-margin-bottom: ($spacer / 2) +// $headings-font-family: inherit +// $headings-font-weight: 500 +// $headings-line-height: 1.1 +// $headings-color: inherit -// $padding-xs-vertical: 1px -// $padding-xs-horizontal: 5px +// $lead-font-size: 1.25rem +// $lead-font-weight: 300 -// $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome -// $line-height-small: 1.5 +// $text-muted: $gray-light -// $border-radius-base: 4px -// $border-radius-large: 6px -// $border-radius-small: 3px +// $abbr-border-color: $gray-light -//** Global color for active items (e.g., navs or dropdowns). -// $component-active-color: #fff -//** Global background color for active items (e.g., navs or dropdowns). -// $component-active-bg: $brand-primary +// $blockquote-small-color: $gray-light +// $blockquote-font-size: ($font-size-base * 1.25) +// $blockquote-border-color: $gray-lighter -//** Width of the `border` for generating carets that indicator dropdowns. -// $caret-width-base: 4px -//** Carets increase slightly in size for larger components. -// $caret-width-large: 5px +// $hr-border-color: rgba(0,0,0,.1) +// $hr-border-width: $border-width; -//== Tables +// Components // -//## Customizes the `.table` component with basic values, each used across all table variations. +// Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). + +// $line-height-lg: (4/3) +// $line-height-sm: 1.5 + +// $border-radius: .25rem +// $border-radius-lg: .3rem +// $border-radius-sm: .2rem -//** Padding for `<th>`s and `<td>`s. -// $table-cell-padding: 8px -//** Padding for cells in `.table-condensed`. -// $table-condensed-cell-padding: 5px +// $component-active-color: #fff +// $component-active-bg: $brand-primary + +// $caret-width: .3em +// $caret-width-lg: $caret-width + + +// Tables +// +// Customizes the `.table` component with basic values, each used across all table variations. + +// $table-cell-padding: .75rem +// $table-sm-cell-padding: .3rem -//** Default background color used for all tables. // $table-bg: transparent -//** Background color used for `.table-striped`. // $table-bg-accent: #f9f9f9 -//** Background color used for `.table-hover`. // $table-bg-hover: #f5f5f5 // $table-bg-active: $table-bg-hover -//** Border color for table and cell borders. -// $table-border-color: #ddd +// $table-border-color: $gray-lighter -//== Buttons +// Buttons // -//## For each of Bootstrap's buttons, define text, background and border color. +// For each of Bootstrap's buttons, define text, background and border color. +// $btn-padding-x: 1rem; +// $btn-padding-y: .375rem; // $btn-font-weight: normal -// $btn-default-color: #333 -// $btn-default-bg: #fff -// $btn-default-border: #ccc - // $btn-primary-color: #fff // $btn-primary-bg: $brand-primary -// $btn-primary-border: darken($btn-primary-bg, 5%) +// $btn-primary-border: $btn-primary-bg -// $btn-success-color: #fff -// $btn-success-bg: $brand-success -// $btn-success-border: darken($btn-success-bg, 5%) +// $btn-secondary-color: $gray-dark +// $btn-secondary-bg: #fff +// $btn-secondary-border: #ccc // $btn-info-color: #fff // $btn-info-bg: $brand-info -// $btn-info-border: darken($btn-info-bg, 5%) +// $btn-info-border: $btn-info-bg + +// $btn-success-color: #fff +// $btn-success-bg: $brand-success +// $btn-success-border: $btn-success-bg // $btn-warning-color: #fff // $btn-warning-bg: $brand-warning -// $btn-warning-border: darken($btn-warning-bg, 5%) +// $btn-warning-border: $btn-warning-bg // $btn-danger-color: #fff // $btn-danger-bg: $brand-danger -// $btn-danger-border: darken($btn-danger-bg, 5%) +// $btn-danger-border: $btn-danger-bg // $btn-link-disabled-color: $gray-light +// $btn-padding-x-sm: .75rem +// $btn-padding-y-sm: .25rem + +// $btn-padding-x-lg: 1.25rem +// $btn-padding-y-lg: .75rem + // Allows for customizing button radius independently from global border radius -// $btn-border-radius-base: $border-radius-base -// $btn-border-radius-large: $border-radius-large -// $btn-border-radius-small: $border-radius-small +// $btn-border-radius: $border-radius; +// $btn-border-radius-lg: $border-radius-lg; +// $btn-border-radius-sm: $border-radius-sm; -//== Forms -// -//## +// Forms + +// $input-padding-x: .75rem +// $input-padding-y: .375rem -//** `<input>` background color // $input-bg: #fff -//** `<input disabled>` background color // $input-bg-disabled: $gray-lighter -//** Text color for `<input>`s // $input-color: $gray -//** `<input>` border color // $input-border: #ccc +// $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) -// 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 -//** Large `.form-control` border radius -// $input-border-radius-large: $border-radius-large -//** Small `.form-control` border radius -// $input-border-radius-small: $border-radius-small +// $input-border-radius: $border-radius +// $input-border-radius-lg: $border-radius-lg +// $input-border-radius-sm: $border-radius-sm -//** Border color for inputs on focus // $input-border-focus: #66afe9 +// $input-box-shadow-focus: rgba(102,175,233,.6) -//** Placeholder text color // $input-color-placeholder: #999 -//** Default `.form-control` height -// $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) -//** Large `.form-control` height -// $input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) -//** Small `.form-control` height -// $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) +// $input-padding-x-sm: .75rem +// $input-padding-y-sm: .275rem + +// $input-padding-x-lg: 1.25rem +// $input-padding-y-lg: .75rem -//** `.form-group` margin -// $form-group-margin-bottom: 15px +// $input-height: (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) +// $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) +// $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) -// $legend-color: $gray-dark -// $legend-border-color: #e5e5e5 +// $form-group-margin-bottom: 15px; -//** Background color for textual input addons // $input-group-addon-bg: $gray-lighter -//** Border color for textual input addons // $input-group-addon-border-color: $input-border -//** Disabled cursor for form controls and buttons. // $cursor-disabled: not-allowed +// Form validation icons +// $form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg=="; +// $form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg=="; +// $form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4="; -//== Dropdowns + +// Dropdowns // -//## Dropdown menu container and contents. +// Dropdown menu container and contents. -//** Background for the dropdown menu. // $dropdown-bg: #fff -//** Dropdown menu `border-color`. // $dropdown-border: rgba(0,0,0,.15) -//** Dropdown menu `border-color` **for IE8**. -// $dropdown-fallback-border: #ccc -//** Divider color for between dropdown items. // $dropdown-divider-bg: #e5e5e5 -//** Dropdown link text color. // $dropdown-link-color: $gray-dark -//** Hover color for dropdown links. // $dropdown-link-hover-color: darken($gray-dark, 5%) -//** Hover background for dropdown links. // $dropdown-link-hover-bg: #f5f5f5 -//** Active dropdown menu item text color. // $dropdown-link-active-color: $component-active-color -//** Active dropdown menu item background color. // $dropdown-link-active-bg: $component-active-bg -//** Disabled dropdown menu item background color. // $dropdown-link-disabled-color: $gray-light -//** Text color for headers within dropdown menus. // $dropdown-header-color: $gray-light -//** Deprecated `$dropdown-caret-color` as of v3.1.0 -// $dropdown-caret-color: #000 - -//-- Z-index master list +// Z-index master list // // Warning: Avoid customizing these values. They're used for a bird's eye view // of components dependent on the z-axis and are designed to all work together. @@ -280,158 +331,36 @@ // $zindex-popover: 1060 // $zindex-tooltip: 1070 // $zindex-navbar-fixed: 1030 -// $zindex-modal-background: 1040 +// $zindex-navbar-sticky: 1030 +// $zindex-modal-bg: 1040 // $zindex-modal: 1050 -//== Media queries breakpoints -// -//## Define the breakpoints at which your layout will change, adapting to different screen sizes. - -// Extra small screen / phone -//** Deprecated `$screen-xs` as of v3.0.1 -// $screen-xs: 480px -//** Deprecated `$screen-xs-min` as of v3.2.0 -// $screen-xs-min: $screen-xs -//** Deprecated `$screen-phone` as of v3.0.1 -// $screen-phone: $screen-xs-min - -// Small screen / tablet -//** Deprecated `$screen-sm` as of v3.0.1 -// $screen-sm: 768px -// $screen-sm-min: $screen-sm -//** Deprecated `$screen-tablet` as of v3.0.1 -// $screen-tablet: $screen-sm-min - -// Medium screen / desktop -//** Deprecated `$screen-md` as of v3.0.1 -// $screen-md: 992px -// $screen-md-min: $screen-md -//** Deprecated `$screen-desktop` as of v3.0.1 -// $screen-desktop: $screen-md-min - -// Large screen / wide desktop -//** Deprecated `$screen-lg` as of v3.0.1 -// $screen-lg: 1200px -// $screen-lg-min: $screen-lg -//** Deprecated `$screen-lg-desktop` as of v3.0.1 -// $screen-lg-desktop: $screen-lg-min - -// So media queries don't overlap when required, provide a maximum -// $screen-xs-max: ($screen-sm-min - 1) -// $screen-sm-max: ($screen-md-min - 1) -// $screen-md-max: ($screen-lg-min - 1) - - -//== Grid system -// -//## Define your custom responsive grid. - -//** Number of columns in the grid. -// $grid-columns: 12 -//** Padding between columns. Gets divided in half for the left and right. -// $grid-gutter-width: 30px -// Navbar collapse -//** Point at which the navbar becomes uncollapsed. -// $grid-float-breakpoint: $screen-sm-min -//** Point at which the navbar begins collapsing. -// $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) +// Navbar +// $navbar-border-radius: $border-radius +// $navbar-padding-horizontal: $spacer +// $navbar-padding-vertical: ($spacer / 2) -//== Container sizes -// -//## Define the maximum width of `.container` for different screen sizes. - -// Small screen / tablet -// $container-tablet: (720px + $grid-gutter-width) -//** For `$screen-sm-min` and up. -// $container-sm: $container-tablet +// $navbar-dark-color: rgba(255,255,255,.5); +// $navbar-dark-hover-color: rgba(255,255,255,.75); +// $navbar-dark-active-color: rgba(255,255,255,1); +// $navbar-dark-disabled-color: rgba(255,255,255,.25); -// Medium screen / desktop -// $container-desktop: (940px + $grid-gutter-width) -//** For `$screen-md-min` and up. -// $container-md: $container-desktop +// $navbar-light-color: rgba(0,0,0,.3); +// $navbar-light-hover-color: rgba(0,0,0,.6); +// $navbar-light-active-color: rgba(0,0,0,.8); +// $navbar-light-disabled-color: rgba(0,0,0,.15); -// Large screen / wide desktop -// $container-large-desktop: (1140px + $grid-gutter-width) -//** For `$screen-lg-min` and up. -// $container-lg: $container-large-desktop +// Navs -//== Navbar -// -//## - -// Basics of a navbar -// $navbar-height: 50px -// $navbar-margin-bottom: $line-height-computed -// $navbar-border-radius: $border-radius-base -// $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) -// $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) -// $navbar-collapse-max-height: 340px - -// $navbar-default-color: #777 -// $navbar-default-bg: #f8f8f8 -// $navbar-default-border: darken($navbar-default-bg, 6.5%) - -// Navbar links -// $navbar-default-link-color: #777 -// $navbar-default-link-hover-color: #333 -// $navbar-default-link-hover-bg: transparent -// $navbar-default-link-active-color: #555 -// $navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) -// $navbar-default-link-disabled-color: #ccc -// $navbar-default-link-disabled-bg: transparent - -// Navbar brand label -// $navbar-default-brand-color: $navbar-default-link-color -// $navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) -// $navbar-default-brand-hover-bg: transparent - -// Navbar toggle -// $navbar-default-toggle-hover-bg: #ddd -// $navbar-default-toggle-icon-bar-bg: #888 -// $navbar-default-toggle-border-color: #ddd - - -//=== Inverted navbar -// Reset inverted navbar basics -// $navbar-inverse-color: lighten($gray-light, 15%) -// $navbar-inverse-bg: #222 -// $navbar-inverse-border: darken($navbar-inverse-bg, 10%) - -// Inverted navbar links -// $navbar-inverse-link-color: lighten($gray-light, 15%) -// $navbar-inverse-link-hover-color: #fff -// $navbar-inverse-link-hover-bg: transparent -// $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color -// $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) -// $navbar-inverse-link-disabled-color: #444 -// $navbar-inverse-link-disabled-bg: transparent - -// Inverted navbar brand label -// $navbar-inverse-brand-color: $navbar-inverse-link-color -// $navbar-inverse-brand-hover-color: #fff -// $navbar-inverse-brand-hover-bg: transparent - -// Inverted navbar toggle -// $navbar-inverse-toggle-hover-bg: #333 -// $navbar-inverse-toggle-icon-bar-bg: #fff -// $navbar-inverse-toggle-border-color: #333 - - -//== Navs -// -//## - -//=== Shared nav styles -// $nav-link-padding: 10px 15px +// $nav-link-padding: .5em 1em // $nav-link-hover-bg: $gray-lighter // $nav-disabled-link-color: $gray-light // $nav-disabled-link-hover-color: $gray-light -//== Tabs // $nav-tabs-border-color: #ddd // $nav-tabs-link-hover-border-color: $gray-lighter @@ -443,15 +372,20 @@ // $nav-tabs-justified-link-border-color: #ddd // $nav-tabs-justified-active-link-border-color: $body-bg -//== Pills -// $nav-pills-border-radius: $border-radius-base +// $nav-pills-border-radius: $border-radius // $nav-pills-active-link-hover-bg: $component-active-bg // $nav-pills-active-link-hover-color: $component-active-color -//== Pagination -// -//## +// Pagination + +// $pagination-padding-x: .75rem +// $pagination-padding-y: .5rem +// $pagination-padding-x-sm: .75rem +// $pagination-padding-y-sm: .275rem +// $pagination-padding-x-lg: 1.5rem +// $pagination-padding-y-lg: .75rem + // $pagination-color: $link-color // $pagination-bg: #fff @@ -470,9 +404,7 @@ // $pagination-disabled-border: #ddd -//== Pager -// -//## +// Pager // $pager-bg: $pagination-bg // $pager-border: $pagination-border @@ -486,135 +418,88 @@ // $pager-disabled-color: $pagination-disabled-color -//== Jumbotron -// -//## +// Jumbotron -// $jumbotron-padding: 30px -// $jumbotron-color: inherit +// $jumbotron-padding: 2rem // $jumbotron-bg: $gray-lighter -// $jumbotron-heading-color: inherit -// $jumbotron-font-size: ceil(($font-size-base * 1.5)) -// $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) -//== Form states and alerts +// Form states and alerts // -//## Define colors for form feedback states and, by default, alerts. +// Define colors for form feedback states and, by default, alerts. // $state-success-text: #3c763d // $state-success-bg: #dff0d8 -// $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) +// $state-success-border: darken($state-success-bg, 5%) // $state-info-text: #31708f // $state-info-bg: #d9edf7 -// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) +// $state-info-border: darken($state-info-bg, 7%) // $state-warning-text: #8a6d3b // $state-warning-bg: #fcf8e3 -// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) +// $state-warning-border: darken($state-warning-bg, 5%) // $state-danger-text: #a94442 // $state-danger-bg: #f2dede -// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) +// $state-danger-border: darken($state-danger-bg, 5%) -//== Tooltips -// -//## +// Tooltips -//** Tooltip max width // $tooltip-max-width: 200px -//** Tooltip text color // $tooltip-color: #fff -//** Tooltip background color // $tooltip-bg: #000 // $tooltip-opacity: .9 -//** Tooltip arrow width // $tooltip-arrow-width: 5px -//** Tooltip arrow color // $tooltip-arrow-color: $tooltip-bg -//== Popovers -// -//## +// Popovers -//** Popover body background color // $popover-bg: #fff -//** Popover maximum width // $popover-max-width: 276px -//** Popover border color // $popover-border-color: rgba(0,0,0,.2) -//** Popover fallback border color // $popover-fallback-border-color: #ccc -//** Popover title background color // $popover-title-bg: darken($popover-bg, 3%) -//** Popover arrow width // $popover-arrow-width: 10px -//** Popover arrow color // $popover-arrow-color: $popover-bg -//** Popover outer arrow width // $popover-arrow-outer-width: ($popover-arrow-width + 1) -//** Popover outer arrow color -// $popover-arrow-outer-color: fade_in($popover-border-color, 0.05) -//** Popover outer arrow fallback color +// $popover-arrow-outer-color: fade-in($popover-border-color, 0.05) // $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) -//== Labels -// -//## +// Labels -//** Default label background color // $label-default-bg: $gray-light -//** Primary label background color // $label-primary-bg: $brand-primary -//** Success label background color // $label-success-bg: $brand-success -//** Info label background color // $label-info-bg: $brand-info -//** Warning label background color // $label-warning-bg: $brand-warning -//** Danger label background color // $label-danger-bg: $brand-danger -//** Default label text color // $label-color: #fff -//** Default text color of a linked label // $label-link-hover-color: #fff -//== Modals -// -//## +// Modals -//** Padding applied to the modal body +// Padding applied to the modal body // $modal-inner-padding: 15px -//** Padding applied to the modal title // $modal-title-padding: 15px -//** Modal title line-height -// $modal-title-line-height: $line-height-base +// $modal-title-line-height: $line-height -//** Background color of modal content area // $modal-content-bg: #fff -//** Modal content border color // $modal-content-border-color: rgba(0,0,0,.2) -//** Modal content border color **for IE8** -// $modal-content-fallback-border-color: #999 -//** Modal backdrop background color // $modal-backdrop-bg: #000 -//** Modal backdrop opacity // $modal-backdrop-opacity: .5 -//** Modal header border color // $modal-header-border-color: #e5e5e5 -//** Modal footer border color // $modal-footer-border-color: $modal-header-border-color // $modal-lg: 900px @@ -622,12 +507,12 @@ // $modal-sm: 300px -//== Alerts +// Alerts // -//## Define alert colors, border radius, and padding. +// Define alert colors, border radius, and padding. // $alert-padding: 15px -// $alert-border-radius: $border-radius-base +// $alert-border-radius: $border-radius // $alert-link-font-weight: bold // $alert-success-bg: $state-success-bg @@ -647,56 +532,33 @@ // $alert-danger-border: $state-danger-border -//== Progress bars -// -//## +// Progress bars -//** Background color of the whole progress component // $progress-bg: #f5f5f5 -//** Progress bar text color // $progress-bar-color: #fff -//** Variable for setting rounded corners on progress bar. -// $progress-border-radius: $border-radius-base +// $progress-border-radius: $border-radius -//** Default progress bar color // $progress-bar-bg: $brand-primary -//** Success progress bar color // $progress-bar-success-bg: $brand-success -//** Warning progress bar color // $progress-bar-warning-bg: $brand-warning -//** Danger progress bar color // $progress-bar-danger-bg: $brand-danger -//** Info progress bar color // $progress-bar-info-bg: $brand-info -//== List group -// -//## +// List group -//** Background color on `.list-group-item` // $list-group-bg: #fff -//** `.list-group-item` border color // $list-group-border: #ddd -//** List group border radius -// $list-group-border-radius: $border-radius-base +// $list-group-border-radius: $border-radius -//** Background color of single list items on hover // $list-group-hover-bg: #f5f5f5 -//** Text color of active list items // $list-group-active-color: $component-active-color -//** Background color of active list items // $list-group-active-bg: $component-active-bg -//** Border color of active list elements // $list-group-active-border: $list-group-active-bg -//** Text color for content within active list items // $list-group-active-text-color: lighten($list-group-active-bg, 40%) -//** Text color of disabled list items // $list-group-disabled-color: $gray-light -//** Background color of disabled list items // $list-group-disabled-bg: $gray-lighter -//** Text color for content within disabled list items // $list-group-disabled-text-color: $list-group-disabled-color // $list-group-link-color: #555 @@ -704,110 +566,26 @@ // $list-group-link-heading-color: #333 -//== Panels -// -//## - -// $panel-bg: #fff -// $panel-body-padding: 15px -// $panel-heading-padding: 10px 15px -// $panel-footer-padding: $panel-heading-padding -// $panel-border-radius: $border-radius-base - -//** Border color for elements within panels -// $panel-inner-border: #ddd -// $panel-footer-bg: #f5f5f5 - -// $panel-default-text: $gray-dark -// $panel-default-border: #ddd -// $panel-default-heading-bg: #f5f5f5 - -// $panel-primary-text: #fff -// $panel-primary-border: $brand-primary -// $panel-primary-heading-bg: $brand-primary - -// $panel-success-text: $state-success-text -// $panel-success-border: $state-success-border -// $panel-success-heading-bg: $state-success-bg - -// $panel-info-text: $state-info-text -// $panel-info-border: $state-info-border -// $panel-info-heading-bg: $state-info-bg - -// $panel-warning-text: $state-warning-text -// $panel-warning-border: $state-warning-border -// $panel-warning-heading-bg: $state-warning-bg +// Image thumbnails -// $panel-danger-text: $state-danger-text -// $panel-danger-border: $state-danger-border -// $panel-danger-heading-bg: $state-danger-bg - - -//== Thumbnails -// -//## - -//** Padding around the thumbnail image -// $thumbnail-padding: 4px -//** Thumbnail background color +// $thumbnail-padding: .25rem // $thumbnail-bg: $body-bg -//** Thumbnail border color // $thumbnail-border: #ddd -//** Thumbnail border radius -// $thumbnail-border-radius: $border-radius-base - -//** Custom text color for thumbnail captions -// $thumbnail-caption-color: $text-color -//** Padding around the thumbnail caption -// $thumbnail-caption-padding: 9px - - -//== Wells -// -//## - -// $well-bg: #f5f5f5 -// $well-border: darken($well-bg, 7%) - - -//== Badges -// -//## - -// $badge-color: #fff -//** Linked badge text color on hover -// $badge-link-hover-color: #fff -// $badge-bg: $gray-light +// $thumbnail-border-radius: $border-radius -//** Badge text color in active nav link -// $badge-active-color: $link-color -//** Badge background color in active nav link -// $badge-active-bg: #fff -// $badge-font-weight: bold -// $badge-line-height: 1 -// $badge-border-radius: 10px +// Breadcrumbs +// $breadcrumb-padding-vertical: .75rem +// $breadcrumb-padding-horizontal: 1rem -//== Breadcrumbs -// -//## - -// $breadcrumb-padding-vertical: 8px -// $breadcrumb-padding-horizontal: 15px -//** Breadcrumb background color -// $breadcrumb-bg: #f5f5f5 -//** Breadcrumb text color -// $breadcrumb-color: #ccc -//** Text color of current page in the breadcrumb +// $breadcrumb-bg: $gray-lighter +// $breadcrumb-divider-color: $gray-light // $breadcrumb-active-color: $gray-light -//** Textual separator for between breadcrumb elements -// $breadcrumb-separator: "/" +// $breadcrumb-divider: "/" -//== Carousel -// -//## +// Carousel // $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) @@ -822,52 +600,22 @@ // $carousel-caption-color: #fff -//== Close -// -//## +// Close // $close-font-weight: bold // $close-color: #000 // $close-text-shadow: 0 1px 0 #fff -//== Code -// -//## +// Code -// $code-color: #c7254e -// $code-bg: #f9f2f4 +// $code-color: #bd4147 +// $code-bg: #f7f7f9 // $kbd-color: #fff // $kbd-bg: #333 -// $pre-bg: #f5f5f5 +// $pre-bg: #f7f7f9 // $pre-color: $gray-dark // $pre-border-color: #ccc // $pre-scrollable-max-height: 340px - - -//== Type -// -//## - -//** Horizontal offset for forms and lists. -// $component-offset-horizontal: 180px -//** Text muted color -// $text-muted: $gray-light -//** Abbreviations and acronyms border color -// $abbr-border-color: $gray-light -//** Headings small color -// $headings-small-color: $gray-light -//** Blockquote small color -// $blockquote-small-color: $gray-light -//** Blockquote font size -// $blockquote-font-size: ($font-size-base * 1.25) -//** Blockquote border color -// $blockquote-border-color: $gray-lighter -//** Page header border color -// $page-header-border-color: $gray-lighter -//** Width of horizontal description list titles -// $dl-horizontal-offset: $component-offset-horizontal -//** Horizontal line color. -// $hr-border: $gray-lighter diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb index 93b4fac..9f4468f 100644 --- a/templates/project/manifest.rb +++ b/templates/project/manifest.rb @@ -9,9 +9,7 @@ stylesheet '_bootstrap-variables.sass', :to => '_bootstrap-variables.sass' # Copy JS and fonts manifest = Pathname.new(File.dirname(__FILE__)) assets = File.expand_path('../../assets', manifest) -{:javascript => 'javascripts', - :font => 'fonts' -}.each do |method, dir| +{:javascript => 'javascripts'}.each do |method, dir| root = Pathname.new(assets).join(dir) Dir.glob root.join('**', '*.*') do |path| path = Pathname.new(path) diff --git a/templates/project/styles.sass b/templates/project/styles.sass index fb4a2e9..04371d1 100644 --- a/templates/project/styles.sass +++ b/templates/project/styles.sass @@ -1,6 +1,10 @@ -// Import Bootstrap Compass integration -@import "bootstrap-compass" // Import custom Bootstrap variables @import "bootstrap-variables" // Import Bootstrap for Sass @import "bootstrap" +// or Import Bootstrap Flex +@import "bootstrap-flex" +// or Import Bootstrap Grid +@import "bootstrap-grid" +// or Import Bootstrap Reboot +@import "bootstrap-reboot" |