Merge pull request #1 from ironboundred/dogcraft

Dogcraft

CHANGELOG.md

@@ -1,3 +1,13 @@
+## Version 2.2.2
+* [bug] PR #350 Coding fix for missing </li> close
+
+## Version 2.2.1
+* [bug, CSS] Addressing Issue #342 Search Button Alignment
+* [bug, compatibility] Removing fastclick.js as all modern touch devices handle delay now Issue #336
+* [code] Removing unused js from `/assets/scripts/vendor`
+* [CSS, enhancement] Images MW way which fixes Issue #345
+* [bug, js] Fix to foreground.js script, edit icon (temporary as a long term edit vs visual editor is needed with CSS)
+
 ## Version 2.2
 * [bug][compatibility] Fix for MW version 1.32 - wfRunHooks() to Hooks::run() 
 

COPYING

@@ -1,3 +1,5 @@
+BSD 2-Clause License
+
 Copyright (c) 2013, Garrick Van Buren, Jamie Thingelstad, Tom Hutchison.
 All rights reserved.
 

Foreground.skin.php

@@ -124,15 +124,16 @@ class foregroundTemplate extends BaseTemplate {
 
 			<ul id="top-bar-left" class="left">
 				<li class="divider show-for-small"></li>
-					<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text())  ) { ?>
-				<li class="has-dropdown active"  id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
-					<a href="#"><?php echo htmlspecialchars( $box['header'] ); ?></a>
+				<?php foreach ( $this->getSidebar() as $boxName => $box ) { if ( ($box['header'] != wfMessage( 'toolbox' )->text())  ) { ?>
+					<li class="has-dropdown active"  id='<?php echo Sanitizer::escapeId( $box['id'] ) ?>'<?php echo Linker::tooltip( $box['id'] ) ?>>
+						<a href="#"><?php echo htmlspecialchars( $box['header'] ); ?></a>
 						<?php if ( is_array( $box['content'] ) ) { ?>
 							<ul class="dropdown">
 								<?php foreach ( $box['content'] as $key => $item ) { echo $this->makeListItem( $key, $item ); } ?>
 							</ul>
-								<?php } } ?>
 						<?php } ?>
+					</li>
+				<?php } } ?>
 			</ul>
 
 			<ul id="top-bar-right" class="right">

assets/stylesheets/foreground.css

@@ -1,3 +1,11 @@
+:root {
+  --main-color: #367FA9;
+  --second-color: #cce2ef;
+  --button-color: #970000;
+  --link-color: #009bff;
+  --link-hover-color: #367FA9;
+  --link-broken-color: #970000;
+}
 body {
 	line-height: 1.6em;
 }
@@ -134,7 +142,7 @@ alert.label a {
 }
 code {
 	font-weight: normal;
-	color: #222222;
+	color: var(--main-color);
 }
 small {
 	font-size: 80%;
@@ -661,23 +669,93 @@ h1#firstHeading {
 }
 }
 
-/* Don't like the black top bar? Copy this into your Foreground.css and change the colors 
+/* Don't like the black top bar? Copy this into your Foreground.css and change the colors */
 
 .top-bar, 
 .top-bar-section ul, 
 .top-bar-section ul li.active > a, 
 .top-bar-section li a:not(.button), 
 .top-bar-section .has-form {
-    background: #333333;
+    background: var(--main-color);
+}
+
+nav.top-bar,
+.top-bar.expanded .title-area {
+    background: var(--main-color);
+}
+
+#navwrapper {
+    background: var(--main-color);
+}
+
+ul#top-bar-left li,
+ul#top-bar-left li a
+ {
+    background: var(--main-color);
+}
+
+ul#top-bar-right li,
+ul#top-bar-right li a {
+    background: var(--main-color);
+}
+
+ul#top-bar-left li:hover,
+ul#top-bar-left li a:hover,
+ul#top-bar-right li:hover:not(.has-form),
+ul#top-bar-right li a:hover {
+    background: var(--second-color);
+    color: #fff;
+}
+
+.top-bar-section .has-dropdown > a:hover:after {
+    border-color: #fff transparent transparent transparent;
+}
+
+.top-bar-section .has-dropdown > a:hover:after {
+    border-color: #333 transparent transparent transparent;
+}
+/* Search button */
+button,
+.button,
+.multipleTemplateAdder {
+    background-color: var(--button-color);
+    border-color: var(--button-color);
+}
+button:hover,
+button:focus,
+.button:hover,
+.button:focus {
+    background-color: var(--button-color);
+}
+input#wpPreview {
+    background-color: var(--button-color);
+    border-color: var(--second-color);
+    color: #000000;
+}
+input[type="submit"] {
+    background-color: var(--button-color);
+    border-color: var(--second-color);
+}
+.label {
+    background-color: var(--button-color);
+} 
+a {
+    color: var(--link-color);
+}
+a:hover, a:focus {
+    color: var(--link-hover-color);
+}
+a.new {
+    color: var(--link-broken-color);
 }
 
+/* end custom nav bar */
 
 .top-bar-section > ul > .divider,
 .top-bar-section > ul > [role="separator"] {
   border-color: black;
 }
 
-*/
 
 .vertical-divider {
 	width: 100%;
@@ -768,7 +846,7 @@ a.label.new {
 }
 a#actions-button {
 	float: right;
-	z-index: 499;
+	z-index: 1;
 }
 
 /* Hide the page actions button for special pages (cuz there's nothing in it) */
@@ -823,7 +901,7 @@ alert.label a {
 }
 code {
 	font-weight: normal;
-	color: #222222;
+	color: var(--main-color);
 }
 small {
 	font-size: 80%;
@@ -1547,4 +1625,7 @@ td.htmlform-tip {
 .prefcache {
 	font-size: 90%;
 	margin-top: 1em;
-}
+}
+
+
+

assets/stylesheets/foundation.css

@@ -55,7 +55,7 @@ body {
   font-size: 100%; }
 
 body {
-  background: #fff;
+  background: #fffff0;
   color: #222;
   cursor: auto;
   font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
@@ -1170,11 +1170,11 @@ button, .button {
   button:hover, button:focus, .button:hover, .button:focus {
     color: #FFFFFF; }
   button.secondary, .button.secondary {
-    background-color: #e7e7e7;
+    background-color: #970000/* #e7e7e7 */;
     border-color: #b9b9b9;
-    color: #333333; }
+    color: #fff/*#333333*/; }
     button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
-      background-color: #b9b9b9; }
+      background-color: #cce2ef/*#b9b9b9*/; }
     button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
       color: #333333; }
   button.success, .button.success {
@@ -1817,9 +1817,9 @@ meta.foundation-mq-topbar {
     .top-bar.expanded .title-area {
       background: #333333; }
     .top-bar.expanded .toggle-topbar a {
-      color: #888888; }
+      color: #fff /*#888888*/; }
       .top-bar.expanded .toggle-topbar a span::after {
-        box-shadow: 0 0 0 1px #888888, 0 7px 0 1px #888888, 0 14px 0 1px #888888; }
+        box-shadow: 0 0 0 1px #fff /*#888888*/, 0 7px 0 1px #fff /*#888888*/, 0 14px 0 1px #fff /*#888888*/; }
     @media screen and (-webkit-min-device-pixel-ratio: 0) {
       .top-bar.expanded .top-bar-section .has-dropdown.moved > .dropdown,
       .top-bar.expanded .top-bar-section .dropdown {
@@ -3719,7 +3719,7 @@ td {
 
 /* Default Link Styles */
 a {
-  color: #008CBA;
+  color: #970000; /* 008CBA; */
   line-height: inherit;
   text-decoration: none; }
   a:hover, a:focus {

skin.json

@@ -1,6 +1,6 @@
 {
 	"name": "Foreground",
-	"version": "2.2.0",
+	"version": "2.2.2dev",
 	"author": [
 		"Garrick Van Buren",
 		"Jamie Thingelstad",
@@ -43,7 +43,6 @@
 		"skins.foreground.js": {
 			"position": "bottom",
 			"scripts": [
-				"assets/scripts/vendor/fastclick.js",
 				"assets/scripts/vendor/placeholder.js",
 				"assets/scripts/foundation/foundation.js",
 				"assets/scripts/foundation/foundation.topbar.js",