[FFmpeg-cvslog] [ffmpeg-web] branch master updated. c66bebc Do not add excessive margin for index <h4>

ffmpeg-cvslog at ffmpeg.org ffmpeg-cvslog at ffmpeg.org
Wed Sep 30 01:04:12 CEST 2015


The branch, master has been updated
       via  c66bebcd0dae15ff2dc5198f73174bebe53d682a (commit)
       via  e9ed4fe8aa9d68a6eec5f11cc184263cd1ac9c3a (commit)
      from  2c8a29870f1a8d5f03aad1db84cb9790c140d32e (commit)


- Log -----------------------------------------------------------------
commit c66bebcd0dae15ff2dc5198f73174bebe53d682a
Author:     Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Tue Sep 29 09:01:45 2015 -0700
Commit:     Timothy Gu <timothygu99 at gmail.com>
CommitDate: Tue Sep 29 16:03:54 2015 -0700

    Do not add excessive margin for index <h4>

diff --git a/src/less/style.less b/src/less/style.less
index adb6e17..6588ec7 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -392,18 +392,6 @@ code {
 // Download & Index page
 
 #download, #index {
-
-    h4 {
-        margin-top: 180px;
-    }
-    h4.first {
-        margin-top: 20px;
-        small {
-            color: inherit;
-            font-size: 1em;
-        }
-    }
-
     .btn-download-wrapper {
         text-align: center;
         margin: 160px auto;
@@ -431,6 +419,18 @@ code {
 }
 
 #download {
+
+    h4 {
+        margin-top: 180px;
+    }
+    h4.first {
+        margin-top: 20px;
+        small {
+            color: inherit;
+            font-size: 1em;
+        }
+    }
+
     .btn-download-wrapper {
         margin: 40px auto;
     }

commit e9ed4fe8aa9d68a6eec5f11cc184263cd1ac9c3a
Author:     Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Tue Sep 29 08:59:35 2015 -0700
Commit:     Timothy Gu <timothygu99 at gmail.com>
CommitDate: Tue Sep 29 16:03:54 2015 -0700

    Looser Bower dependency versioning

diff --git a/bower.json b/bower.json
index 1fbe902..7d1e9ad 100644
--- a/bower.json
+++ b/bower.json
@@ -5,9 +5,9 @@
     "homepage": "http://ffmpeg.org/",
     "main": "htdocs/style.css",
     "dependencies": {
-        "bootstrap": "3.3.1",
-        "font-awesome": "4.2.0",
-        "jquery": "2.1.1",
-        "less": "2.1.0"
+        "bootstrap": "^3.3.1",
+        "font-awesome": "^4.2.0",
+        "jquery": "^2.1.1",
+        "less": "^2.1.0"
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 bower.json          |  8 ++++----
 src/less/style.less | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 



More information about the ffmpeg-cvslog mailing list