Skip to content

Commit

Permalink
Merge pull request #13 from NitinBhasneria/latestChanges
Browse files Browse the repository at this point in the history
Latest changes of bevacqua / woofmark
  • Loading branch information
jywarren authored Jul 14, 2020
2 parents c197016 + bdd0a99 commit 4f8d765
Show file tree
Hide file tree
Showing 21 changed files with 23,826 additions and 9,557 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "woofmark",
"version": "3.0.2",
"version": "4.0.3",
"description": "Barking up the DOM tree. A modular, progressive, and beautiful Markdown and HTML editor",
"main": "dist/woofmark.js",
"homepage": "https://github.com/bevacqua/woofmark",
Expand Down
8 changes: 8 additions & 0 deletions changelog.markdown
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 4.2.1 Bureaucracy

- Use `bureaucracy` as a replacement for file upload browsing

# 4.1.1 Value Add

- Changed `.value()` method into a getter/setter

# 4.0.3 Hard Place

- Drastically simplified selection remembrance architecture, relayed to parsers that know better
Expand Down
28,081 changes: 19,044 additions & 9,037 deletions dist/example.js

Large diffs are not rendered by default.

1,812 changes: 1,445 additions & 367 deletions dist/woofmark.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/woofmark.min.js

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions example/example.css
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,85 @@ kbd {
#ta {
font-family: Consolas, monaco, monospace;
}


/* Carbon */

#carbonads {
position: absolute;
display: block;
overflow: hidden;
margin-left: -180px;
padding: 1em;
margin-top: 30px;
max-width: calc(130px + 2em);
background-color: hsla(0, 0%, 100%, 0.2);
text-align: center;
font-size: 12px;
font-family: Verdana, "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.5;
}

#carbonads a {
color: inherit;
text-decoration: none;
font-weight: 400;
transition: color .2s ease-in-out;
}

#carbonads a:hover {
color: #2c3e50;
}

#carbonads span {
display: block;
overflow: hidden;
}

.carbon-img {
display: block;
margin: 0 auto 1em;
}

.carbon-text {
display: block;
margin-bottom: 1em;
}

.carbon-poweredby {
display: block;
text-transform: uppercase;
letter-spacing: 1px;
font-size: 9px;
}

@media only screen and (min-width: 320px) and (max-width: 960px) {
#carbonads {
position: relative;
float: none;
margin: 0 auto -2.5em;
max-width: 330px;
}
#carbonads span {
position: relative;
}
#carbonads > span {
max-width: none;
}
.carbon-img {
float: left;
margin: 0 1em 0 0;
}
.carbon-text {
float: left;
margin-bottom: 0;
max-width: calc(100% - 130px - 1em);
text-align: left;
}
.carbon-poweredby {
position: absolute;
right: 0;
bottom: 0;
display: block;
}
}
3 changes: 1 addition & 2 deletions example/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ woofmark(document.querySelector('#ta'), {
},
attachments: {
url: '/uploads/attachments'
},
xhr: mockXhr
}
});

function parseHTML (value, options) {
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ <h3>Barking up the DOM tree. <b>**woof** &lt;strong&gt;woof&lt;/strong&gt;</b><b
<a href='https://github.com/bevacqua/woofmark'>
<img class='gh-fork' src='https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67' alt='Fork me on GitHub' data-canonical-src='https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' />
</a>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=githubcombevacqua" id="_carbonads_js"></script>
<div class='parent'>
<label for='ta'>Create your website in the area below: </label>
<div>
Expand Down
Loading

0 comments on commit 4f8d765

Please sign in to comment.