Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelamnr
angelamnr committed Feb 6, 2017
2 parents 2f23797 + 2cd6c68 commit aba9d35
Show file tree
Hide file tree
Showing 5 changed files with 368 additions and 27 deletions.
202 changes: 177 additions & 25 deletions css/suitcase.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ ul.right { text-align: right; }

ul.hlist > li { float: left; }

.pane-content ul,
.pane-content ol { padding-left: 40px; }

/* --------------------- */
/* Description Lists */

Expand Down Expand Up @@ -299,21 +302,56 @@ input[type="submit"] {
/* ## FIGURES and IMAGES
/* -------------------- */

figure figcaption { color: #818a91; }

figure .insert-default-image-styling + figcaption {
margin: 0 10px;
}

.region-content img {
height: auto !important;
max-width: 100%;
margin: 0.5rem;
}

a img:focus {
border: 2px #F1BE48;
}

/* CK Editor Enhanced Images */

figure.image {
display: table;
margin: 0;
}

figure.image img {
max-width: 100%;
display: block;
margin: 0;
}

figure.image figcaption {
display: table-caption;
caption-side: bottom;
padding: 0.5rem;
color: #333;
font-size: 0.85rem;
font-weight: 500;
border: 1px solid #ddd;
border-top: 0;
background-color: #eee;
}

figure.image br {
display: none;
}

figure.image.floated-left { margin: 0.25rem 1rem 0.25rem 0; }

figure.image.floated-right { margin: 0.25rem 0 0.25rem 1rem; }

figure.image.floated-left img,
figure.image.floated-right img { margin: 0; }

/* -------------------- */
/* ## UTILITY
/* -------------------- */
Expand Down Expand Up @@ -807,6 +845,14 @@ nav.navigation .secondary-menu>li a.active-trail {
text-decoration: underline;
}

/* ------------------- */
/* Footer Menus */

#section-footer ul.menu a {
color: #333;
text-decoration: none;
}

/* -------------------- */
/* ## CARETS
/* -------------------- */
Expand Down Expand Up @@ -1238,6 +1284,8 @@ nav.navigation .secondary-menu>li a.active-trail {
/* ## PANELS
/* -------------------- */

.panel-pane { clear: both; }

.panel-pane-nostyle {
padding: 0;
box-shadow: none;
Expand All @@ -1256,6 +1304,8 @@ nav.navigation .secondary-menu>li a.active-trail {

.panel-panel .pane-content p { padding: 0; }

.pane-content .item-list ul { padding-left: 0; }

.panel-panel .pane-content .views-row { padding: 0; }

/* Enable overflow on front panel panes
Expand Down Expand Up @@ -1287,17 +1337,6 @@ nav.navigation .secondary-menu>li a.active-trail {
overflow: hidden;
}

.panel-pane .views-field-title a.facetapi-active,
.panel-pane .pane-content .item-list li a.facetapi-active,
.region-sidebar-first .block .content .item-list li a.facetapi-active,
.region-sidebar-second .block .content .item-list li a.facetapi-active {
display: inline;
margin-right: 12px;
padding: 0;
vertical-align: text-bottom;
background: none;
}

.panel-pane .views-field-created > .field-content { color: #555555; }

.panel-pane .views-field { margin-bottom: 5px; }
Expand All @@ -1312,13 +1351,12 @@ nav.navigation .secondary-menu>li a.active-trail {
float: left;
}

.panel-pane .view-events .views-field-when-tiny-left .date-display-single {
color: #777777;
span.date-display-single {
color: #555555;
}

.panel-pane .view-events .views-field-title {
font-size: 14px;
font-weight: 700;
.panel-pane .view-events .views-field-when-tiny-left .date-display-single {
color: #777777;
}

.panel-panel .pane-content > p { padding: 0 10px; }
Expand Down Expand Up @@ -1372,15 +1410,8 @@ nav.navigation .secondary-menu>li a.active-trail {
word-break: break-word;
}


.front .panel-pane > h2.pane-title { display: block; }

.front .panel-pane .pane-content .item-list li {
margin-top: 8px;
padding-bottom: 8px;
border-bottom: 1px solid #eeeeee;
}

.front .item-list { display: block; }

.front .view-about-front-page .field-content li {
Expand Down Expand Up @@ -1739,6 +1770,127 @@ footer.submitted > span .placeholder {
white-space: nowrap;
}

/* -------------------- */
/* ## FACETS TAGS
/* -------------------- */

.block-facetapi .content .item-list ul ul {
margin-top: 0;
margin-left: 1rem;
}

/* All items */
.block-facetapi .content .item-list li a,
.block-facetapi .content .item-list li a.facetapi-active {
display: block;
position: relative;
padding: 0.25rem 0.5rem;
padding-left: 2rem;
border-radius: 3px;
margin-right: 0.25rem;
text-decoration: none !important;
font-size: 0.95rem;
color: #333;
transition: all 100ms ease;
}

/* Hover */
.block-facetapi .content .item-list li a:hover {
color: #ffffff;
background: #7A99AC;
border-color: #7A99AC;
}

/* Indicators */
.block-facetapi .content .item-list ul li a:before {
content: '';
position: absolute;
top: 0.45rem; left: 0.5rem;
height: 1rem;
width: 1rem;
margin-right: 5px;
padding-top: 2px;
font-size: 0.75rem;
line-height: 1;
text-align: center;
border: 1px solid #ddd;
border-radius: 2px;
}

.block-facetapi .content .item-list ul li a.facetapi-active:before,
.block-facetapi .content .item-list ul li a:hover:before {
content: '✓';
}

.block-facetapi .content .item-list ul li a.facetapi-active:hover:before {
content: '✕';
}

/* Just tags */
.block-facetapi .content .item-list .facetapi-facet-im-field-tags li a:not(.facetapi-active) {
display: inline-block;
padding-left: 0.5rem;
border: 1px solid #ddd;
}

.block-facetapi .content .item-list .facetapi-facet-im-field-tags li a:not(.facetapi-active):before {
display: none;
}

.block-facetapi .content .item-list .facetapi-facet-im-field-tags li {
float: left;
}

/* Active */
.block-facetapi .content .item-list .facetapi-facet-im-field-tags li a.facetapi-active,
.block-facetapi .content .item-list li a.facetapi-active {
color: #ffffff;
font-weight: 700;
background: #7A99AC;
border-color: #7A99AC;
}

/* Hover */
.block-facetapi .content .item-list li a.facetapi-active:hover {
color: #000;
background: #eee;
border-color: #ddd;
}

.facetapi-x {
display: none;
}

/* Show More/Less */

.block-facetapi .content .item-list .facetapi-facet-im-field-tags:after {
content: '';
display: block;
clear: both;
}

a.facetapi-limit-link {
display: inline-block;
padding: 0.25rem 0.5rem;
color: #000;
font-size: 0.9rem;
text-decoration: none;
background: #ddd;
border-radius: 3px;
}

a.facetapi-limit-link:hover {
background: #ccc;
text-decoration: none;
}

a.facetapi-limit-link:not(.open):after {
content: ' +';
}
a.facetapi-limit-link.open:after {
content: ' -';
}


/* -------------------- */
/* ## FACETS SIDEBAR
Expand Down
32 changes: 32 additions & 0 deletions js/suitcase_image_floats.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Function for adding the appropriate margins to floated images
* And floated images with captions.
*/

(function($) {
$(document).ready( function() {
$('figure.image')
.filter(function() {
return $(this).css('float') == 'left';
})
.addClass('floated-left');

$('figure.image')
.filter(function() {
return $(this).css('float') =='right';
})
.addClass('floated-right');

$('.content img')
.filter(function() {
return $(this).css('float') == 'left';
})
.addClass('floated-left');

$('.content img')
.filter(function() {
return $(this).css('float') == 'right';
})
.addClass('floated-right');
});
})(jQuery);
7 changes: 6 additions & 1 deletion suitcase_interim.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ core = '7.x'
engine = 'phptemplate'
screenshot = 'screenshot.png'
base theme = 'omega'
version = '1.0,1'
version = '1.0.2'
plugins[panels][layouts] = panels/layouts
regions[page_top] = 'Page Top'
regions[page_bottom] = 'Page Bottom'
Expand Down Expand Up @@ -88,6 +88,7 @@ settings[alpha_libraries][suitcase_sticky_menu] = 'suitcase_sticky_menu'
settings[alpha_libraries][suitcase_gridheight] = 'suitcase_gridheight'
settings[alpha_libraries][suitcase_jquery_smart_menu] = 'suitcase_jquery_smart_menu'
settings[alpha_libraries][suitcase_smart_menu_init] = 'suitcase_smart_menu_init'
settings[alpha_libraries][suitcase_image_floats] = 'suitcase_image_floats'
settings[alpha_css][alpha-reset.css] = 'alpha-reset.css'
settings[alpha_css][alpha-mobile.css] = 'alpha-mobile.css'
settings[alpha_css][alpha-alpha.css] = 'alpha-alpha.css'
Expand Down Expand Up @@ -407,3 +408,7 @@ libraries[suitcase_smart_menu_init][name] = 'Suitcase SmartMenu Init'
libraries[suitcase_smart_menu_init][description] = 'Initializes jQuery SmartMenus for Suitcase'
libraries[suitcase_smart_menu_init][js][0][file] = 'suitcase_smart_menu.js'
libraries[suitcase_smart_menu_init][js][0][options][weight] = '-10'
libraries[suitcase_image_floats][name] = 'Suitcase Image Floats'
libraries[suitcase_image_floats][description] = 'Provides a javascript library that adds a class to floated images'
libraries[suitcase_image_floats][js][0][file] = 'suitcase_image_floats.js'
libraries[suitcase_image_floats][js][0][options][weight] = '30'
Loading

0 comments on commit aba9d35

Please sign in to comment.