Ticket #7104: 7104.css.patch

Gruntfile.js

@@ -5 +5 @@
                 BUILD_DIR = 'build/',
 
                 BP_CSS = [
-                        '**/*.css',
-                        '**/css-*.php'
+                        '**/*.css'
                 ],
 
                 // CSS exclusions, for excluding files from certain tasks, e.g. rtlcss
                 BP_EXCLUDED_CSS = [
-                        '!**/*-rtl.css',
-                        '!**/*-rtl.php'
+                        '!**/*-rtl.css'
                 ],
 
                 BP_JS = [

src/bp-activity/bp-activity-embeds.php

@@ -62 +62 @@
 /**
  * Add inline styles for BP activity embeds.
  *
- * This is subject to change or be removed entirely for a different system.
- * Potentially for BP_Legacy::locate_asset_in_stack().
- *
  * @since  2.6.0
- * @access private
  */
-function _bp_activity_embed_add_inline_styles() {
+function bp_activity_embed_add_inline_styles() {
         if ( false === bp_is_single_activity() ) {
                 return;
         }
 
-        ob_start();
+        $min = bp_core_get_minified_asset_suffix();
+
         if ( is_rtl() ) {
-                bp_get_asset_template_part( 'embeds/css-activity', 'rtl' );
+                $css = bp_get_template_asset( "assets/embeds/activity-rtl{$min}.css" );
         } else {
-                bp_get_asset_template_part( 'embeds/css-activity' );
+                $css = bp_get_template_asset( "assets/embeds/activity{$min}.css" );
         }
-        $css = ob_get_clean();
 
         // Rudimentary CSS protection.
         $css = wp_kses( $css, array( "\'", '\"' ) );
 
         printf( '<style type="text/css">%s</style>', $css );
 }
-add_action( 'embed_head', '_bp_activity_embed_add_inline_styles', 20 );
+add_action( 'embed_head', 'bp_activity_embed_add_inline_styles', 20 );
 
 /**
  * Query for the activity item on the activity embed template.

src/bp-core/bp-core-template-loader.php

@@ -150 +150 @@
 }
 
 /**
+ * Get a BuddyPress template asset for display in a theme.
+ *
+ * @since 2.6.0
+ *
+ * @param string $filename Relative filename against the template directory to search for.
+ * @param bool   $load     Whether to load the file if found immediately. Default: false.
+ */
+function bp_get_template_asset( $filename, $load = false ) {
+        /**
+         * Filters the filename before locating.
+         *
+         * @since 2.6.0
+         *
+         * @param array $filename Filename to locate.
+         * @param bool  $load     Whether we should load the file immediately.
+         */
+        $filename = apply_filters( 'bp_get_template_asset', $filename, $load );
+
+        // Ensure assets can be located when running from /src/.
+        if ( defined( 'BP_SOURCE_SUBDIRECTORY' ) && BP_SOURCE_SUBDIRECTORY === 'src' ) {
+                $filename = str_replace( '.min', '', $filename );
+        }
+
+        $located = bp_locate_template_asset( $filename );
+        if ( false === $located ) {
+                return;
+        }
+
+        if ( true === $load ) {
+                readfile( $located['file'] );
+        } else {
+                return file_get_contents( $located['file'] );
+        }
+}
+
+/**
+ * Retrieve the path of the highest priority asset that exists.
+ *
+ * Similar to {@link bp_locate_template()}, but for files like CSS and JS.
+ *
+ * @since 2.6.0
+ *
+ * @param  string     Asset name to search for.
+ * @return array|bool Array of asset data if one is located (includes absolute filepath and URI).
+ *                    Boolean false on failure.
+ */
+function bp_locate_template_asset( $asset_name ) {
+
+        // No file found yet.
+        $located            = false;
+        $template_locations = bp_get_template_stack();
+        $asset_name         = ltrim( $asset_name, '/' );
+
+        // Loop through template stack to try to find the asset.
+        foreach ( (array) $template_locations as $template_location ) {
+
+                // Continue if $template_location is empty.
+                if ( empty( $template_location ) ) {
+                        continue;
+                }
+
+                if ( file_exists( trailingslashit( $template_location ) . $asset_name ) ) {
+                        $located = array();
+                        $located['file'] = $located['uri'] = trailingslashit( $template_location ) . $asset_name;
+
+                        $content_dir = constant( 'WP_CONTENT_DIR' );
+
+                        // IIS (Windows) here; replace back slashes with forward slash.
+                        if ( strpos( $located['uri'], '\\' ) !== false ) {
+                                $located['uri'] = str_replace( '\\', '/', $located['uri'] );
+                                $content_dir = str_replace( '\\', '/', $content_dir );
+                        }
+
+                        // Make URI path is relative to site URL.
+                        $located['uri'] = str_replace( $content_dir, content_url(), $located['uri'] );
+                        break;
+                }
+        }
+
+        return $located;
+}
+
+/**
  * Register a new template stack location.
  *
  * This allows for templates to live in places beyond just the parent/child

new file src/bp-templates/bp-legacy/buddypress/assets/embeds/activity-rtl.css

@@ +1 @@
+#bp-embed-header:after {
+        clear: both;
+        content: "";
+        display: table;
+        margin-bottom: 1em;
+}
+
+.bp-embed-avatar {
+        float: right;
+        margin: 0 0 0 .75em;
+}
+
+p.bp-embed-activity-action {
+        font-size: 15px;
+        margin-bottom: 0;
+}
+
+p.bp-embed-activity-action a:first-child {
+        color: #32373c;
+        font-weight: bold;
+}
+
+p.bp-embed-activity-action img.avatar {
+        padding: 0 3px 0 4px;
+        vertical-align: text-bottom;
+}
+
+.bp-embed-excerpt {
+        margin-bottom: 1em;
+}
+
+.bp-embed-excerpt a {
+        color: #21759b;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: top;
+        white-space: nowrap;
+        max-width: 250px;
+}
+
+.activity-read-more {
+        margin-right: .5em;
+}
+
+.activity-read-more a {
+        color: #b4b9be;
+}
+
+.wp-embed-footer {
+        margin-top: 20px;
+}
+
+span.bp-embed-timestamp {
+        font-size: .9em;
+}
+
+video {
+        width: 100%;
+        height: auto;
+}
+
+.bp-activity-embed-display-media {
+        border: 1px solid #ccc;
+        border-radius: 6px;
+}
+
+.bp-activity-embed-display-media.one-col,
+.bp-activity-embed-display-media.one-col .thumb,
+.bp-activity-embed-display-media.one-col .thumb img {
+        width: 100%;
+}
+
+.bp-activity-embed-display-media.two-col .thumb,
+.bp-activity-embed-display-media.two-col .caption {
+        display: table-cell;
+}
+
+.bp-activity-embed-display-media.two-col .thumb {
+        background: #000;
+        vertical-align: middle;
+}
+
+.bp-activity-embed-display-media.two-col .caption {
+        vertical-align: top;
+}
+
+.bp-activity-embed-display-media.two-col .thumb img {
+        border-left: 1px solid #ccc;
+        display: block;
+        width: 100%;
+}
+
+.bp-activity-embed-display-media .thumb {
+        position: relative;
+}
+
+.bp-activity-embed-display-media .caption {
+        padding: .2em .5em .5em .5em;
+}
+
+a.play-btn {
+        background: rgba(0, 0, 0, 0.75);
+        border-radius: 50%;
+        height: 50px;
+        right: 50%;
+        margin: 0;
+        padding: 1em;
+        position: absolute;
+        text-indent: 0.25em;
+        top: 50%;
+        transform: translateY(-50%) translateX(50%);
+        -webkit-transform: translateY(-50%) translateX(50%);
+        transition: all 0.2s ease-out;
+        width: 50px;
+}
+
+.bp-activity-embed-display-media.two-col a.play-btn {
+        height: 35px;
+        width: 35px;
+}
+
+a.play-btn:hover {
+        background: rgba(0, 0, 0, 0.95);
+        transform: translateY(-50%) translateX(50%) scale(1.05);
+        -webkit-transform: translateY(-50%) translateX(50%) scale(1.05);
+        transition: all 0.2s ease-out;
+}
+
+.bp-activity-embed-display-media .thumb svg {
+        fill: #fff;
+        overflow: hidden;
+}
+
+.bp-activity-embed-display-media .caption-description {
+        font-size: 90%;
+        margin: .4em 0;
+}
+
+@media only screen and (max-width: 480px) {
+        .bp-activity-embed-display-media.two-col .thumb {
+                border-bottom: 1px solid #ccc;
+                border-left: 0;
+                display: block;
+                max-width: none !important;
+        }
+
+        a.play-btn {
+                height: 35px;
+                width: 35px;
+        }
+}
+ No newline at end of file

new file src/bp-templates/bp-legacy/buddypress/assets/embeds/activity.css

@@ +1 @@
+#bp-embed-header:after {
+        clear: both;
+        content: "";
+        display: table;
+        margin-bottom: 1em;
+}
+
+.bp-embed-avatar {
+        float: left;
+        margin: 0 .75em 0 0;
+}
+
+p.bp-embed-activity-action {
+        font-size: 15px;
+        margin-bottom: 0;
+}
+
+p.bp-embed-activity-action a:first-child {
+        color: #32373c;
+        font-weight: bold;
+}
+
+p.bp-embed-activity-action img.avatar {
+        padding: 0 4px 0 3px;
+        vertical-align: text-bottom;
+}
+
+.bp-embed-excerpt {
+        margin-bottom: 1em;
+}
+
+.bp-embed-excerpt a {
+        color: #21759b;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: top;
+        white-space: nowrap;
+        max-width: 250px;
+}
+
+.activity-read-more {
+        margin-left: .5em;
+}
+
+.activity-read-more a {
+        color: #b4b9be;
+}
+
+.wp-embed-footer {
+        margin-top: 20px;
+}
+
+span.bp-embed-timestamp {
+        font-size: .9em;
+}
+
+video {
+        width: 100%;
+        height: auto;
+}
+
+.bp-activity-embed-display-media {
+        border: 1px solid #ccc;
+        border-radius: 6px;
+}
+
+.bp-activity-embed-display-media.one-col,
+.bp-activity-embed-display-media.one-col .thumb,
+.bp-activity-embed-display-media.one-col .thumb img {
+        width: 100%;
+}
+
+.bp-activity-embed-display-media.two-col .thumb,
+.bp-activity-embed-display-media.two-col .caption {
+        display: table-cell;
+}
+
+.bp-activity-embed-display-media.two-col .thumb {
+        background: #000;
+        vertical-align: middle;
+}
+
+.bp-activity-embed-display-media.two-col .caption {
+        vertical-align: top;
+}
+
+.bp-activity-embed-display-media.two-col .thumb img {
+        border-right: 1px solid #ccc;
+        display: block;
+        width: 100%;
+}
+
+.bp-activity-embed-display-media .thumb {
+        position: relative;
+}
+
+.bp-activity-embed-display-media .caption {
+        padding: .2em .5em .5em .5em;
+}
+
+a.play-btn {
+        background: rgba(0, 0, 0, 0.75);
+        border-radius: 50%;
+        height: 50px;
+        left: 50%;
+        margin: 0;
+        padding: 1em;
+        position: absolute;
+        text-indent: 0.25em;
+        top: 50%;
+        transform: translateY(-50%) translateX(-50%);
+        -webkit-transform: translateY(-50%) translateX(-50%);
+        transition: all 0.2s ease-out;
+        width: 50px;
+}
+
+.bp-activity-embed-display-media.two-col a.play-btn {
+        height: 35px;
+        width: 35px;
+}
+
+a.play-btn:hover {
+        background: rgba(0, 0, 0, 0.95);
+        transform: translateY(-50%) translateX(-50%) scale(1.05);
+        -webkit-transform: translateY(-50%) translateX(-50%) scale(1.05);
+        transition: all 0.2s ease-out;
+}
+
+.bp-activity-embed-display-media .thumb svg {
+        fill: #fff;
+        overflow: hidden;
+}
+
+.bp-activity-embed-display-media .caption-description {
+        font-size: 90%;
+        margin: .4em 0;
+}
+
+@media only screen and (max-width: 480px) {
+        .bp-activity-embed-display-media.two-col .thumb {
+                border-bottom: 1px solid #ccc;
+                border-right: 0;
+                display: block;
+                max-width: none !important;
+        }
+
+        a.play-btn {
+                height: 35px;
+                width: 35px;
+        }
+}
+ No newline at end of file

deleted file src/bp-templates/bp-legacy/buddypress/assets/embeds/css-activity-rtl.php

@@ -1 @@
-#bp-embed-header:after {
-        clear: both;
-        content: "";
-        display: table;
-        margin-bottom: 1em;
-}
-
-.bp-embed-avatar {
-        float: right;
-        margin: 0 0 0 .75em;
-}
-
-p.bp-embed-activity-action {
-        font-size: 15px;
-        margin-bottom: 0;
-}
-
-p.bp-embed-activity-action a:first-child {
-        color: #32373c;
-        font-weight: bold;
-}
-
-p.bp-embed-activity-action img.avatar {
-        padding: 0 3px 0 4px;
-        vertical-align: text-bottom;
-}
-
-.bp-embed-excerpt {
-        margin-bottom: 1em;
-}
-
-.bp-embed-excerpt a {
-        color: #21759b;
-        display: inline-block;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        vertical-align: top;
-        white-space: nowrap;
-        max-width: 250px;
-}
-
-.activity-read-more {
-        margin-right: .5em;
-}
-
-.activity-read-more a {
-        color: #b4b9be;
-}
-
-.wp-embed-footer {
-        margin-top: 20px;
-}
-
-span.bp-embed-timestamp {
-        font-size: .9em;
-}
-
-video {
-        width: 100%;
-        height: auto;
-}
-
-.bp-activity-embed-display-media {
-        border: 1px solid #ccc;
-        border-radius: 6px;
-}
-
-.bp-activity-embed-display-media.one-col,
-.bp-activity-embed-display-media.one-col .thumb,
-.bp-activity-embed-display-media.one-col .thumb img {
-        width: 100%;
-}
-
-.bp-activity-embed-display-media.two-col .thumb,
-.bp-activity-embed-display-media.two-col .caption {
-        display: table-cell;
-}
-
-.bp-activity-embed-display-media.two-col .thumb {
-        background: #000;
-        vertical-align: middle;
-}
-
-.bp-activity-embed-display-media.two-col .caption {
-        vertical-align: top;
-}
-
-.bp-activity-embed-display-media.two-col .thumb img {
-        border-left: 1px solid #ccc;
-        display: block;
-        width: 100%;
-}
-
-.bp-activity-embed-display-media .thumb {
-        position: relative;
-}
-
-.bp-activity-embed-display-media .caption {
-        padding: .2em .5em .5em .5em;
-}
-
-a.play-btn {
-        background: rgba(0, 0, 0, 0.75);
-        border-radius: 50%;
-        height: 50px;
-        right: 50%;
-        margin: 0;
-        padding: 1em;
-        position: absolute;
-        text-indent: 0.25em;
-        top: 50%;
-        transform: translateY(-50%) translateX(50%);
-        -webkit-transform: translateY(-50%) translateX(50%);
-        transition: all 0.2s ease-out;
-        width: 50px;
-}
-
-.bp-activity-embed-display-media.two-col a.play-btn {
-        height: 35px;
-        width: 35px;
-}
-
-a.play-btn:hover {
-        background: rgba(0, 0, 0, 0.95);
-        transform: translateY(-50%) translateX(50%) scale(1.05);
-        -webkit-transform: translateY(-50%) translateX(50%) scale(1.05);
-        transition: all 0.2s ease-out;
-}
-
-.bp-activity-embed-display-media .thumb svg {
-        fill: #fff;
-        overflow: hidden;
-}
-
-.bp-activity-embed-display-media .caption-description {
-        font-size: 90%;
-        margin: .4em 0;
-}
-
-@media only screen and (max-width: 480px) {
-        .bp-activity-embed-display-media.two-col .thumb {
-                border-bottom: 1px solid #ccc;
-                border-left: 0;
-                display: block;
-                max-width: none !important;
-        }
-
-        a.play-btn {
-                height: 35px;
-                width: 35px;
-        }
-}
- No newline at end of file

deleted file src/bp-templates/bp-legacy/buddypress/assets/embeds/css-activity.php

@@ -1 @@
-#bp-embed-header:after {
-        clear: both;
-        content: "";
-        display: table;
-        margin-bottom: 1em;
-}
-
-.bp-embed-avatar {
-        float: left;
-        margin: 0 .75em 0 0;
-}
-
-p.bp-embed-activity-action {
-        font-size: 15px;
-        margin-bottom: 0;
-}
-
-p.bp-embed-activity-action a:first-child {
-        color: #32373c;
-        font-weight: bold;
-}
-
-p.bp-embed-activity-action img.avatar {
-        padding: 0 4px 0 3px;
-        vertical-align: text-bottom;
-}
-
-.bp-embed-excerpt {
-        margin-bottom: 1em;
-}
-
-.bp-embed-excerpt a {
-        color: #21759b;
-        display: inline-block;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        vertical-align: top;
-        white-space: nowrap;
-        max-width: 250px;
-}
-
-.activity-read-more {
-        margin-left: .5em;
-}
-
-.activity-read-more a {
-        color: #b4b9be;
-}
-
-.wp-embed-footer {
-        margin-top: 20px;
-}
-
-span.bp-embed-timestamp {
-        font-size: .9em;
-}
-
-video {
-        width: 100%;
-        height: auto;
-}
-
-.bp-activity-embed-display-media {
-        border: 1px solid #ccc;
-        border-radius: 6px;
-}
-
-.bp-activity-embed-display-media.one-col,
-.bp-activity-embed-display-media.one-col .thumb,
-.bp-activity-embed-display-media.one-col .thumb img {
-        width: 100%;
-}
-
-.bp-activity-embed-display-media.two-col .thumb,
-.bp-activity-embed-display-media.two-col .caption {
-        display: table-cell;
-}
-
-.bp-activity-embed-display-media.two-col .thumb {
-        background: #000;
-        vertical-align: middle;
-}
-
-.bp-activity-embed-display-media.two-col .caption {
-        vertical-align: top;
-}
-
-.bp-activity-embed-display-media.two-col .thumb img {
-        border-right: 1px solid #ccc;
-        display: block;
-        width: 100%;
-}
-
-.bp-activity-embed-display-media .thumb {
-        position: relative;
-}
-
-.bp-activity-embed-display-media .caption {
-        padding: .2em .5em .5em .5em;
-}
-
-a.play-btn {
-        background: rgba(0, 0, 0, 0.75);
-        border-radius: 50%;
-        height: 50px;
-        left: 50%;
-        margin: 0;
-        padding: 1em;
-        position: absolute;
-        text-indent: 0.25em;
-        top: 50%;
-        transform: translateY(-50%) translateX(-50%);
-        -webkit-transform: translateY(-50%) translateX(-50%);
-        transition: all 0.2s ease-out;
-        width: 50px;
-}
-
-.bp-activity-embed-display-media.two-col a.play-btn {
-        height: 35px;
-        width: 35px;
-}
-
-a.play-btn:hover {
-        background: rgba(0, 0, 0, 0.95);
-        transform: translateY(-50%) translateX(-50%) scale(1.05);
-        -webkit-transform: translateY(-50%) translateX(-50%) scale(1.05);
-        transition: all 0.2s ease-out;
-}
-
-.bp-activity-embed-display-media .thumb svg {
-        fill: #fff;
-        overflow: hidden;
-}
-
-.bp-activity-embed-display-media .caption-description {
-        font-size: 90%;
-        margin: .4em 0;
-}
-
-@media only screen and (max-width: 480px) {
-        .bp-activity-embed-display-media.two-col .thumb {
-                border-bottom: 1px solid #ccc;
-                border-right: 0;
-                display: block;
-                max-width: none !important;
-        }
-
-        a.play-btn {
-                height: 35px;
-                width: 35px;
-        }
-}
- No newline at end of file