Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 29 insertions, 10 deletions

diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css
index 6b3fc625..2dad74ab 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css
@@ -4,8 +4,13 @@
 
 .wikiEditor-ui-toolbar {
 	position: relative;
-	width: 100%;
+	display: block;
+}
+
+.wikiEditor-ui-toolbar .empty {
+	display: none;
 }
+
 /* Expandable Sections */
 .wikiEditor-ui-toolbar .sections {
 	float: left;
@@ -14,12 +19,16 @@
 	height: 0;
 }
 .wikiEditor-ui-toolbar .sections .section {
-	display: none;
 	float: left;
 	width: 100%;
-	border-top: solid 1px #DDDDDD;
+	border-top: 1px solid #DDDDDD;
 	background-color: #E0EEf7;
 }
+
+.wikiEditor-ui-toolbar .sections .section-hidden {
+	display: none;
+}
+
 .wikiEditor-ui-toolbar {
 	/* @embed */
 	background-image: url(images/toolbar/base.png);
@@ -47,14 +56,15 @@
 .wikiEditor-ui-toolbar .section-main {
 	position: relative;
 	float: left;
-	height: 26px;
+	min-height: 26px;
+	height: 100%;
 }
 /* Groups */
 .wikiEditor-ui-toolbar .group {
 	float: left;
 	height: 26px;
 	padding-right: 6px;
-	border-right: solid 1px #DDDDDD;
+	border-right: 1px solid #DDDDDD;
 	margin: 3px;
 }
 .wikiEditor-ui-toolbar .group-search {
@@ -68,8 +78,14 @@
 }
 /* Sprited Buttons */
 .wikiEditor-toolbar-spritedButton { 
+	background-image: url('images/toolbar/button-sprite.png');
 	/* @embed */
-	background: url(images/toolbar/button-sprite.png) 0 0 no-repeat;
+	background-image: -webkit-linear-gradient(transparent, transparent), url('images/toolbar/button-sprite.svg');
+	/* @embed */
+	background-image: linear-gradient(transparent, transparent), url('images/toolbar/button-sprite.svg');
+
+	background-position: 0 0;
+	background-repeat: no-repeat;
 	display: block;
 	float: left;
 	height: 22px;
@@ -141,7 +157,7 @@
 	margin: 2px;
 	height: 22px;
 	cursor: pointer;
-	border: solid 1px silver;
+	border: 1px solid silver;
 	padding: 0;
 	margin-right: 0;
 	cursor: pointer;
@@ -166,7 +182,7 @@
 	display: none;
 	margin-left: -1px;
 	margin-top: 22px;
-	border: solid 1px silver;
+	border: 1px solid silver;
 	background-color: #ffffff;
 }
 .wikiEditor-ui-toolbar .group .tool-select .options .option {
@@ -231,7 +247,7 @@
 }
 .wikiEditor-ui-toolbar .page-table td {
 	color: black;
-	border-top: solid 1px #EEEEEE;
+	border-top: 1px solid #EEEEEE;
 }
 .wikiEditor-ui-toolbar .page-table th,
 .wikiEditor-ui-toolbar .page-table td {
@@ -239,6 +255,9 @@
 	padding: 5px;
 	margin: 0;
 }
+.wikiEditor-ui-toolbar .section-help .page-table .cell {
+	vertical-align: top;
+}
 .wikiEditor-ui-toolbar .section-help .page-table td.cell-syntax,
 .wikiEditor-ui-toolbar .section-help .page-table td.syntax {
 	font-family: monospace, "Courier New";
@@ -255,7 +274,7 @@
 }
 /* Characters Pages */
 .wikiEditor-ui-toolbar .page-characters div span {
-	border: solid 1px #DDDDDD;
+	border: 1px solid #DDDDDD;
 	padding: 5px;
 	padding-left: 8px;
 	padding-right: 8px;