Skip to content

Commit

Permalink
Fixed several small issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis committed Mar 27, 2015
1 parent 8ff8f0d commit 8b5368c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
* `_base.scss` contains all of the base styles for Skeleton Sass (same look as Skeleton CSS created)
* `_vars.scss` contains project-scoped configuration options
* `_skeleton.scss` contains all the styles to create the grid
* `fresh`
* `_MYconfig.scss` contains all of your global configuration options that won't be overridden by an update to Skeleton Sass
* `skeleton_template.scss` contains all of the styles accumulated into a single file.

Expand Down Expand Up @@ -132,6 +133,8 @@ Changelog
###### New Features/Themes
* `one-half` selector to grid
* `$new` parameter to `@_fluidGrid` and `@_fixedGrid`. This makes some basic changes to the grid for the new Skeleton CSS format
* Default fixed/fluid combo grid for `fresh` theme
* Updated offsets for the new fixed/fluid grid combo

### 2.0.0

Expand Down
2 changes: 1 addition & 1 deletion skeleton/themes/fresh/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ul ul,
ul ol,
ol ol,
ol ul {
margin: relative(15px) 0 relative(15px) relative(3px);
margin: relative(15px) 0 relative(15px) relative(30px);
font-size: 90%;
}
li { margin-bottom: relative(10px); }
Expand Down
2 changes: 1 addition & 1 deletion skeleton/themes/fresh/_skeleton.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
max-width: $grid-max-width;
margin: 0 auto;
padding: 0 relative(20px);
border-box: box-sizing;
box-sizing: border-box;
}
.column,
.columns {
Expand Down
3 changes: 2 additions & 1 deletion skeleton/themes/fresh/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $prefix-for-spec: true !default;

// Default overrides for new theme
$is-fluid: true; // Change to true to enable the fluid grid
$use-global-border-box: false; // Change to true the enable global border-box

$link-color: #1EAEDB; // default link color
$link-hover: #0FA0CE; // default link color on :hover
Expand All @@ -38,7 +39,7 @@ $form-font: $font-family; // default form font
$button-color: #555;
$button-weight: 600;
$button-font-uppercase: true;
$button-border-color: #444;
$button-border-color: #bbb;

// GRID CHANGES
$grid-max-width: 960px;
Expand Down

0 comments on commit 8b5368c

Please sign in to comment.