Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Caramel 1.4 - Check CHANGELOG.md #37

Merged
merged 41 commits into from
Jul 14, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
71bc7be
Added Ruby Compiler
kurisubrooks Apr 20, 2015
21088a0
Added Swatches
kurisubrooks Apr 20, 2015
7ecd86c
Reverted Success color change
kurisubrooks Apr 20, 2015
6471f2b
Added Sass Cache
kurisubrooks Apr 20, 2015
eca89ba
Added Swatches
kurisubrooks Apr 20, 2015
7d4297b
Updated README for new Compiler
kurisubrooks Apr 20, 2015
4261c26
Fixing Ruby Instructions
kurisubrooks Apr 20, 2015
3fe26cd
Fixing Ruby Instructions
kurisubrooks Apr 20, 2015
45ae69a
Removed Team & Contributors
kurisubrooks Apr 20, 2015
10e1abc
Updated Creators Comment
kurisubrooks Apr 21, 2015
46ec013
Fixed Whitespace
kurisubrooks Apr 21, 2015
78b80fb
Added joshhartigan 's Compiler
kurisubrooks Apr 21, 2015
d458854
Added Round, Margin & Border Master-Classes
kurisubrooks Apr 24, 2015
c011745
Changed Form Padding
kurisubrooks Apr 24, 2015
902f073
Fixed Input in Nav Overflow
kurisubrooks Apr 24, 2015
17eb6f1
Fixed Input in Nav Overflow, Modified Form Padding
kurisubrooks Apr 24, 2015
e9b3708
Testing Input Overflow
kurisubrooks Apr 24, 2015
2db87f4
Removed Tester
kurisubrooks Apr 24, 2015
5c355dc
Added Promotional QR Code
kurisubrooks Jun 19, 2015
91bdf3d
Remove Test Script
kurisubrooks Jun 19, 2015
290511d
Added no-round classes
kurisubrooks Jun 19, 2015
efb8cd4
Fixed Corrupt SVG
kurisubrooks Jun 20, 2015
87d860a
GitHub Rehash
kurisubrooks Jul 14, 2015
414b80f
Changed Default Font
kurisubrooks Jul 14, 2015
77a1a2b
Added 'Clean' Style
kurisubrooks Jul 14, 2015
604fc69
Fixed CSS Overrides
kurisubrooks Jul 14, 2015
865e28e
Added 'Clean' Style, Changed Padding
kurisubrooks Jul 14, 2015
1596d46
Changed Padding
kurisubrooks Jul 14, 2015
3a0f7cf
Removed Swatches
kurisubrooks Jul 14, 2015
909ce3e
Changed Padding
kurisubrooks Jul 14, 2015
3d30451
Added 'Clean' Style, Changed Padding
kurisubrooks Jul 14, 2015
fc38ad3
Changed h1..6 Sizing, Added Blockquote
kurisubrooks Jul 14, 2015
a220af5
Added 'Clean' Style, Changed Padding, Changed Typography
kurisubrooks Jul 14, 2015
e32fbf4
Added 'Clean' Style
kurisubrooks Jul 14, 2015
c721d94
Updated Recommended Browsers
kurisubrooks Jul 14, 2015
176f764
Added Version 1.4
kurisubrooks Jul 14, 2015
54914b9
Removed Junk
kurisubrooks Jul 14, 2015
f74044b
Fixed JavaScript Name
kurisubrooks Jul 14, 2015
76f6ede
Rename Caramel.js to caramel.js
kurisubrooks Jul 14, 2015
e46de5d
Rename Caramel.min.js to caramel.min.js
kurisubrooks Jul 14, 2015
78dcc06
Added Caramel 1.4 zip
kurisubrooks Jul 14, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.sass-cache
*.css.map
*.scssc
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,5 +22,3 @@
- Adjusted Core Colours
- Adjusted Progress Bar Colours
- Adjusted Button Padding

---
Empty file modified LICENSE.md
100755 → 100644
Empty file.
39 changes: 13 additions & 26 deletions README.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Binary file added dist/caramel-1.4.0.zip
Binary file not shown.
43 changes: 43 additions & 0 deletions src/compile.rb
Original file line number Diff line number Diff line change
@@ -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
23 changes: 0 additions & 23 deletions src/compile.sh

This file was deleted.

Loading