Moved table styles to example. They are not part of the plugin.

thomasf1 · Oct 27, 2010 · d8f3543 · d8f3543
1 parent 8200073
commit d8f3543
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/WebContent/core/css.js b/WebContent/core/css.js
@@ -16,7 +16,6 @@
 		header.appendChild(cssElement(base + 'deps/extjs/resources/css/xtheme-gray.css?v=' + GENTICS.Aloha.version));
 		header.appendChild(cssElement(base + 'deps/prettyPhoto/resources/css/prettyPhoto.css?v=' + GENTICS.Aloha.version));
 		header.appendChild(cssElement(base + 'plugins/com.gentics.aloha.plugins.Table/resources/table.css?v=' + GENTICS.Aloha.version));
-		header.appendChild(cssElement(base + 'plugins/com.gentics.aloha.plugins.Table/resources/table-styles.css?v=' + GENTICS.Aloha.version));
 		header.appendChild(cssElement(base + 'plugins/com.gentics.aloha.plugins.Link/css/Link.css?v=' + GENTICS.Aloha.version));
 		header.appendChild(cssElement(base + 'plugins/com.gentics.aloha.plugins.HighlightEditables/css/HighlightEditables.css?v=' + GENTICS.Aloha.version));
 

diff --git a/WebContent/examples/AlohaWorld.css b/WebContent/examples/AlohaWorld.css
@@ -45,3 +45,35 @@ a.aloha {
   padding: 0px 13px 0px 0px;
 }
 
+/* Abbreviation styling */
+abbr, acronym
+{
+	border-bottom: .1em dotted;
+	cursor: help;
+}
+
+/* A basic table styling */
+table
+{
+  padding: 0;
+  margin: 0;
+  border-collapse: collapse;
+  border: 1px solid #333;
+  color: #000;
+}
+
+table caption
+{
+  caption-side: bottom;
+  font-size: 0.8em;
+  font-style: italic;
+  text-align: right;
+  padding: 0.5em 0;
+}
+
+table th, table td
+{
+  border: 1px solid #666;
+  padding: 0.5em;
+  text-align: left;
+}
diff --git a/WebContent/examples/AlohaWorld.html b/WebContent/examples/AlohaWorld.html
@@ -124,9 +124,13 @@ <h1 id="title">Aloha, World!</h1>
 </div>
 <div id="content" class="article">
 <h2>Etymology</h2>
-<p>The word <a href="http://en.wikipedia.org/wiki/Aloha" target="_blank" class="aloha">aloha</a> derives from the Proto-Polynesian root <i>*qalofa</i>. It has cognates in other Polynesian languages, such as Samoan alofa
+<p>The word <a href="http://en.wikipedia.org/wiki/Aloha-invalid" target="_blank" class="aloha">aloha</a> derives from the Proto-Polynesian root <i>*qalofa</i>. It has cognates in other Polynesian languages, such as Samoan alofa
 and Māori aroha, also meaning "love."</p>
-<p><a href="http://aloha-editor.com">Aloha Editor</a> is the word's most advanced browser based Editor made with aloha passion.</p>
+<table>
+<caption>with a caption.</caption>
+<tr><td>This</td><td>is</td></tr>
+<tr><td>a</td><td>table.</td></tr>
+</table>
 <p>A folk etymology claims that it derives from a compound of the <a href="http://en.wikipedia.org/wiki/Hawaii" target="_blank" class="aloha">Hawaiian</a> words alo meaning "presence", "front", "face", or "share"; and
 ha, meaning "breath of life" or "essence of life." Although alo does indeed mean "presence" etc., the word for breath is spelled with a macron
 or kahakō over the a (hā) whereas the word aloha does not have a long a.</p>

diff --git a/WebContent/plugins/com.gentics.aloha.plugins.Table b/WebContent/plugins/com.gentics.aloha.plugins.Table
diff --git a/build/css-includes.txt b/build/css-includes.txt
@@ -3,6 +3,5 @@ deps/extjs/resources/css/ext-all.css
 deps/extjs/resources/css/xtheme-gray.css
 deps/prettyPhoto/resources/css/prettyPhoto.css
 plugins/com.gentics.aloha.plugins.Table/resources/table.css
-plugins/com.gentics.aloha.plugins.Table/resources/table-styles.css
 plugins/com.gentics.aloha.plugins.Link/css/Link.css
 plugins/com.gentics.aloha.plugins.HighlightEditables/css/HighlightEditables.css