mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

premerge cleanup

Browse Source
This commit is contained in:
Mark Moser 2016-08-21 14:11:07 -05:00
parent c6f5577670
commit 84fdf750c5
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -38,7 +38,6 @@ tmux*log
/vendor/bundle /vendor/bundle
/lib/bundler/man/ /lib/bundler/man/
/vendor/assets/* /vendor/assets/*
!/vendor/assets/foundation-emails
bower_components/ bower_components/
node_modules/ node_modules/
.DS_Store .DS_Store

BIN
app/assets/images/yellowborder.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

2
app/assets/stylesheets/mailers/foundation_global_overrides.scss
View File

@ -1,4 +1,4 @@
// manny, put stuff here to override foundation settings // foundation overrides
$success-color: #EF0734; $success-color: #EF0734;
$global-width: 600px; $global-width: 600px;

6
app/assets/stylesheets/mailers/foundation_vendor_manifest.scss
View File

@ -1,10 +1,8 @@
// Foundation for Emails by ZURB
// foundation.zurb.com
// Licensed under MIT Open Source
//
@import 'foundation-emails/scss/util/util', @import 'foundation-emails/scss/util/util',
'foundation-emails/scss/global', 'foundation-emails/scss/global',
'foundation_global_overrides', 'foundation_global_overrides',
'foundation-emails/scss/components/normalize', 'foundation-emails/scss/components/normalize',
'foundation-emails/scss/grid/grid', 'foundation-emails/scss/grid/grid',
'foundation-emails/scss/grid/block-grid', 'foundation-emails/scss/grid/block-grid',