Skip to content

Commit

Permalink
add missing icon && add scss file for rails
Browse files Browse the repository at this point in the history
  • Loading branch information
farthinker committed Feb 25, 2015
1 parent 8e6c9d2 commit 9c81fc0
Show file tree
Hide file tree
Showing 12 changed files with 752 additions and 720 deletions.
Binary file modified fonts/simditor.eot
Binary file not shown.
Binary file modified fonts/simditor.woff
Binary file not shown.
Binary file modified site/assets/fonts/simditor.eot
Binary file not shown.
Binary file modified site/assets/fonts/simditor.woff
Binary file not shown.
4 changes: 4 additions & 0 deletions site/assets/styles/simditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
content: '\f015';
}

.simditor-icon-smile-o:before {
content: '\f016';
}

.simditor {
position: relative;
border: 1px solid #c9d8db;
Expand Down
2 changes: 1 addition & 1 deletion spec/core-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
expect($simditor).toExist();
expect($simditor.find('> .simditor-wrapper > .simditor-body')).toExist();
expect($simditor.find('> .simditor-wrapper > .simditor-placeholder')).toExist();
expect($simditor.find('> textarea#editor')).toExist();
expect($simditor.find('> .simditor-wrapper > textarea#editor')).toExist();
expect(editor.el).toHaveClass('simditor');
expect(editor.body).toHaveClass('simditor-body');
return expect(editor.wrapper).toHaveClass('simditor-wrapper');
Expand Down
2 changes: 1 addition & 1 deletion spec/src/core-spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe 'A Simditor instance', ->
expect($simditor).toExist()
expect($simditor.find('> .simditor-wrapper > .simditor-body')).toExist()
expect($simditor.find('> .simditor-wrapper > .simditor-placeholder')).toExist()
expect($simditor.find('> textarea#editor')).toExist()
expect($simditor.find('> .simditor-wrapper > textarea#editor')).toExist()

expect(editor.el).toHaveClass('simditor')
expect(editor.body).toHaveClass('simditor-body')
Expand Down
Loading

0 comments on commit 9c81fc0

Please sign in to comment.