Compare commits

...

82 Commits

Author SHA1 Message Date
Ashley
affae48547 Merge pull request #275 from amiaopensource/break-lines-for-code-blocks
breaks long long lines for code and dt blocks
2017-11-01 11:37:22 -04:00
Ashley Blewer
11ab1ae731 breaks long long lines for code and dt blocks 2017-10-31 22:57:57 -04:00
Ashley
6b324152ac Merge pull request #273 from kfrn/gh-pages
Add max width on example images
2017-10-31 10:45:37 -04:00
kfrn
edaa0a3443 Merge branch 'gh-pages' of https://github.com/amiaopensource/ffmprovisr into gh-pages 2017-10-31 23:33:53 +13:00
kfrn
133f81db8e Add max width on example images 2017-10-31 23:32:32 +13:00
Ashley
634f72213b Merge pull request #272 from kfrn/gh-pages
Fix sizing issue at large resolutions
2017-10-30 22:40:05 -04:00
kfrn
94049d2338 Include CSS grid-template-areas on largest media query 2017-10-31 00:11:42 +13:00
Ashley
46356c3b98 Merge pull request #271 from kfrn/gh-pages
Add entry on stream mapping
2017-10-29 14:27:26 -04:00
kfrn
53d3cf8a74 Add entry on stream mapping 2017-10-30 00:26:37 +13:00
Katherine Frances Nagels
46ffb01181 Merge pull request #269 from kfrn/gh-pages
Remove max width for content <div>
2017-10-23 13:02:59 +13:00
kfrn
fe937d7e4a Remove max width for content <div> 2017-10-23 12:52:44 +13:00
Reto Kromer
2cc48104b1 Merge pull request #268 (nits) 2017-10-19 20:09:49 +02:00
Reto Kromer
7e7942149e nits
- capitalise abbreviation
- uniformise style
2017-10-19 19:42:31 +02:00
Ashley
35a217c20b Merge pull request #265 from amiaopensource/bye-bootstrap
removes reliance on bootstrap; moves necessary code to css/js
2017-10-19 13:16:52 -04:00
Ashley Blewer
ac0697f1c4 gives ID to about section 2017-10-19 09:55:10 -04:00
Ashley Blewer
44ee05bcaf adjust slightly-off alignment near bottom of doc 2017-10-19 08:25:06 -04:00
Ashley Blewer
2e3c0b861b moves links to bottom of recipes, moves flip video image to vid properties 2017-10-19 08:18:47 -04:00
Ashley Blewer
f34858d644 re-fix js for links and firefox sizing weirdness 2017-10-18 20:56:35 -04:00
Ashley Blewer
c18a193973 patches link to command javascript 2017-10-18 17:17:55 -04:00
Ashley Blewer
8cce1275a8 name=one is unnecessary code 2017-10-18 17:14:22 -04:00
Ashley Blewer
fa08a2dbe8 gets more specific about FF word-break bug 2017-10-18 17:09:04 -04:00
Ashley Blewer
09e637e6c4 fix sizing/wordbreak malfunction in firefox 2017-10-18 16:39:26 -04:00
Ashley Blewer
5cb449afcc reduces font-weight and letter-spacing in ToC/recipes 2017-10-18 16:27:54 -04:00
Ashley Blewer
b0f2b62767 breaks lines at word for firefox 2017-10-18 16:25:56 -04:00
Ashley Blewer
48a51a6f6a removes reliance on bootstrap; moves necessary code to css/js 2017-10-18 16:02:04 -04:00
Ashley
c552ffe699 Merge pull request #264 from amiaopensource/patch-create-video-div
patch error in create vid div
2017-10-18 13:38:06 -04:00
Ashley Blewer
f4850a6010 patch error in create vid div 2017-10-18 13:33:21 -04:00
Ashley
0bddb123e1 Merge pull request #263 from amiaopensource/cleans-hover-css
cleans up hover css, keeps text white on hover
2017-10-18 12:34:05 -04:00
Ashley Blewer
66139ce781 cleans up hover css, keeps text white on hover 2017-10-18 12:00:37 -04:00
Ashley
921b75bb2e Merge pull request #262 from amiaopensource/turn-buttons-into-div-rows
changes buttons into div-rows
2017-10-18 11:51:42 -04:00
Ashley Blewer
1e705b4914 add cursor:pointer and adjust transition speed 2017-10-17 21:43:50 -04:00
Ashley Blewer
cf8756ced7 adds position:relative; for the vhs in ToC 2017-10-17 21:17:50 -04:00
Ashley Blewer
c6a579a0bf changes buttons into div-rows 2017-10-17 21:03:04 -04:00
Ashley
494993d4c2 Merge pull request #261 from kfrn/gh-pages
More page reorg: thumbnails/GIFs, audio recipes
2017-10-17 18:29:33 -04:00
kfrn
a472a09597 Move Repair AV Sync recipe into audio section; delete repair section 2017-10-18 08:22:52 +13:00
kfrn
05460bde51 More page reorg: thumbnails/GIFs, audio recipes
- Recipes about creating thumbnails or GIFs now grouped together in the section "Create thumbnails or GIFs"
- New section: "Change or view audio properties". This replaces the previous section "Normalize/equalize audio", combining the recipes that were in that section with other audio recipes.
- Access mp3 with copyright notice recipe moved to "Change codec" section.
2017-10-18 08:15:24 +13:00
Ashley
0c32e03f3a Merge pull request #260 from kfrn/gh-pages
Reorder several sections of the page
2017-10-17 09:58:35 -04:00
kfrn
1ac02df52a Reorder several sections of the page 2017-10-17 18:51:26 +13:00
Ashley
24b8c5ac35 Merge pull request #259 from kfrn/gh-pages
Styling changes
2017-10-15 13:30:45 -04:00
kfrn
9fceb27952 Use same styling for ToC heading & info panel heading 2017-10-15 14:38:36 +13:00
kfrn
1e9629051f Styling changes: sizes/spacing, ToC b'ground, media q for desktop 2017-10-15 13:32:45 +13:00
Katherine Frances Nagels
b5e95143ca Merge pull request #258 from amiaopensource/btn-and-wordbreak
Moves CSS around, fixes overflow error on small devices
2017-10-15 11:26:28 +13:00
Ashley Blewer
0a2e1ca63a moves visual style to local css, simplifies button style to one class, breaks words on small screens 2017-10-14 14:00:28 -04:00
Ashley
21a019612c Merge pull request #256 from amiaopensource/toc-buttons
turns ToC buttons into div link table
2017-10-14 09:18:36 -04:00
Ashley Blewer
80ba7cfaa6 turns ToC buttons into div link table 2017-10-13 23:16:45 -04:00
Ashley
132a00f9e7 Merge pull request #255 from kfrn/gh-pages
More reorg
2017-10-13 19:41:41 -04:00
kfrn
d73ae6a382 New section: perceptual hashing to compare video content 2017-10-14 11:38:26 +13:00
kfrn
f427a05c89 Move 'Record and Live-Stream simultaneously' to 'Other' section
It's not an ideal home for it, but I think it doesn't really belong in the 'Advanced concepts' section, being a command rather than a concept.

I've also made a few small edits to the text of the command.
2017-10-14 11:33:53 +13:00
Ashley
3555a692dc Merge pull request #253 from amiaopensource/rm-modal-extras
we dont need tabindex or role:dialog without the modal
2017-10-13 13:59:14 -04:00
Ashley
11bf8d4de2 Merge branch 'gh-pages' into rm-modal-extras 2017-10-13 13:57:15 -04:00
Ashley
4ccf83b953 Merge pull request #252 from amiaopensource/shorten-button-names
shortens button names
2017-10-13 13:55:46 -04:00
Ashley Blewer
f6be6aa37e we dont need tabindex or role:dialog without the modal 2017-10-13 13:21:20 -04:00
Ashley Blewer
04432d0323 shortens button names 2017-10-13 12:48:37 -04:00
Ashley
ea323d4b01 Merge pull request #250 from amiaopensource/moves-cc-img
moves cc-by img into repo
2017-10-13 09:49:06 -04:00
Ashley
082f9a1175 Merge pull request #248 from amiaopensource/modals-go-inline
modals go inline instead of popup
2017-10-13 09:48:56 -04:00
Ashley Blewer
04776428c8 moves cc-by img into repo 2017-10-12 22:47:58 -04:00
Ashley Blewer
b1f7f5cad4 modals go inline instead of popup 2017-10-12 22:14:47 -04:00
Ashley
6d41096dd5 Merge pull request #247 from amiaopensource/fr-to-perc
changes fractions to percentages in grid template
2017-10-12 22:01:38 -04:00
Ashley
77c31a7c5c Merge pull request #246 from bastibeckr/gh-pages
Add stream-and-record command
2017-10-12 19:29:09 -04:00
Basti Becker
0c9086d70d Update requested changes
Fix HTML, some typos and improve some explanations. Thanks for review.
2017-10-12 12:49:35 +02:00
Ashley Blewer
2b6dfac5b0 changes fractions to percentages in grid template 2017-10-11 21:02:13 -04:00
Basti Becker
ba21f8b88d Add stream-and-record command
I wanted to contribute my livestream-and-record command to this great
collection.
2017-10-11 20:12:39 +02:00
Katherine Frances Nagels
b483acdb6d Merge pull request #244 from kfrn/gh-pages
Fix typo
2017-10-10 21:04:10 +13:00
kfrn
d91fb336b9 Fix typo 2017-10-10 21:02:13 +13:00
Katherine Frances Nagels
97f62ae600 Merge pull request #243 from amiaopensource/make-bigger
initial redesign: grow ffmprovsr
2017-10-10 19:37:16 +13:00
Ashley Blewer
98d2459b79 bring back the charset meta 2017-10-09 09:46:35 -04:00
Ashley Blewer
719e3a73f5 typos in css, again 2017-10-09 09:17:43 -04:00
Ashley Blewer
439f1933da typos in css 2017-10-09 09:16:21 -04:00
Reto Kromer
0f52cde91a info for other OS (#242) 2017-10-09 15:12:39 +02:00
Ashley Blewer
8a14c6e5fb initial redesign: grow ffmprovsr 2017-10-09 09:05:58 -04:00
Katherine Frances Nagels
8c04a58949 Merge pull request #241 from amiaopensource/rm-junk
removes junk that accidentally came into ffmprovisr
2017-10-09 21:43:36 +13:00
Ashley Blewer
6e93313528 removes junk that accidentally came into ffmprovisr 2017-10-08 22:19:46 -04:00
Katherine Frances Nagels
b7bc7218b8 Merge pull request #240 from kfrn/gh-pages
Reorganise some recipes + add filtergraph explanation 'command'
2017-10-08 10:39:35 +13:00
kfrn
7ec21fb6d2 Both info sections at top of page; consistent naming 2017-10-08 09:19:05 +13:00
kfrn
1e2b2dd18f Add target="_blank"s to links; correct to Set Stream Properties recipe
I've replaced the links in the Set Stream Properties recipe with a more specific link.
Also, according to the docs, the correct flag is -color_primaries, not -color_primary.
2017-10-08 01:05:36 +13:00
kfrn
9d4e18e6ef Improve descriptions; ffmpeg → FFmpeg as appropriate
Consistently use FFmpeg to refer to the program and ffmpeg for the command line invocation of the program.
Add another example to the 'asic structure of an FFmpeg command explanation.
Add a note on filter order to the Filtergraph explanation.
2017-10-08 00:47:31 +13:00
kfrn
61681c8dd3 Add basic command explanation; relocate filtergraph explanation
- New section at top: 'Getting started with ffmpeg'. Added basic command explanation under this heading.
- New section at bottom: 'Advanced ffmpeg concepts'. Filtergraph explanation moved there.
2017-10-07 21:35:05 +13:00
kfrn
71e68b5e2e Add filtergraph explanation in new ffmpeg concepts section 2017-10-07 16:02:08 +13:00
kfrn
872eec2aa7 Reorg items: section for GIFs, 'Modify speed' under 'Change Properties' 2017-10-07 14:57:40 +13:00
Katherine Frances Nagels
863f70054d Merge pull request #239 from kfrn/gh-pages
Add basic rewrap command
2017-10-07 10:15:58 +13:00
kfrn
16c8d68e39 Add note on terminology 2017-10-07 00:21:29 +13:00
kfrn
08593bb221 Add basic rewrap command 2017-10-07 00:06:29 +13:00
12 changed files with 2236 additions and 2407 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,23 +1,127 @@
html, body {
line-height: 1.5;
font-size: 16px;
color: #888888;
background-color: #060606;
margin: 0;
word-break: break-word;
}
.grid {
display: grid;
align-content: center;
grid-template-areas:
"header"
"sidebar"
"content"
"footer";
}
.header {
grid-area: header;
text-align: center;
}
.content {
grid-area: content;
}
.sidebar {
grid-area: sidebar;
}
.footer {
grid-area: footer;
text-align: center;
}
@media only screen and (max-width: 999px) {
.grid {
grid-template-columns: 1fr;
grid-template-areas:
"header"
"sidebar"
"content"
"footer";
}
}
@media only screen and (min-width: 1000px) {
.grid {
grid-gap: 1rem;
grid-template-columns: 25% auto;
grid-template-areas:
"header header"
"sidebar content"
"footer footer";
}
}
@media only screen and (min-width: 1500px) {
.grid {
max-width: 70%;
margin: 0 auto;
grid-template-areas:
"header header"
"sidebar content"
"footer footer";
}
}
a {
color: #91cf91;
}
a:hover {
color: #5cb85c;
}
a:visited {
color: #449d44;
}
.license img {
max-width: 10em;
display: inline;
}
h1, h2, h3, h4, h5, h6 {
font-family: 'Montserrat', sans-serif;
}
h1 {
letter-spacing: 0.1em;
font-size: 7vw;
}
h2 {
font-size: 24px;
font-size: 1.5em;
margin: 5px 8px 8px 8px;
}
.heading {
font-size: 2em;
margin: 6px 0px 12px 0px;
}
h3 {
font-size: 1.5em;
}
.intro-lead {
font-family: 'Montserrat', sans-serif;
font-size: 20px;
}
.select-from {
font-size: 16px;
font-size: 1em;
}
code {
padding: 2px 4px;
color: #c7254e;
background-color: #f9f2f4;
border-radius: 4px;
word-break: break-all;
word-wrap: break-word;
white-space: normal;
display: inline-block;
}
dd {
@@ -26,6 +130,10 @@ dd {
dt {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
word-break: break-all;
word-wrap: break-word;
white-space: normal;
display: inline-block;
}
img {
@@ -36,13 +144,10 @@ img {
}
.sample-image {
margin: 0 auto;
margin-bottom: 18px;
}
h1 {
letter-spacing: 8px;
font-size: 86px;
line-height: 120px;
max-width: 500px;
text-align: center;
}
div {
@@ -50,58 +155,67 @@ div {
color: white;
}
.btn {
margin: 8px;
display: inline-block;
vertical-align: middle;
-webkit-transform: translateZ(0);
transform: translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-moz-osx-font-smoothing: grayscale;
.sidebar a {
text-decoration: none;
}
.recipe, .contents-list {
color: white;
background-color: #383838;
padding: 14px;
font-family: "Montserrat";
letter-spacing: 0.05em;
border: 1px solid black;
cursor: pointer;
position: relative;
padding-left: 2.5em;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
}
.btn:before {
content: "💫";
position: absolute;
left: 1em;
padding: 0 1px;
-webkit-transform: translateZ(0);
transform: translateZ(0);
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-property: transform;
transition-property: transform;
-webkit-transition-timing-function: ease-out;
transition-timing-function: ease-out;
}
.btn:hover:before, .btn:focus:before, .btn:active:before {
-webkit-transform: scale(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
padding-left: 2.8em;
transition: all .5s ease-out;
}
.contents-list {
color: black;
font-size: 0.9em;
}
.contents-list:hover {
color: #2a9fd6;
nav .heading {
word-break: normal;
}
.recipe {
display: block;
width: 90%;
}
.recipe:hover, .contents-list:hover {
background-color: #449d44;
}
.recipe:before {
content: "💫";
}
.contents-list:before {
content: "📼"
content: "📼";
}
.recipe:before, .contents-list:before {
position: absolute;
left: 1em;
padding-right: 1em;
}
.recipe:hover:before, .recipe:focus:before, .recipe:active:before {
transform: scale(1.5) translateX(0.1em);
transition: 0.5s;
}
.contents-list:hover:before, .contents-list:focus:before, .contents-list:active:before {
transform: scale(1.8) translateX(0.3em);
transition: 0.5s;
}
.codeblock {
font-family: monospace
padding: 2px 4px;
font-size: 90%;
color: #c7254e;
background-color: #f9f2f4;
border-radius: 4px;
@@ -115,14 +229,29 @@ div {
font-size: 90%;
}
@media only screen and (min-width: 576px) {
img {
max-width: 60%;
}
.well {
padding: 1em;
margin-bottom: 0.5em;
background-color: #151515;
border: 1px solid #030303;
border-radius: 8px;
box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
}
@media only screen and (min-width: 992px) {
img {
width: 100%;
}
.hiding {
opacity: 0;
height: 0;
overflow: hidden;
}
input {
position: absolute;
left: -999em
}
input[type=checkbox]:checked + div {
opacity: 1;
height: auto;
overflow: hidden;
transition: opacity .5s linear, height .5s linear;
}

BIN
img/cc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

4324
index.html

File diff suppressed because it is too large Load Diff

6
js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,28 +1,20 @@
$(document).ready(function() {
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
// open modal window if a hash is found in URL
// open recipe window if a hash is found in URL
if(window.location.hash) {
$(window.location.hash).modal('show');
// add direct link to modal window
$(".link").empty();
$(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
id = window.location.hash
document.getElementById(id.substring(1)).checked = true;
$('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
$(id).closest('div').find('.link').empty();
$(id).closest('div').find('.link').append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
}
// add hash to URL when modal is opened
$('span[data-toggle="modal"]').on("click", function(){
window.location.hash = $(this).attr("data-target");
// add direct link to modal window
$(".link").empty();
$(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
});
// remove hash from URL when modal is closed
$(document).on('hide.bs.modal', function (e) {
history.pushState("", document.title, window.location.pathname);
// add hash URL when recipe is opened
$('label[class="recipe"]').on("click", function(){
id = $(this).attr("for");
window.location.hash = ('#' + id)
$('#' + id).closest('div').find('.link').empty();
$('#' + id).closest('div').find('.link').append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
});
});

View File

@@ -22,4 +22,6 @@ elif [[ "$(uname -s)" = "Linux" ]] ; then
ffmprovisr_path=$(find ~/.linuxbrew/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
fi
xdg-open "${ffmprovisr_path}"
else
echo "Please locate the 'ffmprovisr' folder, and open the 'index.html' file in a browser."
fi