From 57b6284e1d6dc670c9b1b04f14ba67d70bca3f06 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 28 Jul 2014 13:27:31 -0500 Subject: [PATCH] 2.0.1 Updated readme and squashed a few more bugs --- .gitignore | 20 -- README.md | 336 ++++-------------- bin/theme_setup.rb | 1 + bin/upgrade | 2 +- bin/upgrade.rb | 12 +- bower.json | 10 - skeleton/themes/demo/_vars.scss | 1 + .../demo/{includes => marrow}/_mixins.scss | 0 skeleton/themes/sphenoid/_vars.scss | 2 +- 9 files changed, 74 insertions(+), 310 deletions(-) rename skeleton/themes/demo/{includes => marrow}/_mixins.scss (100%) diff --git a/.gitignore b/.gitignore index 46c119b..197ca7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,5 @@ .sass-cache -<<<<<<< HEAD -compass/css -sass/css -coverage -InstalledFiles -lib/bundler/man -pkg -rdoc -spec/reports -test/tmp -test/version_tmp -tmp -TODO.md - -# YARD artifacts -.yardoc -_yardoc -doc/ -======= *.config.scss skeleton.* skeleton_template.css *.html ->>>>>>> 2.x diff --git a/README.md b/README.md index ef89653..8dcbca3 100644 --- a/README.md +++ b/README.md @@ -1,106 +1,22 @@ -<<<<<<< HEAD -Skeleton SASS -============= - -Skeleton SASS is a "SASSification" of Dave Gamache's [Skeleton CSS](http://getskeleton.com) responsive front-end framework. - -* `.scss` and `.sass` syntaxes available -* `compass` versions available -* Ability to seamlessly adjust grids - * Fixed Grid (default) - * Fluid Grid - * Adjust columns and gutters -* Install Skeleton SASS with bower! `bower install skeleton-sass` -======= -Skeleton Sass 2β +Skeleton Sass 2 ======================= Skeleton Sass is a "Sassification" of Dave Gamache's [Skeleton CSS](http://getskeleton.com) responsive front-end framework. -* Ability to seamlessly adjust grids by changing the value of variables and compiling – so easy! -* Install Skeleton Sass with bower! `bower install skeleton-sass` ->>>>>>> 2.x -* [Live demo!](http://atomicpages.github.io/skeleton-sass/demo.html) +* Ability to seamlessly adjust grids by changing the value of variables +* Install Skeleton Sass with bower via `bower install skeleton-sass` +* [Live demo!](http://atomicpages.github.io/skeleton-sass/demo/index.html) * [Extensive documentation](https://github.com/atomicpages/skeleton-sass/wiki) -## TL;DR -<<<<<<< HEAD -Skeleton SASS is a SASS port of Skeleton CSS. Skeleton SASS is primarily written and debugged using the newer "SassyCSS" syntax of SASS which is seen via the `.scss` file extension. If you are familiar and/or prefer the older HAML-style syntax then fret not, we offer this syntax as well which is seen via the `.sass` file extension. - -If you are new to SASS altogether then please read our [wiki](https://github.com/atomicpages/skeleton-sass/wiki) for a more in-depth look at Skeleton SASS, information regarding installing ruby and SASS, and many other valuable resources! - -If you have used Skeleton CSS and you are tired of dealing with vanilla CSS, then transitioning to Skeleton SASS will require minimal effort. Since Skeleton SASS is built to duplicate the file hierarchy of Skeleton CSS. This allows the transition to be smooth and painless. - -If you have tried other SASS ports of Skeleton CSS you've probably seen a ports that are built inefficiently, inaccurately, and perhaps even downright poorly. Skeleton SASS will be the last time you search for a SASS port of Skeleton CSS. With only _three_ additional files to satisfy dependencies, this will allow you to easily transition into using Skeleton SASS. Continue reading about each of the files that are used by Skeleton SASS. - -### Features -1. Duplicates the exact file hierarchy, file structure, and file names as Skeleton CSS -2. Separation of variables, functions, and mixins to keep code clean and **DRY** -3. Compass and Non-Compass versions available -4. `.sass` and `.scss` versions available -5. Install Skeleton SASS with bower front-end package manager - -### Project Organization -Skeleton SASS is organized into **two** major categories: - -1. [Compass Version](http://compass-style.org/) -2. Non-Compass Version - -Both of these versions are organized the same exact way to ensure maximum usability: - -* `bourbon` - * `core` - * Bourbon source files - * `_loader.scss` - * `_dependencies.scss` - * `_mixins.scss` - * `_functions.scss` - * `_vars.scss` - * `_config.scss` - * `base.scss` - * `layout.scss` - * `skeleton.scss` -* `compass` (Compass Version) - * `scss` - * `_dependencies.scss` - * `_mixins.scss` - * `_functions.scss` - * `_vars.scss` - * * `_config.scss` - * `base.scss` - * `layout.scss` - * `skeleton.scss` -* `sass` (Non-Compass Version) - * `scss` has the same files as `compass` - -### File Overview -* `skeleton` contains the core of the framework. This file contains the responsive goodness among other structural styles and is **required** for the framework to be used. -* `layout` is an _optional_ file where you can add custom styles that may extend the framework and/or custom styles for your website. You may discard this file if you wish. -* `base` is an _optional_ file which contains the default styles for the framework. You may discard this file if you wish. -* `_mixins` is a [partial file](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials) that contains all of the high-level core mixins used in the framework which means this file is **required**. Additionally, you may add your own custom mixins at the top of this file as well as edit existing mixins to suit your needs. See this file for additional information. -* `_dependencies` is a [partial file](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials) that contains core functions and "private" mixins that aren't meant to be used directly. Avoid editing this file directly unless you know what you're doing! The framework **will not work** if you delete this file. -* `_vars` is a [partial file](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials) which is **required** because it contains all of the global variables for the framework. See file for additional information. -* `_functions` is a [partial file](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials) where you may add custom functions. This file is **not required** by any means and may be discarded if you wish. -* `_config.scss` is a [partial file](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials) that houses all **local** configuration information that you do not wish to be overridden by bower. Git users be warned as if you are doing a fresh pull, git will still *override* this file! - -### Bower -> Bower is a package manager for the web. It offers a generic, unopinionated solution to the problem of front-end package management, while exposing the package dependency model via an API that can be consumed by a more opinionated build stack. There are no system wide dependencies, no dependencies are shared between different apps, and the dependency tree is flat — bower.io - -For more info on bower, checkout [bower.io](http://bower.io/). +### Upgrading From 1.x +Skeleton Sass 2.x is **not** backwards compatible with Skeleton Sass 1.x due to a major change in the file structure. However, we have a [wiki article](https://github.com/atomicpages/skeleton-sass/wiki/Upgrade-from-1-to-2) that explains how to upgrade from Skeleton Sass 1 to Skeleton Sass 2. -Skeleton Sass is now available on Bower because we want to make your life easier. You can now add Skeleton Sass to any project easily by issuing `bower install skeleton-sass`. -======= -Skeleton Sass is a Sass port of Skeleton CSS. With the new `2.x` series, Skeleton Sass has been trimmed down and a **ton** of new features have been added. +## TL;DR +Skeleton Sass is a Sass port of Skeleton CSS. Skeleton Sass 2 has been trimmed down and a **ton** of new features have been added. Note: If you are new to Sass altogether then please read our [wiki](https://github.com/atomicpages/skeleton-sass/wiki) for a more in-depth look at Skeleton Sass, information regarding installing ruby and Sass, and many other valuable resources! -// TODO add wiki entry for this... -If you have used Skeleton CSS and you are tired of dealing with vanilla CSS, then transitioning to Skeleton Sass will require minimal effort. - -If you've tried other Skeleton CSS ports and had a feeling is dissatisfaction, then look no more. Skeleton Sass is your last stop. - -### Upgrading From 1.x -Skeleton Sass 2.x is **not** backwards compatible with Skeleton Sass 1.x due to a major change in the file structure. However, there is a [wiki article](#) that has a detailed explanation for aid in upgrading from Skeleton Sass 1.x to 2.x +If you are not new to Sass and you've tried other Skeleton CSS Sass ports and had a feeling is dissatisfaction, then look no more. Skeleton Sass is your last stop. ### Features 1. DRY @@ -110,35 +26,36 @@ Skeleton Sass 2.x is **not** backwards compatible with Skeleton Sass 1.x due to 5. Upgradeable ### Dependencies -The only dependency Skeleton Sass is Sass 3.3.x. Any other libraries like Bourbon, Compass, etc. are up to you to add your installation. +The only dependency Skeleton Sass is Sass 3.3+. Any other libraries (e.g. Bourbon) are up to you to include if you wish. **Warning:** The current stable release of Compass does *not* support Sass 3.3.x. Skeleton Sass uses functions that are a part of that version. There are currently alpha builds of Compass 1.x that do support Sass 3.3.x ### File Overview -* `bin` a directory that contains various executables - * `setup.sh` a simple bash script that aids in setting up Skeleton Sass for first time use - * `theme_setup.sh` a simple bash script that aids in setting up a custom theme for Skeleton Sass - * `upgrade.sh` a simple bash script that aids in upgrading Skeleton Sass -* `core` - * `bones` the directory where theme loaders are located - * `_sphenoid.scss` the default theme - * `_config.scss` the default global configuration variables - * `_dependencies.scss` the default global logic for Skeleton Sass - * `_mixins.scss` the default global mixins for Skeleton Sass -* `skeleton` where the magic happens - * `demo` - * `_base.scss` contains all of the base styles for Skeleton Sass with the exception of the reset styles - * `_bourbon.scss` contains information to import bourbon if it's used - * `_vars.scss` contains project-scoped configuration options - * `sphenoid` the main theme bundled with Skeleton Sass - * `marrow` the directory that contains all of the project-scoped logic (e.g. functions and mixins) for your theme to work - * `_private.scss` a file that contains all of the private logic for the public mixins/functions to work correctly for the `sphenoid` project. Feel free to name this file whatever you want in your own theme. - * `_public.scss` a file that contains all of the public mixins/functions for the `sphenoid` theme. Feel free to name this file whatever you want in your own theme. - * `_base.scss` contains all of the origion base styles for Skeleton Sass (nothing has changed visually) - * `_vars.scss` contains project-scoped configuration options - * `_skeleton.scss` contains all the styles to create the grid like we've used before – nothing has changed -* `_MYconfig.scss` contains all of your global configuration options that won't be overridden by an update to Skeleton Sass. Just be sure to rename the file before using and adding it as an import to `core/_config.scss`! // WIKI entry needed -* `skeleton_template.scss` contains all of the styles accumulated into a single file. Be sure to rename this file to skeleton.scss before compiling! +* `bin` a directory that contains ruby executables + * `setup.rb` a ruby script that aids in setting up Skeleton Sass for first time use + * `theme_setup.rb` a ruby script that aids in setting up a custom theme for Skeleton Sass + * `upgrade` a bash script that aids in upgrading Skeleton Sass +* `skeleton` where all of the magic happens + * `core` + * `_config.scss` the default global configuration variables + * `_dependencies.scss` the default global logic for Skeleton Sass + * `_functions.scss` the default global functions for Skeleton Sass + * `_mixins.scss` the default global mixins for Skeleton Sass + * `themes` where all of the themes live + * `demo` + * `marrow` stores all project-level functions and mixins + * `_mixins.scss` loads the default theme mixins and functions from `sphenoid` + * `_base.scss` contains all of the base styles for Skeleton Sass with the exception of the reset styles + * `_vars.scss` contains project-scoped configuration options and variables + * `sphenoid` the main theme bundled with Skeleton Sass + * `marrow` the directory that contains all of the project-scoped logic (e.g. functions and mixins) for your theme to work + * `_private.scss` a file that contains all of the private logic for the public mixins/functions to work correctly for the `sphenoid` project. Feel free to name this file whatever you want in your own theme. + * `_public.scss` a file that contains all of the public mixins/functions for the `sphenoid` theme. Feel free to name this file whatever you want in your own theme. + * `_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 +* `_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. ### Bower > Bower is a package manager for the web. It offers a generic, unopinionated solution to the problem of front-end package management, while exposing the package dependency model via an API that can be consumed by a more opinionated build stack. There are no system wide dependencies, no dependencies are shared between different apps, and the dependency tree is flat — [bower.io](http://bower.io/) @@ -151,49 +68,34 @@ You can also install alpha, beta, rc, and previous versions by looking at the [r bower install skeleton-sass#[tag] bower install skeleton-sass#2.0.0-b2 ->>>>>>> 2.x -### Demo -Live demo can be seen here: [http://atomicpages.github.io/skeleton-sass](http://atomicpages.github.io/skeleton-sass). Be sure to resize your browser window and see the responsive goodness in action! - -<<<<<<< HEAD -Want to see spin on the default 16-column fixed-grid system? See the [demo here](http://atomicpages.github.io/skeleton-sass/demo.html)! +[Learn how to set up Skeleton Sass for the first time here](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-for-first-time-use). -### Documentation -Skeleton SASS is heavily documented! If you're looking for a detailed description (or just want more info) you can checkout the [wiki pages](https://github.com/atomicpages/skeleton-sass/wiki/_pages)! +### Demo +You can see Skeleton Sass in action here: [http://atomicpages.github.io/skeleton-sass](http://atomicpages.github.io/skeleton-sass). Be sure to resize your browser window and see the responsive goodness in action! -##### Resources -* [Installing SASS](https://github.com/atomicpages/skeleton-sass/wiki/Installing-SASS) -======= ### Documentation -Skeleton Sass is heavily documented! If you're looking for a detailed description (or just want more info) you can checkout the [wiki pages](https://github.com/atomicpages/skeleton-sass/wiki/_pages)! +Skeleton Sass is heavily documented. If you're looking for a detailed description (or just want more info) you can view all the [wiki pages here](https://github.com/atomicpages/skeleton-sass/wiki/_pages). ##### Resources * [Installing Sass](https://github.com/atomicpages/skeleton-sass/wiki/Installing-Sass) ->>>>>>> 2.x -* [Installing Compass](https://github.com/atomicpages/skeleton-sass/wiki/Installing-Compass) +* [Setting up Skeleton Sass for first time use](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-for-first-time-use) * [Setting up a Fluid Grid](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-a-Fluid-Grid) +* [Creating a theme](https://github.com/atomicpages/skeleton-sass/wiki/Creating-a-theme) ##### Documentation -<<<<<<< HEAD -* [Introduction to Skeleton SASS](https://github.com/atomicpages/skeleton-sass/wiki) -======= * [Introduction to Skeleton Sass](https://github.com/atomicpages/skeleton-sass/wiki) ->>>>>>> 2.x * [Function Documentation](https://github.com/atomicpages/skeleton-sass/wiki/Function-Documentation) * [Variable Documentation](https://github.com/atomicpages/skeleton-sass/wiki/Variable-Documentation) * [Mixin Documentation](https://github.com/atomicpages/skeleton-sass/wiki/Mixin-Documentation) +* [Skeleton Sass version 1 Docs](https://github.com/atomicpages/skeleton-sass/wiki/Version-1-Docs) ### License This project is released under the [MIT license](https://github.com/atomicpages/skeleton-sass/blob/master/license.txt). Who doesn't like free code? ### Find a Bug? -<<<<<<< HEAD -Skeleton SASS is community driven. We will gladly review any issues that you find. If you wish to contribute you'll land a spot in the contributions section of this document! -======= Skeleton Sass is community driven. We will gladly review any issues that you find. If you wish to contribute you'll land a spot in the contributions section of this document! ->>>>>>> 2.x ##### I Found a Bug/How Can I Help? * [Create an Issue](https://github.com/atomicpages/skeleton-sass/issues) @@ -201,141 +103,26 @@ Skeleton Sass is community driven. We will gladly review any issues that you fin Changelog --------- -<<<<<<< HEAD -### 1.6.3 -* Removed local configuration from automatically importing. Now all you need to to is uncomment the line in order for the import to work [issue #13](https://github.com/atomicpages/skeleton-sass/issues/13). [See the wiki](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-with-Bower) for information regarding preserving changes when using bower -* Added releases so everyone can install legacy versions of Skeleton Sass via bower starting with this version! - -### 1.6.2 -* Added local configuration file that won't be overridden when updating with bower. -* Updated `bower.json` to exclude `demo` and development files from being installed with bower - -### 1.6.1 -* Fixed missing `one-third` and `two-thirds` selectors in fluid grid -* Updated `12`, `20`, and `fluid` CSS files in `css` directory - -### 1.6.0 -* Added support for [Bourbon](http://bourbon.io/) -* Revised `_fluidGrid` mixin to utilize Sass functions -* Resolved spelling errors in `numToString` function -* Revised `_fixedGrid` mixin -* Resolved [Issue #11](https://github.com/atomicpages/skeleton-sass/issues/11) -* Cleaned up fluid grids for tablets by removing redundant code -* Fixed `1.5.0` documentation in the README -* Finally updated the bower version number so bower users can actually upgrade -* Removed `.sass` files, use `sass-convert -R my_css_dir --from css --to scss` - -### 1.5.3 -* Added the following HTML5 `input` types to inherit default styles in `base.css` - * `date` - * `datetime` - * `datetime-local` - * `week` - * `number` - * `month` - * `time` -* Updated `test.html` to accommodate these updated types as well as these input types: - * `color` - -### 1.5.2 -* Fixed quote issue on `transitionn` mixin for non-compass version - -### 1.5.1 -* Resolved [issue #9](https://github.com/atomicpages/skeleton-sass/issues/9) - -### 1.5.0 -* Commit fixes [issue #7](https://github.com/atomicpages/skeleton-sass/issues/7). You no longer need to manually calculate $colWidth in the `grid` mixin! -* Resolved spelling error: `.two-third.column` changed to `.two-thirds.column` - - -### 1.4.2 -* Added vanilla CSS component to Skeleton SASS. You can now have CSS right out of the box without having to compile any sass code! -* Added additional files and folders for bower to ignore - -### 1.4.1 -* Added Skeleton SASS to bower! You can now drop Skeleton SASS into your projects using `bower install skeleton-sass` - -### 1.4.0 -* Moved contents from `_functions` to a new partial called `_dependencies` -* Moved all of the "private" mixins to `_dependencies` partial since these are core mixins and functions -* Finally added offset styles to mobile grids – I realize that was a _major_ piece that was missing -* Added `mobileGrid` mixin -* Added the following mixins to the non-compass version: - * `single-transition` - * `transition` - * `reset-font` - * `reset-focus` - * `reset-list-style` - * `reset-table` - * `reset-table-cell` - * `reset-quotation` - * `reset-image-anchor-border` - * `reset-html5` - * `global-reset` - * `nested-reset` -* Non-compass version gradient support is available but these mixins still need multi-stop support - * `filter-gradient` - this is for IE only and works 100% - * `linear-gradient` - produces a linear gradient in all directions - * `radial-gradient` - produces a radial gradient -* Removed redundant code for `.container .columns` margins -* Fixed offset calculation issue for fluid grid -* Added support for grouped selectors on `mobileGrid` - -### 1.3.4 -* Added sample outline of a web page to show a more realistic example of how the page will scale - -### 1.3.3 -* Oops! The demo has now been fixed! - -### 1.3.2 -* Updated README file and fixed demo files so it actually works this time ;) - -### 1.3.1 -* Removed unnecessary if statement at the top of the `numToString` function - -### 1.3 -* Greatly improved `int` to `string` conversion by using something other than a million if-else statements - -### 1.2.3 -* Cleaned up `.sass` files by using tabs instead of default 2 spaces -* Fixed gutter calculation on fixed grid and in the skeleton file -* Used boolean in `_fluidGrid` to prevent `sass-convert` from stripping `null` value - -### 1.2.2 -* Added support for fluid grid generation based on column number -* Cleaned up headers -* Housekeeping in `_mixins` file -* Fixed issue in `.sass` files. `null` type being stripped when using `sass-convert --from scss --to sass` - -### 1.2.1 -* Fixed Duplicate `.container` on offsets +### 2.0.0 -### 1.2 -* Addition of **fluid** grid :) -* Complete restructure of `mixins` file and grid generation -* Changed name of `makeGrid` mixin to `grid` -* Changed core variable names. See `vars` for more information -* Cleaned up headers across the board -* Removed unnecessary and unused functions -* Separated roles in `mixins` file -* Cleaned up comments in all files -* and more... +###### Removals +* Removed `$baseWidthMQ` +* Removed `bourbon` and `compass` to completely flatten the dependency tree so all you need now is Sass 3.3+ -### 1.1 -* Update to several functions and mixins. -* Addition of new variables -* Several fixes for non-compass version -* Fixing of `.sass` files -======= -### 2.0.0β +###### Fixes/Changes * **Huge** changes to the structure of Skeleton Sass -* Added **_themes_**! All themes are located in `skeleton/` with the default theme called `sphenoid` - * Themes allow you to edit the base styles by default to create a differently styles foundation for your project that doesn't get wiped out when there's an update to Skeleton Sass. -* All core/shared files have been moved to the `core` folder. -* Added shell scripts to aid in setting up Skeleton Sass, upgrading Skeleton Sass (removing unneeded files), and creating a theme for you *nix/OS X users who use command line. - * Scripts for Windows users coming soon - * Manual configuration documentation coming soon -* Completely removed `layout.scss` and added predefined media queries to `skeleton_template.scss` +* No more camelCase variables (based on what we've seen the convention seems to prefer hyphens in variable names). +* Squashed some old, lingering bugs with the gradient mixins +* All of the logic has been moved to the `skeleton/core` folder +* Completely removed `layout.scss` (media queries defined in the old layout file now live in `skeleton_template.scss`) +* Fixed a few linger misspellings in a few selectors +* Cleaned and optimized old mixins/functions +* `$base-width` is now calculated automatically + +###### New Features +* Introduced global variables, mixins, and functions +* Introduced a new concept to Skeleton Sass called _themes_. Themes allow you to edit the base styles to create a new launching platform for your projects. When you create a theme, it won't get overridden with an update to Skeleton Sass. [Learn more about themes here](https://github.com/atomicpages/skeleton-sass/wiki/Creating-a-theme). +* Ruby scripts that help you setup Skeleton Sass for first time use, create themes, update Skleton Sass, and more * New functions and mixins: * `_calcRU` is a function meant to be used in other functions. This function calculates the relative unit based on the `$base-font-size` and the `$size` passed into the function. These functions depend on `_calcRU` * `em` @@ -348,10 +135,7 @@ Changelog * `relative` converts an absolute `px` unit to the chosen relative unit as defined in `_config.scss` or your hown project configuration. * **Note:** if more than one relative unit is select then this function will simply spit out the `px` unit. // documentation is needed * `@font-size` is a *mixin* that handles everything involving `font-size`. // TODO complete this -* Removed `bourbon` and `compass` completely to flatten the dependency tree. At the core, Skeleton Sass never really needed either of these and it was mostly for you. If you wish to use any other frameworks, just add it to a dependency in your `skeleton.scss` file in the project root. Much simpler! -* No more camelCase variables. Based on what I've seen the convention seems to be to use hyphens in variable names. -* A better naming convention has been created that aligns with the human skeleton ->>>>>>> 2.x +* Added a grid generator helper in [atomicpages.github.io/skeleton-sass/](http://atomicpages.github.io/skeleton-sass/) Authors ------- diff --git a/bin/theme_setup.rb b/bin/theme_setup.rb index eb1462a..5f0cfd6 100755 --- a/bin/theme_setup.rb +++ b/bin/theme_setup.rb @@ -34,6 +34,7 @@ Helper.cp("skeleton/themes/demo/_base.scss", "skeleton/themes/#{name}/_base.scss") Helper.cp("skeleton/themes/demo/_vars.scss", "skeleton/themes/#{name}/_vars.scss") +Helper.cp("skeleton/themes/demo/marrow/_mixins.scss", "skeleton/themes/#{name}/marrow/_mixins.scss") END { puts "Theme setup complete!" diff --git a/bin/upgrade b/bin/upgrade index 52cca8c..b24393b 100755 --- a/bin/upgrade +++ b/bin/upgrade @@ -47,7 +47,7 @@ echo "Launch Setup Utility now? [y/n]" read ans if [[ ($ans != "n") && ($ans != "N") && ($ans != "no") && ($ans != "No") && ($ans != "NO") ]]; then - bin/setup.sh + bin/setup.rb echo "Upgrade and Setup is complete!" exit 0 fi diff --git a/bin/upgrade.rb b/bin/upgrade.rb index 98c6c0b..cd780d9 100755 --- a/bin/upgrade.rb +++ b/bin/upgrade.rb @@ -13,6 +13,8 @@ STDOUT.flush +puts "Warning: this script is incomplete at the moment. If you are using a BASH shell, please run bin/upgrade instead\n\n" + puts "Disclaimer: this utility it meant to aid in upgrading from Skeleton Sass 1.x to Skeleton Sass 2.x. If you have followed the wiki articles then please do not use this script without a clean installation of Skeleton Sass 2.x. We, AtomicPages LLC, are not responsible for any unforeseen events that arise by using this script. Please follow the prompts." resp = Helper.yesno("Did you add the contents from _vars.scss in Skeleton Sass 1.x to _MYconfig.scss in Skeleton Sass 2.x? [y/n]\nNote: If you ran the setup utility, your global configuration name might differ") @@ -57,6 +59,12 @@ "mobileLandscapeWidth" => "mobile-landscape-width" } -variables.each do |key, value| - %x(ruby -p -e "gsub /#{key}/, '#{value}' #{Dir.pwd}#{filename}") +# variables.each do |key, value| +# key = key.gsub(/(?<=[a-z])(?=[A-Z])/, '-').downcase +# end + +File.open(Dir.pwd + "/" + filename, "r+") do |file| + file.each_line do |line| + puts line + end end diff --git a/bower.json b/bower.json index 0949f64..0ce6b53 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,6 @@ { "name": "skeleton-sass", -<<<<<<< HEAD - "version": "1.6.3", -======= "version": "2.0.0", ->>>>>>> 2.x "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { @@ -17,15 +13,9 @@ "url": "http://opensource.org/licenses/MIT" } ], -<<<<<<< HEAD - "ignore": [ - "demo", - "sass/dev" -======= "main": "", "ignore": [ ".gitignore", "sache.json" ->>>>>>> 2.x ] } diff --git a/skeleton/themes/demo/_vars.scss b/skeleton/themes/demo/_vars.scss index 883779d..4c80acf 100644 --- a/skeleton/themes/demo/_vars.scss +++ b/skeleton/themes/demo/_vars.scss @@ -4,6 +4,7 @@ // variables. @import "../../core/config"; // default dependencies +@import "marrow/mixins"; // @import "my_folder/_foo.scss"; // import dependencies from a custom folder // @import "bourbon"; // install bourbon in this directory and uncomment this line to enable bourbon, for example diff --git a/skeleton/themes/demo/includes/_mixins.scss b/skeleton/themes/demo/marrow/_mixins.scss similarity index 100% rename from skeleton/themes/demo/includes/_mixins.scss rename to skeleton/themes/demo/marrow/_mixins.scss diff --git a/skeleton/themes/sphenoid/_vars.scss b/skeleton/themes/sphenoid/_vars.scss index 073d940..d67a287 100644 --- a/skeleton/themes/sphenoid/_vars.scss +++ b/skeleton/themes/sphenoid/_vars.scss @@ -13,4 +13,4 @@ $prefix-for-webkit: true !default; $prefix-for-mozilla: true !default; $prefix-for-microsoft: true !default; $prefix-for-opera: true !default; -$prefix-for-spec: true !default; +$prefix-for-spec: true !default; // set all prefixes to false EXCEPT spec to disable all vendor prefixes