You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/03/12 18:17:25 UTC
[8/8] git commit: MARMOTTA-182: added some minimum stule,
plus the image with the sad marmot created by Oliver
MARMOTTA-182: added some minimum stule, plus the image with the sad marmot created by Oliver
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2b732de3
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2b732de3
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2b732de3
Branch: refs/heads/develop
Commit: 2b732de378389c2b9c22b0308945e2c074d388d7
Parents: bb52d27
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Mar 12 18:14:45 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Mar 12 18:14:45 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/templates/error.ftl | 4 +--
.../web/public/img/logo/marmotta-sad.png | Bin 0 -> 37916 bytes
.../resources/web/public/style/blue/error.css | 28 +++++-------------
.../resources/web/public/style/white/error.css | 29 +++++--------------
4 files changed, 18 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b732de3/platform/marmotta-core/src/main/resources/templates/error.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/error.ftl b/platform/marmotta-core/src/main/resources/templates/error.ftl
index ef39fbb..9e1f35d 100644
--- a/platform/marmotta-core/src/main/resources/templates/error.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/error.ftl
@@ -24,7 +24,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <title>${status} ${reason} - Linked Data Explorer - Apache Marmotta</title>
+ <title>${status} ${reason} - Marmotta Error</title>
<script src="${SERVER_URL}webjars/jquery/1.8.2/jquery.min.js" type="text/javascript" ></script>
<link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}${DEFAULT_STYLE}rdfhtml.css" rel="stylesheet" type="text/css" />
@@ -38,7 +38,7 @@
<a id="logo" href="${SERVER_URL}" title="${PROJECT}">
<img src="${SERVER_URL}${LOGO}" alt="${PROJECT} logo" />
</a>
- <h1>Marmotta Linked Data Explorer</h1>
+ <h1>Marmotta Error</h1>
<div class="clean"></div>
</div>
<div class="clear"></div>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b732de3/platform/marmotta-core/src/main/resources/web/public/img/logo/marmotta-sad.png
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/img/logo/marmotta-sad.png b/platform/marmotta-core/src/main/resources/web/public/img/logo/marmotta-sad.png
new file mode 100644
index 0000000..cbd3b2e
Binary files /dev/null and b/platform/marmotta-core/src/main/resources/web/public/img/logo/marmotta-sad.png differ
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b732de3/platform/marmotta-core/src/main/resources/web/public/style/blue/error.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/error.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/error.css
index fc35268..623acb4 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/blue/error.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/error.css
@@ -16,28 +16,16 @@
* limitations under the License.
*/
-div#header h1, div#center {
- width: auto;
- min-height: 400px;
- margin: 0;
-}
-
div#center {
- padding: 2em 30% 2em 30%;
+ float: none;
+ width: 60%;
+ padding-left: 20%;
+ padding-bottom: 8em;
}
-div#center {
- float: none;
- vertical-align: middle;
- padding: 2em 30% 5em 30%;
-}
-
-div#center > * {
- margin-top: 2em;
+div#content {
+ min-height: 200px;
font-size: 1.6em;
-}
-
-div#center > p > a > img {
- vertical-align: text-top;
- margin-left: 0.15em;
+ background: #ffffff url('../../img/logo/marmotta-sad.png') no-repeat right top;
+ padding-right: 220px;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b732de3/platform/marmotta-core/src/main/resources/web/public/style/white/error.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/error.css b/platform/marmotta-core/src/main/resources/web/public/style/white/error.css
index 9d3b62a..623acb4 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/white/error.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/error.css
@@ -16,29 +16,16 @@
* limitations under the License.
*/
-div#header h1, div#center {
- width: auto;
- min-height: 400px;
- margin: 0;
-}
-
-div#center {
- padding: 2em 30% 2em 30%;
-}
-
div#center {
- float: none;
- vertical-align: middle;
- padding: 2em 30% 5em 30%;
+ float: none;
+ width: 60%;
+ padding-left: 20%;
+ padding-bottom: 8em;
}
-div#center > * {
- margin-top: 2em;
+div#content {
+ min-height: 200px;
font-size: 1.6em;
+ background: #ffffff url('../../img/logo/marmotta-sad.png') no-repeat right top;
+ padding-right: 220px;
}
-
-div#center > p > a > img {
- vertical-align: text-top;
- margin-left: 0.15em;
-}
-