Compare commits

...

19 Commits

Author SHA1 Message Date
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
10 changed files with 1657 additions and 2090 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

View File

@@ -1,9 +1,73 @@
.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: 30% auto;
grid-template-areas:
"header header"
"sidebar content"
"footer footer";
}
}
.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: 3em;
}
h3 {
font-size: 2em;
}
.intro-lead {
@@ -39,11 +103,6 @@ img {
margin-bottom: 18px;
}
h1 {
letter-spacing: 8px;
font-size: 86px;
line-height: 120px;
}
div {
font-family: 'Merriweather', serif;
@@ -114,15 +173,3 @@ div {
.footnote {
font-size: 90%;
}
@media only screen and (min-width: 576px) {
img {
max-width: 60%;
}
}
@media only screen and (min-width: 992px) {
img {
width: 100%;
}
}

BIN
img/cc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

3607
index.html

File diff suppressed because it is too large Load Diff

View File

@@ -4,25 +4,21 @@ $(document).ready(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
$(id).collapse('show');
$('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
$(id + " .link").empty();
$(id + " .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
$('span[data-toggle="collapse"]').on("click", function(){
id = $(this).attr("data-target");
window.location.hash = id
$(id + " .link").empty();
$(id + " .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