Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
On Thu, Dec 04, 2014 at 12:55:05PM -0800, Timothy Gu wrote: > And with patch > From 51ff20706034f2d74e32a643727c71f404aeebaa Mon Sep 17 00:00:00 2001 > From: Timothy Gu > Date: Tue, 25 Nov 2014 19:50:06 -0800 > Subject: [PATCH] web: Update Bower dependencies > > Also explicitly add jQuery as a dependency. It is copied from the Makefile. applied [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Observe your enemies, for they first find out your faults. -- Antisthenes signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
On Thu, Dec 4, 2014 at 9:07 AM, db0 company wrote: > Did you check that the latest versions of the dependencies still make > the website look the same? I did, and it's OK. Timothy ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
On Thu, Dec 4, 2014 at 4:22 AM, Michael Niedermayer wrote: > On Wed, Dec 03, 2014 at 08:56:11PM -0800, Timothy Gu wrote: >> On Tue, Nov 25, 2014 at 7:50 PM, Timothy Gu wrote: >> > Also explicitly add jQuery as a dependency. It is copied from the Makefile. >> > >> > Signed-off-by: Timothy Gu >> > --- >> > bower.json| 9 +- >> > htdocs/css/bootstrap.min.css | 4 +- >> > htdocs/css/font-awesome.min.css | 4 +- >> > htdocs/fonts/FontAwesome.otf | Bin 75188 -> 85908 bytes >> > htdocs/fonts/fontawesome-webfont.eot | Bin 72449 -> 56006 bytes >> > htdocs/fonts/fontawesome-webfont.svg | 942 >> > +- >> > htdocs/fonts/fontawesome-webfont.ttf | Bin 141564 -> 112160 bytes >> > htdocs/fonts/fontawesome-webfont.woff | Bin 83760 -> 65452 bytes >> > htdocs/js/bootstrap.min.js| 5 +- >> > 9 files changed, 491 insertions(+), 473 deletions(-) >> >> Ping. > > Applying: web: Update Bower dependencies > fatal: corrupt patch at line 273 > > patching file bower.json > patching file htdocs/css/bootstrap.min.css It's probably just your mail client, as I tried applying the mail and it applies cleanly. Trying again with MIME attachment. You can also merge it from https://github.com/TimothyGu/ffmpeg-web.git branch master. Timothy ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
Did you check that the latest versions of the dependencies still make the website look the same? I remember having retro-compatibility issues with Bootstrap in the past, but that was a long time ago, so it's probably OK. -- db0 - Deby Barbara Lepage http://db0.fr/ ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
On Wed, Dec 03, 2014 at 08:56:11PM -0800, Timothy Gu wrote:
> On Tue, Nov 25, 2014 at 7:50 PM, Timothy Gu wrote:
> > Also explicitly add jQuery as a dependency. It is copied from the Makefile.
> >
> > Signed-off-by: Timothy Gu
> > ---
> > bower.json| 9 +-
> > htdocs/css/bootstrap.min.css | 4 +-
> > htdocs/css/font-awesome.min.css | 4 +-
> > htdocs/fonts/FontAwesome.otf | Bin 75188 -> 85908 bytes
> > htdocs/fonts/fontawesome-webfont.eot | Bin 72449 -> 56006 bytes
> > htdocs/fonts/fontawesome-webfont.svg | 942
> > +-
> > htdocs/fonts/fontawesome-webfont.ttf | Bin 141564 -> 112160 bytes
> > htdocs/fonts/fontawesome-webfont.woff | Bin 83760 -> 65452 bytes
> > htdocs/js/bootstrap.min.js| 5 +-
> > 9 files changed, 491 insertions(+), 473 deletions(-)
>
> Ping.
Applying: web: Update Bower dependencies
fatal: corrupt patch at line 273
patching file bower.json
patching file htdocs/css/bootstrap.min.css
patch: malformed patch at line 46:
tgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html
input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html
input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em
.625em .75em;margin:0 2px;border:1px solid
silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
I have often repented speaking, but never of holding my tongue.
-- Xenocrates
signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] web: Update Bower dependencies
On Tue, Nov 25, 2014 at 7:50 PM, Timothy Gu wrote: > Also explicitly add jQuery as a dependency. It is copied from the Makefile. > > Signed-off-by: Timothy Gu > --- > bower.json| 9 +- > htdocs/css/bootstrap.min.css | 4 +- > htdocs/css/font-awesome.min.css | 4 +- > htdocs/fonts/FontAwesome.otf | Bin 75188 -> 85908 bytes > htdocs/fonts/fontawesome-webfont.eot | Bin 72449 -> 56006 bytes > htdocs/fonts/fontawesome-webfont.svg | 942 > +- > htdocs/fonts/fontawesome-webfont.ttf | Bin 141564 -> 112160 bytes > htdocs/fonts/fontawesome-webfont.woff | Bin 83760 -> 65452 bytes > htdocs/js/bootstrap.min.js| 5 +- > 9 files changed, 491 insertions(+), 473 deletions(-) Ping. [...] Timothy ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
