Merge 3.2 into master

DEP Remove branch alias

README.md

@@ -1,6 +1,6 @@
 # Using the Simple theme
 
- * Copy the theme into the `themes/` directory of your SilverStripe project.  If you've named it correctly, there should be a directory called `themes/simple/templates`.
+ * Copy the theme into the `themes/` directory of your Silverstripe project.  If you've named it correctly, there should be a directory called `themes/simple/templates`.
  
  * Add the following to your `mysite/_config.php` file.  Remove any existing `SSViewer::set_theme` lines.
 

composer.json

@@ -2,11 +2,14 @@
     "name": "silverstripe-themes/simple",
     "description": "The SilverStripe simple theme (default SilverStripe 3 theme)",
     "type": "silverstripe-theme",
-    "keywords": ["silverstripe", "theme"],
+    "keywords": [
+        "silverstripe",
+        "theme"
+    ],
     "license": "BSD-3-Clause",
     "authors": [
         {
-            "name": "Sara Tušar (Innovaif)",
+            "name": "Sara Tu\u0161ar (Innovaif)",
             "homepage": "http://www.saratusar.com"
         }
     ],
@@ -14,15 +17,12 @@
         "composer/installers": "*",
         "silverstripe/framework": ">=3.5"
     },
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.2.x-dev"
-		},
+    "extra": {
         "expose": [
             "css",
             "images",
             "javascript",
             "webfonts"
         ]
-	}
+    }
 }

css/form.css

@@ -198,7 +198,7 @@ form .date .middleColumn input {
     font-size: 13px;                            /* reset to default */
     color: #333;                                /* reset to default */
 }
-form .requiredField label.left:after { /* pseudo element adds an asterisk to a required fields label */
+form .requiredField label.left:after, form .requiredField legend.left:after { /* pseudo element adds an asterisk to a required fields label */
     color: #B94A48;
     content: "*";
     font-size: 14px;

css/layout.css

@@ -424,14 +424,14 @@ body h1 span.amp {
 
 /* FOOTER */
 .footer {
-    color: #999;
+    color: #6B6B6B;
     background: #ededed;
     padding: 20px 0;
     font-size: 11px;
     line-height: 22px;
 }
 	.footer a {
-	    color: #999;
+	    color: #6B6B6B;
 	}
 	.footer a:hover {
 	    color: #B90000;
@@ -521,7 +521,7 @@ body h1 span.amp {
 		    display:table; /* displays the pagination as a table so that elements stay inline and the middle column adjusts its size to accomodate and the right arrow stays to the right */
 		    width:100%;
 		}
-		.searchResults #PageNumbers .pagination span{
+		.searchResults #PageNumbers .pagination button{
 			display:table-cell; /* each element in the pagination div displays as a table cell */
 		}
 		.searchResults #PageNumbers p {
@@ -593,7 +593,7 @@ body h1 span.amp {
 		    padding-right: 100px; /* padding stops .brand text from overlapping the search and nav buttons */
 		}
 	.tablet-nav .header {
-	    padding: 0px;
+	    padding: 0;
 	}
 		.tablet-nav .header .inner {
 		    padding: 20px 0 0 0;
@@ -611,6 +611,9 @@ body h1 span.amp {
 		    font-family: 'WebSymbolsRegular';
 		    font-size: 20px;
 		    color: #ededed;
+            background: #000;
+            margin-top: 0;
+            padding: 0;
 		}
 		.tablet-nav .header .primary ul {
 		    z-index: 10;
@@ -637,7 +640,7 @@ body h1 span.amp {
 			    position: absolute;
 			    right: 20px;
 			    top: 0px;
-			    font-family: 'WebSymbolsRegular';
+                font-family: 'WebSymbolsRegular';
 			    font-size: 14px;
 			    color: #999;
 			    text-align: center;

css/typography.css

@@ -93,12 +93,12 @@ body {
 }
 
 /* LINKS */
-.typography a, 
+.typography a,
 .typography a.intro {
     color: #B80000;
     text-decoration: none;
 }
-  .typography a:hover { 
+  .typography a:hover {
     color: #D80000;
     border-bottom: 1px dashed #B80000;
   }
@@ -107,7 +107,7 @@ body {
 
 /* LIST STYLES
 -------------------------------------------- */
-.typography ul, 
+.typography ul,
 .typography ol,
 .typography dl { margin: 0 0 20px 25px; }
 .typography ul li { list-style-type: disc; } /* adds disc style bullet to the list */
@@ -142,20 +142,20 @@ body {
   }
 
 
-/* WYSIWYG EDITOR ALIGNMENT CLASSES 
+/* WYSIWYG EDITOR ALIGNMENT CLASSES
 -------------------------------------------- */
-.typography .left {
+.typography .text-left {
     text-align: left
 }
-.typography .center {
+.typography .text-center {
     text-align: center
 }
-.typography .right {
+.typography .text-right {
     text-align: right
 }
 
 
-/* IMAGES 
+/* IMAGES
 -------------------------------------------- */
 .typography img {
     border: 5px solid #d7d7d7;
@@ -265,4 +265,4 @@ body {
 address {
   display: block;
   margin-bottom: 20px;
-}
+}

javascript/script.js

@@ -6,9 +6,9 @@ jQuery.noConflict();
 		$('#SearchForm_SearchForm_action_results').val('L');
 
 		if (!$.browser.msie || ($.browser.msie && (parseInt($.browser.version, 10) > 8))) {
-			var searchBarButton = $("span.search-dropdown-icon");
+			var searchBarButton = $("button.search-dropdown-icon");
 			var searchBar = $('div.search-bar');
-			var menuButton = $("span.nav-open-button");
+			var menuButton = $("button.nav-open-button");
 			var menu = $('.header .primary ul');
 			var mobile = false;
 			var changed = false;

templates/Includes/Header.ss

@@ -8,7 +8,7 @@
 				<% end_if %>
 			</a>
 			<% if $SearchForm %>
-				<span class="search-dropdown-icon">L</span>
+				<button class="search-dropdown-icon">L</button>
 				<div class="search-bar">
 					$SearchForm
 				</div>

templates/Includes/Navigation.ss

@@ -1,5 +1,5 @@
 <nav class="primary">
-	<span class="nav-open-button">²</span>
+	<button class="nav-open-button">²</button>
 	<ul>
 		<% loop $Menu(1) %>
 			<li class="$LinkingMode"><a href="$Link" title="$Title.XML">$MenuTitle.XML</a></li>

templates/Page.ss

@@ -16,7 +16,7 @@ Change it, enhance it and most importantly enjoy it!
 	<% base_tag %>
 	<title><% if $MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> &raquo; $SiteConfig.Title</title>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	$MetaTags(false)
 	<!--[if lt IE 9]>
@@ -26,7 +26,7 @@ Change it, enhance it and most importantly enjoy it!
 	<% require themedCSS('typography') %>
 	<% require themedCSS('form') %>
 	<% require themedCSS('layout') %>
-	<link rel="shortcut icon" href="themes/simple/images/favicon.ico" />
+	<link rel="shortcut icon" href="$resourceURL('themes/simple/images/favicon.ico')" />
 </head>
 <body class="$ClassName.ShortName<% if not $Menu(2) %> no-sidebar<% end_if %>" <% if $i18nScriptDirection %>dir="$i18nScriptDirection"<% end_if %>>
 <% include Header %>