[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:46 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=49cb298
The following commit has been merged in the master branch:
commit 49cb298bd0dee87a9340a824d52e0eb358da2511
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Sep 20 11:00:22 2015 +0000
#1111: Added small logo and some tweaks.
---
website/doxygen/doxy-boot.js | 4 +-
.../html/include/{exiv2.jpg => exiv2-logo-big.png} | Bin
website/html/include/exiv2-logo-small.png | Bin 0 -> 8263 bytes
website/html/include/exiv2.css | 47 +++++++++------------
website/master/archive.html.in | 13 +++---
website/master/index.html.in | 8 ++--
website/master/makernote.html.in | 18 ++++----
website/master/manpage.html.in | 17 +++-----
website/var/__navbar2__ | 4 +-
website/var/__navbar__ | 4 +-
10 files changed, 50 insertions(+), 65 deletions(-)
diff --git a/website/doxygen/doxy-boot.js b/website/doxygen/doxy-boot.js
index d4fdddf..6cd6756 100644
--- a/website/doxygen/doxy-boot.js
+++ b/website/doxygen/doxy-boot.js
@@ -1,6 +1,7 @@
$( document ).ready(function() {
$("div.title").addClass("h1");
+ $("div.title").wrap("<div class='page-header'></div>")
$("div.groupHeader").addClass("h1");
@@ -63,9 +64,6 @@ $( document ).ready(function() {
$('#MSearchBox').parent().remove();
- $('div.fragment.well div.line:first').css('margin-top', '15px');
- $('div.fragment.well div.line:last').css('margin-bottom', '15px');
-
$('table.doxtable').removeClass('doxtable').addClass('table table-striped table-bordered').each(function(){
$(this).prepend('<thead></thead>');
$(this).find('tbody > tr:first').prependTo($(this).find('thead'));
diff --git a/website/html/include/exiv2.jpg b/website/html/include/exiv2-logo-big.png
similarity index 100%
rename from website/html/include/exiv2.jpg
rename to website/html/include/exiv2-logo-big.png
diff --git a/website/html/include/exiv2-logo-small.png b/website/html/include/exiv2-logo-small.png
new file mode 100755
index 0000000..c5d1090
Binary files /dev/null and b/website/html/include/exiv2-logo-small.png differ
diff --git a/website/html/include/exiv2.css b/website/html/include/exiv2.css
index fc20698..b118e5b 100644
--- a/website/html/include/exiv2.css
+++ b/website/html/include/exiv2.css
@@ -3,11 +3,14 @@ body {
}
.navbar {
- margin-bottom: 0px;
+ margin-bottom: 0px;
}
-.exiv2index {
- margin-top: 30px;
+.navbar-brand {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 4px;
+ padding-right: 5px;
}
.margin-top-l {
@@ -19,27 +22,17 @@ body {
}
.margin-top-s {
- margin-top: 10px;
-}
-
-/* -------------------------------------------------------------------------- */
-/* Examples (Code) */
-PRE.fragment {
- border: 1px solid #CCCCCC;
- background-color: #f5f5f5;
- margin-top: 4px;
- margin-bottom: 4px;
- margin-left: 2px;
- margin-right: 8px;
- padding-left: 6px;
- padding-right: 6px;
- padding-top: 4px;
- padding-bottom: 4px;
-}
-SPAN.keyword { color: #008000 }
-SPAN.keywordtype { color: #604020 }
-SPAN.keywordflow { color: #e08000 }
-SPAN.comment { color: #800000 }
-SPAN.preprocessor { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral { color: #008080 }
+ margin-top: 20px;
+}
+
+.margin-bottom-l {
+ margin-bottom: 50px;
+}
+
+.margin-bottom-m {
+ margin-bottom: 30px;
+}
+
+.margin-bottom-s {
+ margin-bottom: 20px;
+}
diff --git a/website/master/archive.html.in b/website/master/archive.html.in
index b2558d4..07a5472 100644
--- a/website/master/archive.html.in
+++ b/website/master/archive.html.in
@@ -4,16 +4,13 @@ __header4__
<body>
__navbar__
-<div class="jumbotron">
- <div class="container">
+<div class="container">
+ <div class="page-header">
<h1>Archive</h1>
- <p class="lead">All previously released versions of Exiv2.
- For the most current version, go to the <a title="Current version of Exiv2" href="download.html">download page</a>.
- </p>
</div>
-</div><!-- /.jumbotron -->
-
-<div class="container">
+ <p class="lead">All previously released versions of Exiv2.
+ For the most current version, go to the <a title="Current version of Exiv2" href="download.html">download page</a>.
+ </p>
<table class="table table-striped">
<colgroup>
diff --git a/website/master/index.html.in b/website/master/index.html.in
index fdfb088..7b9e2a5 100644
--- a/website/master/index.html.in
+++ b/website/master/index.html.in
@@ -5,8 +5,8 @@ __header4__
__navbar__
<div class="container">
- <div class="jumbotron text-center exiv2index">
- <img src="include/exiv2.jpg" alt="Exiv2 home page">
+ <div class="jumbotron text-center margin-top-m">
+ <img src="include/exiv2-logo-big.png" alt="Exiv2 home page">
__maintitle__
<p class="lead">Exiv2 is a <a href="getting-started.html#lib">C++ library</a> and a <a href="getting-started.html#util">command line utility</a>
to manage image <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a>.
@@ -17,10 +17,8 @@ __navbar__
of images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
Exiv2 is available as <a href="download.html#license">free software</a> and with a
<a href="download.html#license">commercial license</a>, and is used in many projects.
- <br>
-
</p>
- <a href="download.html" class="btn btn-lg btn-success">
+ <a href="download.html" class="btn btn-lg btn-success margin-top-s">
<span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Download Exiv2
</a>
</div><!-- /.jumbotron -->
diff --git a/website/master/makernote.html.in b/website/master/makernote.html.in
index ccc99f5..7fda509 100644
--- a/website/master/makernote.html.in
+++ b/website/master/makernote.html.in
@@ -4,19 +4,17 @@ __header4__
<body>
__navbar__
-<div class="jumbotron">
- <div class="container">
+<div class="container">
+ <div class="page-header">
<h1>The Exif Makernote</h1>
- <p class="lead">
- The Makernote is tag 0x927c in the Exif IFD, <code>Exif.Photo.MakerNote</code>. According to
- the <a title="The Exif 2.2 standard (PDF)" href="Exif2-2.PDF">Exif 2.2 standard</a>, the makernote
- is <i>"a tag for manufacturers of Exif writers to record any desired information. The contents are
- up to the manufacturer, but this tag should not be used for any other than its intended purpose."</i>
- </p>
</div>
-</div><!-- /.jumbotron -->
+ <p class="lead">
+ The Makernote is tag 0x927c in the Exif IFD, <code>Exif.Photo.MakerNote</code>. According to
+ the <a title="The Exif 2.2 standard (PDF)" href="Exif2-2.PDF">Exif 2.2 standard</a>, the makernote
+ is <i>"a tag for manufacturers of Exif writers to record any desired information. The contents are
+ up to the manufacturer, but this tag should not be used for any other than its intended purpose."</i>
+ </p>
-<div class="container">
<p>Most vendors do not publish their makernote specifications. Most of the
<a href="#R0">specifications available on the Internet</a>
were reverse-engineered. Judging from the size of many makernote
diff --git a/website/master/manpage.html.in b/website/master/manpage.html.in
index d8d45fb..cad16c3 100644
--- a/website/master/manpage.html.in
+++ b/website/master/manpage.html.in
@@ -4,18 +4,15 @@ __header4__
<body>
__navbar__
-<div class="jumbotron">
- <div class="container">
+<div class="container">
+ <div class="page-header">
<h1>Exiv2 utility manual page</h1>
- <p class="lead">A Unix-style "manpage" for the Exiv2 command line utility.
- </p>
- <a href="exiv2-manpage.pdf" title="Exiv2 man page (PDF)" class="btn btn-lg btn-danger">
- <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Download PDF
- </a>
</div>
-</div><!-- /.jumbotron -->
-
-<div class="container">
+ <p class="lead">A Unix-style "manpage" for the Exiv2 command line utility.
+ </p>
+ <a href="exiv2-manpage.pdf" title="Exiv2 man page (PDF)" class="btn btn-danger margin-bottom-m">
+ <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Download PDF
+ </a>
__manpage__
diff --git a/website/var/__navbar2__ b/website/var/__navbar2__
index 8ea5480..e213c9f 100644
--- a/website/var/__navbar2__
+++ b/website/var/__navbar2__
@@ -7,7 +7,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="../index.html">Exiv2</a>
+ <a class="navbar-brand" href="../index.html">
+ <img alt="Exiv2" src="../include/exiv2-logo-small.png">
+ </a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
diff --git a/website/var/__navbar__ b/website/var/__navbar__
index afe88b4..a2bda1a 100644
--- a/website/var/__navbar__
+++ b/website/var/__navbar__
@@ -7,7 +7,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="index.html">Exiv2</a>
+ <a class="navbar-brand" href="index.html">
+ <img alt="Exiv2" src="include/exiv2-logo-small.png">
+ </a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list