Merge branch 'release/1.0.3'

.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+
+node_modules/
+dist/
+
+npm-debug.log

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "build"]
+	path = build
+	url = [email protected]:siteorigin/plugin-build.git

.travis.yml

@@ -0,0 +1,23 @@
+language: php
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+php:
+  - 5.3
+  - 5.5
+
+env:
+  - WP_VERSION=latest WP_MULTISITE=0
+
+matrix:
+  include:
+    - php: 5.3
+      env: WP_VERSION=latest WP_MULTISITE=1
+
+before_script:
+  - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION 
+
+script: phpunit

build-config.js

@@ -0,0 +1,39 @@
+module.exports = {
+    slug: 'so-css',
+    jsMinSuffix: '.min',
+    version: {
+        src: [
+            'so-css.php',
+            'readme.txt'
+        ]
+    },
+    less: {
+        src:['css/**/*.less'],
+        include:[]
+    },
+    sass: {
+        src: [],
+        include:[]
+    },
+    js: {
+        src: [
+            'js/**/*.js',
+            'lib/**/*.js',
+            '!{build,build/**}',                // Ignore build/ and contents
+            '!{tests,tests/**}',                // Ignore tests/ and contents
+            '!{tmp,tmp/**}'                     // Ignore dist/ and contents
+        ]
+    },
+    copy: {
+        src: [
+            '**/!(*.js|*.less)',                // Everything except .js and .less files
+            'lib/**/*.*',                       // libraries used at runtime
+            '!{build,build/**}',                // Ignore build/ and contents
+            '!{tests,tests/**}',                // Ignore tests/ and contents
+            '!{tmp,tmp/**}',                    // Ignore tmp/ and contents
+            '!phpunit.xml',                     // Not the unit tests configuration file.
+            '!so-css.php',                      // Not the base plugin file. It is copied by the 'version' task.
+            '!readme.txt'                      // Not the readme.txt file. It is copied by the 'version' task.
+        ]
+    }
+};

js/css.js

@@ -442,7 +442,7 @@
                 }
             }
             else {
-                cssObject.subStyles = minimalObject.subStyles; //TODO, make this intelligent too
+                cssObject.subStyles = cssObject.subStyles.concat(minimalObject.subStyles); //TODO, make this intelligent too
             }
 
         }

phpunit.xml

@@ -0,0 +1,14 @@
+<phpunit
+	bootstrap="tests/bootstrap.php"
+	backupGlobals="false"
+	colors="true"
+	convertErrorsToExceptions="true"
+	convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true"
+	>
+	<testsuites>
+		<testsuite>
+			<directory prefix="test-" suffix=".php">./tests/</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>

readme.txt

@@ -1,9 +1,9 @@
 === SiteOrigin CSS ===
 Tags: css, design, edit, customize
 Requires at least: 3.9
-Tested up to: 4.2.2
+Tested up to: 4.3.1
 Stable tag: trunk
-License: GPLv3 or later
+License: GPLv2 or later
 Contributors: gpriday
 
 == Description ==
@@ -61,6 +61,11 @@ We offer free support on the [SiteOrigin support forums](https://siteorigin.com/
 
 == Changelog ==
 
+= 1.0.3 - 29 October 2015=
+* Changed video image
+* Adjust revision times by GMT offset.
+* Don't overwrite media queries sub styles, rather just append them.
+
 = 1.0.2 =
 * Dequeue functionality that conflicted with WordPress color picker, if it's enqueued.
 * Removed wp_styles for compatibility with older versions of WordPress

tests/bin/install-wp-tests.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+if [ $# -lt 3 ]; then
+	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version]"
+	exit 1
+fi
+
+DB_NAME=$1
+DB_USER=$2
+DB_PASS=$3
+DB_HOST=${4-localhost}
+WP_VERSION=${5-latest}
+
+WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
+WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
+
+set -ex
+
+download() {
+    if [ `which curl` ]; then
+        curl -s "$1" > "$2";
+    elif [ `which wget` ]; then
+        wget -nv -O "$2" "$1"
+    fi
+}
+
+install_wp() {
+
+	if [ -d $WP_CORE_DIR ]; then
+		return;
+	fi
+
+	mkdir -p $WP_CORE_DIR
+
+	if [ $WP_VERSION == 'latest' ]; then
+		local ARCHIVE_NAME='latest'
+	else
+		local ARCHIVE_NAME="wordpress-$WP_VERSION"
+	fi
+
+	download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
+	tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
+
+	download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
+}
+
+install_test_suite() {
+	# portable in-place argument for both GNU sed and Mac OSX sed
+	if [[ $(uname -s) == 'Darwin' ]]; then
+		local ioption='-i .bak'
+	else
+		local ioption='-i'
+	fi
+
+	# set up testing suite if it doesn't yet exist
+	if [ ! -d $WP_TESTS_DIR ]; then
+		# set up testing suite
+		mkdir -p $WP_TESTS_DIR
+		svn co --quiet http://develop.svn.wordpress.org/trunk/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+	fi
+
+	cd $WP_TESTS_DIR
+
+	if [ ! -f wp-tests-config.php ]; then
+		download https://develop.svn.wordpress.org/trunk/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php
+	fi
+
+}
+
+install_db() {
+	# parse DB_HOST for port or socket references
+	local PARTS=(${DB_HOST//\:/ })
+	local DB_HOSTNAME=${PARTS[0]};
+	local DB_SOCK_OR_PORT=${PARTS[1]};
+	local EXTRA=""
+
+	if ! [ -z $DB_HOSTNAME ] ; then
+		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
+			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
+		elif ! [ -z $DB_SOCK_OR_PORT ] ; then
+			EXTRA=" --socket=$DB_SOCK_OR_PORT"
+		elif ! [ -z $DB_HOSTNAME ] ; then
+			EXTRA=" --host=$DB_HOSTNAME --protocol=tcp"
+		fi
+	fi
+
+	# create database
+	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+}
+
+install_wp
+install_test_suite
+install_db

tests/bootstrap.php

@@ -0,0 +1,15 @@
+<?php
+
+$_tests_dir = getenv( 'WP_TESTS_DIR' );
+if ( ! $_tests_dir ) {
+	$_tests_dir = '/tmp/wordpress-tests-lib';
+}
+
+require_once $_tests_dir . '/includes/functions.php';
+
+function _manually_load_plugin() {
+	require dirname( dirname( __FILE__ ) ) . '/so-css.php';
+}
+tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+
+require $_tests_dir . '/includes/bootstrap.php';

tests/test-sample.php

@@ -0,0 +1,10 @@
+<?php
+
+class SampleTest extends WP_UnitTestCase {
+
+	function test_sample() {
+		// replace this with some actual testing code
+		$this->assertTrue( true );
+	}
+}
+

tpl/page.php

@@ -8,12 +8,7 @@
 
 
 	<?php if( isset($_POST['siteorigin_custom_css_save']) ) : ?>
-		<div class="updated settings-error">
-			<p>
-				<?php _e('Site design updated.', 'so-css') ?>
-				<?php printf( __('<a href="%s" target="_blank">Tweet</a> your new design to find out what your followers think.', 'so-css'),  esc_url( SiteOrigin_CSS::single()->get_tweet_url() ) ) ?>
-			</p>
-		</div>
+		<div class="updated settings-error"><p><?php _e('Site design updated.', 'so-css') ?></p></div>
 	<?php endif; ?>
 
 	<?php if(!empty($revision)) : ?>
@@ -52,7 +47,7 @@
 							foreach($custom_css_revisions as $time => $css) {
 								?>
 								<li>
-									<a href="<?php echo add_query_arg(array('theme' => $theme, 'time' => $time)) ?>" class="load-css-revision"><?php echo date('j F Y @ H:i:s', $time) ?></a>
+									<a href="<?php echo add_query_arg(array('theme' => $theme, 'time' => $time)) ?>" class="load-css-revision"><?php echo date('j F Y @ H:i:s', $time + get_option('gmt_offset') * 60 * 60) ?></a>
 									(<?php printf(__('%d chars', 'so-css'), strlen($css)) ?>)
 								</li>
 								<?php