What Do You Need In The Xf2 Xengallery Version? Vote for your choices here: http://www.sonnb.com/threads/what-do-you-need-in-the-xf2-xengallery-version.1539/

Question Merge Template Error?

Discussion in 'XenGallery' started by moshbit, Apr 11, 2014.

  1. moshbit

    moshbit Authorized Member Authorized

    After upgrading to version 2 (and now 2.1.3) i noticed i have in my outdated templates:

    sonnb_xengallery_album_list.css Custom Version: 2.0.6, Parent Version: 2.1.1

    but when i try to merge changes, i get the following error:

    what should i do to fix this? here's a copy of the css template:

    Code:
    .breadBoxTop.categoryView {
        @property "secondaryContent";
        padding: 9px;
        @property "/secondaryContent";;
        border-radius: 0;
        padding: 5px 10px;
    }
        .breadBoxTop.categoryView .breadcrumb{
            margin: 0;
            border: 0 none;
            background: none repeat scroll 0% 0% transparent;
            border-radius: 0;
        }
            .breadBoxTop.categoryView .crust:last-child a.crumb {
                font-style: normal;
            }
            .breadBoxTop.categoryView .breadcrumb .crust:hover  a.crumb {
                background-color: @primaryLighterStill;
            }
            .breadBoxTop.categoryView .breadcrumb .crust a.crumb {
                padding: 0 15px;
                border: 0 none;
                border-radius: 0;
            }
    
    .sonnb_xengallery_category_view .titleBar {
        display: none;
    }
    .titleBar.categoryView {
        display: block;
    }
    
    .galleryHeader {
        margin-top: -10px;
    }
        .galleryHeader ul {
            text-align: right;
        }
    
        .galleryHeader .sort {
           
        }
        .galleryHeader .sort .arrowWidget{
            display: none;   
        }
        .galleryHeader .sort a {
           
        }
            .galleryHeader .sort a i{
                display: inline-block;
                width: 26px;
                height: 22px;
                position: relative;
            }
    
                .galleryHeader .sort a i:before,
                .galleryHeader .sort a i:after
                {
                    content: '';
                    display: block;
                    position: absolute;
                    left: 5px;
                    right: 5px;
                    border-top: 2px solid @primaryMedium;
                }
    
                    .galleryHeader .sort a i:before
                    {
                        top: 5px;
                        bottom: 5px;
                        border-bottom: 2px solid @primaryMedium;
                    }
    
                        .galleryHeader .sort a i:after
                        {
                            top: 10px;
                        }
    
            .galleryHeader .sort.PopupOpen i,
            .galleryHeader .sort a:hover i {
            }
    
                .galleryHeader .sort a:hover i:before,
                .galleryHeader .sort a:hover i:after {
                    border-color: @secondaryMedium;
                }
    
                .galleryHeader .sort.PopupOpen a i:before,
                .galleryHeader .sort.PopupOpen a i:after {
                    border-color: @activeColor;
                }
    
    #gallerySort,
    #gallerySort .menuColumns {
        width: 150px;
        min-width: 150px;
        padding: 0;
    }
        #gallerySort .menuColumns .blockLinksList{
            padding: 0;
        }
    
    .masonryContainer {
        padding-top: 10px;
        margin-bottom: 20px;
    }
    .clearfix:after {
        clear: both;
    }
    .clearfix:before, .clearfix:after {
        content: "";
        display: table;
        line-height: 0;
    }
    #infscr-loading {
        background-color: #000;
        border-radius: 10px 10px 10px 10px;
        bottom: 40px;
        clear: both;
        color: #FFFFFF;
        left: 45%;
        opacity: 0.7;
        padding: 10px;
        position: fixed;
        text-align: center;
        width: 100px;
        z-index: 100;
        display: none;
    }
    
    <xen:if is="!@sonnbXenGalleryDisableAutoScroll">
        .hasJs .pageNavLinkGroup.xengallery {
            visibility:hidden;
        }
    </xen:if>
    
    @media only screen and (max-width: 400px), only screen and (max-device-width: 400px)
    {
        .galleryHeader {
            margin-top: 0;
        }
        .galleryHeader ul {
            text-align: left;
        }
    }
     
  2. sonnb

    sonnb Administrator Staff Member

    If you did not changed this file in the past then just use new template instead.
     

Share This Page