Skip to content

Commit

Permalink
Merge pull request #56 from philbuchanan/#55
Browse files Browse the repository at this point in the history
#55 Switched to SCSS and cleaned up CSS styles
  • Loading branch information
philbuchanan committed May 4, 2016
2 parents 041fceb + 1fad928 commit e61de69
Show file tree
Hide file tree
Showing 8 changed files with 709 additions and 985 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Top-most EditorConfig File
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true

# 4 space tab indentation
indent_style = tab
indent_size = 4
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AddType text/cache-manifest .appcache

ExpiresByType text/cache-manifest "access plus 0 seconds"
ExpiresByType text/cache-manifest "access plus 0 seconds"
2 changes: 1 addition & 1 deletion calculator.appcache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# v3.2.2: 2015-12-20
# v3.3: 2016-05-03
index.html
js/script.js
css/style.css
Expand Down
Loading

0 comments on commit e61de69

Please sign in to comment.