You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/08/06 13:00:23 UTC
[sling-org-apache-sling-starter-content] branch master updated:
SLING-8615 - Move to a resource-centric setup
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-content.git
The following commit(s) were added to refs/heads/master by this push:
new 9e2c3d7 SLING-8615 - Move to a resource-centric setup
9e2c3d7 is described below
commit 9e2c3d7cab86182deb33cb5871b26f821e1fe84c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 2 11:13:20 2019 +0300
SLING-8615 - Move to a resource-centric setup
---
.../starter => frontend/src/img}/sling-logo.svg | 0
src/main/frontend/src/scss/index.scss | 4 +
src/main/resources/content/ROOT.json | 4 +-
.../sling/starter/home/home.html} | 3 +-
src/main/resources/content/content/starter.json | 7 +
.../resources/content/content/starter/gradient.png | Bin 4044 -> 0 bytes
.../content/content/starter/sling-logo.png | Bin 2957 -> 0 bytes
.../resources/content/content/starter/sling.css | 219 ---------------------
8 files changed, 14 insertions(+), 223 deletions(-)
diff --git a/src/main/resources/content/content/starter/sling-logo.svg b/src/main/frontend/src/img/sling-logo.svg
similarity index 100%
rename from src/main/resources/content/content/starter/sling-logo.svg
rename to src/main/frontend/src/img/sling-logo.svg
diff --git a/src/main/frontend/src/scss/index.scss b/src/main/frontend/src/scss/index.scss
index a386551..bf31434 100755
--- a/src/main/frontend/src/scss/index.scss
+++ b/src/main/frontend/src/scss/index.scss
@@ -123,4 +123,8 @@ a {
#login-signedin {
display: none;
}
+}
+
+.highlight {
+ background-color: yellow;
}
\ No newline at end of file
diff --git a/src/main/resources/content/ROOT.json b/src/main/resources/content/ROOT.json
index 82ca218..31c3367 100644
--- a/src/main/resources/content/ROOT.json
+++ b/src/main/resources/content/ROOT.json
@@ -1,8 +1,8 @@
{
"sling:resourceType": "sling:redirect",
- "sling:target": "/starter/index.html",
+ "sling:target": "/starter.html",
"content" : {
"sling:resourceType": "sling:redirect",
- "sling:target": "/starter/index.html"
+ "sling:target": "/starter.html"
}
}
diff --git a/src/main/resources/content/content/starter/index.html b/src/main/resources/content/apps/sling/starter/home/home.html
similarity index 98%
rename from src/main/resources/content/content/starter/index.html
rename to src/main/resources/content/apps/sling/starter/home/home.html
index 979164f..482b32b 100755
--- a/src/main/resources/content/content/starter/index.html
+++ b/src/main/resources/content/apps/sling/starter/home/home.html
@@ -32,7 +32,7 @@
<div class="Gradient"></div>
<header class="Cell Medium-35 Large-25 Align-Center Logos">
<a href="http://sling.apache.org" target="_blank" rel="noopener" id="sling-logo" title="Visit the Apache Sling website">
- <img src="../content/starter/sling-logo.svg" alt="Apache Sling Logo"/>
+ <img src="../content/starter/img/sling-logo.svg" alt="Apache Sling Logo"/>
</a>
<a href="http://apache.org" target="_blank" rel="noopener" id="asf-logo" title="Visit the Apache Software Foundation website">
<img src="../content/starter/img/asf-logo.svg" alt="Apache Software Foundation Logo"/>
@@ -99,7 +99,6 @@
unknown.style.display = 'none';
});
</script>
-
<!-- Do not remove this comment, used for Starter integration tests -->
</body>
</html>
diff --git a/src/main/resources/content/content/starter.json b/src/main/resources/content/content/starter.json
new file mode 100644
index 0000000..644c39b
--- /dev/null
+++ b/src/main/resources/content/content/starter.json
@@ -0,0 +1,7 @@
+{
+ "sling:resourceType": "sling/starter/home",
+ "jcr:resourceType": "sling:Folder",
+ "hostname": {
+ "sling:resourceType": "sling/starter/hostname"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/content/content/starter/gradient.png b/src/main/resources/content/content/starter/gradient.png
deleted file mode 100644
index 6ddc10b..0000000
Binary files a/src/main/resources/content/content/starter/gradient.png and /dev/null differ
diff --git a/src/main/resources/content/content/starter/sling-logo.png b/src/main/resources/content/content/starter/sling-logo.png
deleted file mode 100644
index 69163d9..0000000
Binary files a/src/main/resources/content/content/starter/sling-logo.png and /dev/null differ
diff --git a/src/main/resources/content/content/starter/sling.css b/src/main/resources/content/content/starter/sling.css
deleted file mode 100644
index 91812ff..0000000
--- a/src/main/resources/content/content/starter/sling.css
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */ /* @override http://sling.apache.org/site/media.data/site.css */
-body {
- background-color: #ffffff;
- color: #3b3b3b;
- font-family: Tahoma, Arial, sans-serif;
- font-size: 10pt;
- line-height: 140%
-}
-
-h1,h2,h3,h4,h5,h6 {
- font-weight: normal;
- color: #000000;
- line-height: 100%;
-}
-
-h1 {
- font-size: 200%
-}
-
-h2 {
- font-size: 175%
-}
-
-h3 {
- font-size: 150%
-}
-
-h4 {
- font-size: 140%
-}
-
-h5 {
- font-size: 130%
-}
-
-h6 {
- font-size: 120%
-}
-
-a {
- color: #1980af
-}
-
-a:visited {
- color: #1980af
-}
-
-a:hover {
- color: #1faae9
-}
-
-.title {
- position: absolute;
- left: 1px;
- right: 1px;
- top: 25px;
- height: 81px;
- background: url(gradient.png) repeat-x;
- background-position: bottom;
-}
-
-.logo {
- position: absolute;
- width: 15em;
- height: 81px;
- text-align: center;
-}
-
-.logo img {
- height: 63px;
-}
-
-.header {
- text-align: right;
- margin-right: 20pt;
-}
-
-.menu {
- border-top: 10px solid #f9bb00;
- position: absolute;
- top: 107px;
- left: 1px;
- width: 15em;
- bottom: 0px;
- padding: 0px;
- background-color: #fcfcfc
-}
-
-.menu ul {
- background-color: #fdf5d9;
- list-style: none;
- padding-left: 4em;
- margin-top: 0px;
- padding-top: 2em;
- padding-bottom: 2em;
- margin-left: 0px;
- color: #4a4a43
-}
-
-.menu a {
- text-decoration: none;
- color: #4a4a43
-}
-
-.main {
- position: absolute;
- border-top: 10px solid #cde0ea;
- top: 107px;
- left: 15em;
- right: 1px;
- margin-left: 2px;
- padding-right: 4em;
- padding-left: 1em;
- padding-top: 1em;
-}
-
-.code {
- color: black;
- background-color: #eeeeee;
- border: solid 1px black;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-.codeHeader {
- text-align: center;
- font-family: monospace;
- border-bottom: 1px solid black;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-bottom: 0.5em;
-}
-
-.codeContent {
- padding: 0.5em
-}
-
-.codeContent pre {
- margin: 0em
-}
-
-.code-keyword {
- color: #880000
-}
-
-.code-quote {
- color: #008800
-}
-
-.code-object {
- color: #0000dd
-}
-
-.code-java {
- margin: 0em
-}
-
-.preformatted {
- color: black;
- background-color: #eeeeee;
- border: solid 1px black;
- padding: 0.5em
-}
-
-.preformattedContent pre {
- margin: 0em
-}
-
-table.confluenceTable {
- border-collapse: collapse;
- margin: 5px;
-}
-
-table.confluenceTable th.confluenceTh {
- background-color: #FDF5D9;
- border: 1px solid #CCCCCC;
- padding: 3px 4px;
- text-align: center;
-}
-
-table.confluenceTable td.confluenceTd {
- border: 1px solid #CCCCCC;
- padding: 3px 4px;
-}
-
-.infoMacro {
- background-color: #D8E4F1;
- border: 1px solid #3C78B5;
-}
-
-.noteMacro {
- background-color: #FFFFCE;
- border: 1px solid #F0C000;
-}
-
-.tipMacro {
- background-color: #DDFFDD;
- border: 1px solid #009900;
-}
-
-.warningMacro {
- background-color: #FFCCCC;
- border: 1px solid #CC0000;
-}