You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/11/28 12:24:15 UTC
git commit: MARMOTTA-360: applying patch by Oliver
Updated Branches:
refs/heads/develop 767d21033 -> 51418bcb6
MARMOTTA-360: applying patch by Oliver
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/51418bcb
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/51418bcb
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/51418bcb
Branch: refs/heads/develop
Commit: 51418bcb6a7d2cdd48b50f9836d70559b61e13ff
Parents: 767d210
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Nov 28 12:22:57 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Nov 28 12:23:42 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/templates/admin.ftl | 2 +-
.../resources/web/public/style/blue/style.css | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/51418bcb/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 92ade05..85a9e65 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -106,7 +106,7 @@
</#list>
</ul>
<div class="clear"></div>
- <div id="content">
+ <div id="content" class="contentWrap">
${CONTENT}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/51418bcb/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
index 44a1dfc..ac1d014 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
@@ -80,7 +80,7 @@ a#logo img {
box-shadow: 0px 0px 8px #555;
}
-#content h1 {
+.contentWrap h1 {
border-radius: 3px;
-webkit-border-radius: 3px;
border-width: 1px;
@@ -91,7 +91,7 @@ a#logo img {
color: white;
}
-#content h2 {
+.contentWrap h2 {
border-radius: 3px;
-webkit-border-radius: 3px;
border-width: 1px;
@@ -102,21 +102,21 @@ a#logo img {
color: #0B61A4;
}
-#content h3 {
+.contentWrap h3 {
padding: 3px;
text-decoration: underline;
}
-#content h4 {
+.contentWrap h4 {
padding: 3px;
text-decoration: underline;
}
-#content p {
+.contentWrap p {
padding: 3px;
}
-#content pre {
+.contentWrap pre {
border-width: 1px;
border-style: dotted;
overflow: auto;
@@ -126,11 +126,11 @@ a#logo img {
border-color: black;
}
-#content .tt {
+.contentWrap .tt {
font-family: monospace;
}
-#content li {
+.contentWrap li {
line-height: 1.5;
}
@@ -312,7 +312,7 @@ ul.center_submenu a {
ul.center_submenu li.active a {
text-decoration: none;
}
-#content {
+.contentWrap {
border-top-left-radius: 0;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;