Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
angelamnr committed Aug 29, 2017
2 parents 6efa066 + 03145e2 commit ce9a248
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
17 changes: 15 additions & 2 deletions css/suitcase.css
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ img {

/* Target only images in content */
.field-name-body img {
height: auto;
height: auto !important;
max-width: calc(100% - 1rem);
margin: 0.5rem;
}
Expand Down Expand Up @@ -1812,6 +1812,12 @@ aside.region {
border: 1px solid #dddddd;
}

/* But no padding or border in the Views Accordion */
.ui-accordion .views-row {
padding: 0;
border: 0;
}

/* --- .item-list --- */

.item-list ul {
Expand Down Expand Up @@ -1863,6 +1869,12 @@ ul.menu li {
position: relative;
}

/* In views */
.view-content article {
/* Contain absolute positioned indicator */
position: relative;
}

/* -------------------- */
/* ## FIELDS & LABELS
/* -------------------- */
Expand Down Expand Up @@ -2262,6 +2274,8 @@ table.responsive-table,

h2.node-title {
margin-top: 0;
/* To steer clear of content type indicators */
padding-top: 1.5rem;
}

.node .field-name-field-category {
Expand Down Expand Up @@ -2633,7 +2647,6 @@ td.views-field-field-resource-screenshot img {
height: auto !important;
margin-top: 0.5rem !important;
padding: 0.5rem;
padding-right: 1.15rem;
font-size: 1rem;
}

Expand Down
3 changes: 2 additions & 1 deletion template.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ function suitcase_interim_menu_link__menu_social($variables) {
'instagram' => 'fa-instagram',
'pinterest' => 'fa-pinterest-square',
'github' => 'fa-github-square',
'rss' => 'fa-rss-square'
'rss' => 'fa-rss-square',
'snapchat' => 'fa-snapchat-square'
);

$font_awesome_icon = '';
Expand Down

0 comments on commit ce9a248

Please sign in to comment.