Merge pull request #37 from kurisubrooks/dev

Caramel 1.4 - Check CHANGELOG.md

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .sass-cache
 *.css.map
+*.scssc

CHANGELOG.md

@@ -1,3 +1,17 @@
+## Caramel 1.4 - 15 July, 2015
+#### New:
+- Sass Compiler
+- Added 'Clean' Style
+- Added CSS Overrides
+
+#### Changed:
+- Changed Default Font
+- Changed Typography
+- Adjusted Navigation, Button, Form, and Progress Bar Padding
+- Fixed Whitespace
+
+---
+
 ## Caramel 1.3 — 18 April, 2015
 #### New:
 - Fixed Navbar
@@ -8,5 +22,3 @@
 - Adjusted Core Colours
 - Adjusted Progress Bar Colours
 - Adjusted Button Padding
-
----

README.md

@@ -7,44 +7,31 @@ Caramel is a simple, beautiful, modern website framework. Caramel is mobile comp
 - Clone the repo: ```git clone https://github.com/kurisubrooks/caramel.git```
 
 ## Documentation
-Need help? We've got you covered! Go on over to our [GitHub Wiki](https://github.com/kurisubrooks/caramel/wiki) page to take a look at Code Usage and Examples! 
+Need help? We've got you covered! Go on over to our [GitHub Wiki](https://github.com/kurisubrooks/caramel/wiki) page to take a look at Code Usage and Examples!
 Need further help? Pop into ```#caramel``` on ```irc.esper.net``` and state your question. We may take a while to answer your question (as we're not always available), so make sure to hang around until we're able to give you a reply!
 
 ## Modification
-Modifying Caramel is easy with Sass, and our Compiling Script. Make your changes to Caramel, then run our Compiling Script to recompile your new code into CSS. 
+Modifying Caramel is easy with Sass, and our Compiling Script. Make your changes to Caramel, then run our Compiling Script to recompile your new code back into CSS.
 
-**Please Note:** The Compiling Script only works on Linux and Mac OS X. Additionally, [Ruby](https://www.ruby-lang.org/) and [Sass Command Line](http://sass-lang.com/install) must be installed for our Compiling Script to work.
+**Please Note:** Our Sass compiler runs on [Ruby](https://www.ruby-lang.org/), and requires [Sass Command Line](http://sass-lang.com/install) to be installed. Both must be installed for the Compiling Script to work.
 
 ### Syntax:
 
-	path/to/compile.sh  path/to/caramel.scss
-
-### Errors:
-
-	-bash: path/to/compile.sh: Permission denied
-* Solution: `chmod +x path/to/compile.sh`
+```ruby
+ruby path/to/compile.rb  path/to/caramel.scss
+```
 
 ## Compatibility
 
-Caramel works on any browser that supports CSS3. Caramel is recommended for use on:
+Caramel works on any browser that supports CSS3. Caramel has been tested, and is recommended for use on:
 
-* Chrome 40
-* Firefox 36
-* Safari 8
+* Chrome 40+
+* Firefox 36+
+* Safari 8+
+* Microsoft Edge 20+
 * IE 9, 10, 11
 
-## Team
-
- * [kurisubrooks](http://github.com/kurisubrooks) — CSS / Design
- * [whoiskenjackson](http://github.com/whoiskenjackson) — CSS / Javascript
- * [hedgehog1029](http://github.com/hedgehog1029) — Javascript
-
-### Contributions
- * [gratimax](http://github.com/gratimax) — Grid System
- * [penagwin](http://github.com/penagwin) — Javascript
- * [toma678](http://github.com/toma678) — Sass Compiler
-
-
 ## Copyright / License
 
-Copyright © 2014-2015 kurisubrooks // Code released under GPLv2 License.
+Copyright © 2014-2015 kurisubrooks
+Code released under GPLv2 License.

src/compile.rb

@@ -0,0 +1,43 @@
+# Caramel — Sass Compiling Script
+# Created by toma678, kurisubrooks & joshhartigan
+
+puts ("[*] Caramel Sass Compiler")
+puts ("[*] Syntax: 'ruby path/to/compile.rb path/to/caramel.scss'")
+puts ("")
+
+file = ARGV[0]
+
+begin
+	if File.extname(file)==".scss"
+
+		else
+			puts  ("[!] ERROR: Incorrect File Format, must be .scss!")
+			abort ("[-] Usage: 'ruby path/to/compile.rb path/to/caramel.scss'")
+		end
+
+	rescue TypeError
+		puts ("[!] ERROR: File Missing. You didn't include a file!")
+		puts ("[-] Please enter the file path:")
+		file = gets.chomp
+		puts ("")
+		if File.extname(file)==".scss"
+
+		else
+			puts  ("[!] ERROR: Incorrect File Format, must be .scss!")
+			puts  ("[-] Make sure there's no space after 'file.scss'")
+			abort ("[-] Usage: 'ruby path/to/compile.rb path/to/caramel.scss'")
+		end
+	end
+
+out = file.split(".").first
+sass1 = "sass --sourcemap=none --cache=/tmp/sass "+file.to_s+" "+out.to_s+".css"
+sass2 = "sass --sourcemap=none --cache=/tmp/sass "+file.to_s+" "+out.to_s+".min.css --style compressed"
+
+puts ("[*] Compiling > .css")
+system sass1
+
+puts ("[*] Minifying > .min.css")
+system sass2
+
+puts ("[*] Done! Press Return to end the script.")
+ending = gets