Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
angelamnr committed Apr 21, 2017
2 parents d0fc533 + 9ec5dd6 commit 40df8ea
Show file tree
Hide file tree
Showing 6 changed files with 295 additions and 83 deletions.
220 changes: 190 additions & 30 deletions css/suitcase.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
font-weight: normal;
}

#page-title {
margin-top: 0;
margin-right: 0;
/* Steer clear of content-type-indocator */
padding-top: 1.5rem;
}

/* --------------------- */
/* Text */

Expand Down Expand Up @@ -109,6 +116,23 @@ a > .fa { margin-right: 10px; }
background: #333333;
}

/* External Links */

#section-content a.external:after {
content: '\f08e';
font-family: 'FontAwesome';
font-size: 0.75em;
display: inline-block;
margin-left: 4px;
vertical-align: text-top;
}

#section-content .pane-menu-menu-social a.external:after,
#section-content .view-resources a.external:after,
#section-content .biblio-entry a.external:after {
content: '';
}

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

Expand Down Expand Up @@ -332,8 +356,7 @@ figure .insert-default-image-styling + figcaption {

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

/* CK Editor Enhanced Images */
Expand Down Expand Up @@ -1054,6 +1077,29 @@ a:hover > .fa-instagram {
text-decoration: underline;
}

/* -------------------- */
/* ## CONTENT TYPE INDICATORS
/* -------------------- */

.content-type-indicator {
position: absolute;
top: 0;
right: 0;
font-size: 0.95rem;
color: #666;
font-weight: 500;
}

/* In search */
.page-search article {
position: relative;
}

.content-type-indicator.ct-search {
margin-top: 5px;
margin-right: 5px;
}

/* -------------------- */
/* ## ALERTS
/* -------------------- */
Expand Down Expand Up @@ -1569,6 +1615,96 @@ span.date-display-single {
margin-left: 20px;
}

/* -------------------- */
/* Image Links Panel Styles */


/* --- Image & Link Below --- */

.image-link a {
display: block;
color: #ffffff;
line-height: 0;
text-decoration: none;
}

.image-link a:hover {
box-shadow: 0 0 5px 1px #7a99ac;
}

.image-link img {
width: 100%;
}

.image-link h2 {
margin: 0;
padding: 0.75rem;
line-height: 1.25;
font-weight: normal;
text-align: center;
background: #cc0000;
}

.image-link i {
margin-right: 0.5rem
}

.link-red h2 { background: #cc0000; }

.link-blue h2 { background: #006ba6; }

.link-green h2 { background: #76881d; }

.link-dark-red h2 { background: #7c2529; }

.link-dark-blue h2 { background: #003D4C; }

.link-dark-green h2 { background: #3E4827; }

/* --- Image overlay --- */

.image-overlay a {
display: block;
position: relative;
color: #fff;
line-height: 0;
text-decoration: none;
}

.image-overlay a:hover {
box-shadow: 0 0 5px 1px #7a99ac;
}

.image-overlay img {
width: 100%;
}

.image-overlay h2 {
position: absolute;
width: 100%;
bottom: 20%;
right: 0;
width: auto;
max-width: 90%;
margin: 0;
padding: 0.5rem 0.75rem;
line-height: 1.25;
font-weight: normal;
text-align: right;
background: rgba(0, 0, 0, 0.75);
}

.image-overlay.overlay-full h2 {
bottom: 0;
width: 100%;
max-width: none;
text-align: left;
}

.image-overlay i {
margin-right: 0.5rem;
}

/* -------------------- */
/* ## VIEWS - GENERAL
/* -------------------- */
Expand Down Expand Up @@ -1598,45 +1734,49 @@ span.date-display-single {
}

/* -------------------- */
/* Grid for Views */
/* ## VIEWS - FLEXGRID
/* -------------------- */

.luggage-grid .view-content > h3 {
display: block;
padding: 5px;
color: #444444;
font-size: 20px;
font-weight: 700;
clear: both;
.luggage-grid .view-content {
display: flex;
flex-flow: wrap;
}

.luggage-grid .luggage-gridrow {
height: auto; width: 100%;
margin: 0 0.25% 8px 0.25%;
padding: 1em;
float: left;
overflow: hidden;
.luggage-gridrow,
.luggage-gridrow3,
.luggage-gridrow4 {
background: rgba(255, 255, 255, 0.7);
border: 1px solid #dddddd;
box-sizing: border-box;
padding: 15px;
margin: 0 0.7%;
outline: 1px solid #ddd;
flex: 0 0 100%;
}

.luggage-grid .luggage-gridrow .views-field img {
margin: 2.5px 15px 2.5px 2.5px;
.luggage-gridrow img,
.luggage-gridrow3 img,
.luggage-gridrow4 img {
float: left;
padding: 5px 5px 0 0;
}

.luggage-grid .luggage-gridrow .views-field-title {
font-size: 1.1em;
.luggage-grid .view-content > h3 {
padding: 5px;
color: #444444;
font-size: 20px;
font-weight: 700;
width: 100%;
}

.luggage-grid .luggage-gridrow .luggage-gridgreen {
margin-bottom: 16px;
.views-field-field-uri-1 {
margin-bottom: 1rem;
}

.luggage-grid .luggage-gridrow .luggage-gridgreen,
.luggage-grid .luggage-gridrow .luggage-gridgreen a {
font-style: italic;
color: rgb(36, 109, 73);
.views-field-field-uri-1 a {
color: #616161;
word-wrap: break-word;
-ms-word-break: break-all;
word-break: break-all;
}

/* -------------------- */
Expand Down Expand Up @@ -1888,6 +2028,10 @@ h2.node-title > a:visited { text-decoration: underline; }

.field-item td { min-width: 100px; }

.field-type-entityreference {
position: relative;
}

/* -------------------- */
/* ## NODE - BIBLIO
/* -------------------- */
Expand Down Expand Up @@ -2258,11 +2402,27 @@ a.facetapi-limit-link.open:after {
background: #cccccc;
}

.js-suitcase-facet .caret:after { transform: rotate(90deg); }
.js-suitcase-facet .caret:after {
transform: rotate(90deg);
opacity: 0;
}

.block-title .caret:after { opacity: 0; }
.js-suitcase-facet .block-title-closed .caret:after {
opacity: 1;
}

/* -------------------- */
/* ## COLLAPSIBLE BLOCKS
/* -------------------- */

.block-inner .block-title-open .caret:after { opacity: 100; }
.js-suitcase-facet .content.block-closed {
position: absolute;
left: -10000px;
top: auto;
width: 1px;
height: 1px;
overflow: hidden;
}

/* -------------------- */
/* ## EVENTS
Expand Down
55 changes: 48 additions & 7 deletions css/suitcase_responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,25 @@
.flexslider {
display: block;
}
}

@media all and (max-width: 550px) {

.luggage-grid .luggage-gridrow {
width: 49.5%;
.node-people .field-label-inline .field-label,
.node-people .field-lable-inline .field-items,
.node-people .field-label-above .field-label,
.node-people .field-lable-above .field-items {
display: block;
width: auto;
margin-bottom: 0.5rem;
float: none;
text-align: left;
}

.node-people .field-label-inline,
.node-people .field-label-above {
padding: 1rem;
}
}

@media all and (max-width: 739px) {
Expand Down Expand Up @@ -150,6 +163,10 @@
.panel-2col-bricks .panel-col-last .inside {
margin: 0;
}

.view-luggage-announcements .flexslider .flex-caption {
position: static;
}
}

@media all and (max-width: 979px) {
Expand All @@ -160,11 +177,6 @@
word-break: break-all;
}

.view .field-content a {
display: block;
width: 100%;
}

.zone-content h2.block-title {
line-height: 2em;
}
Expand Down Expand Up @@ -332,3 +344,32 @@
}

}

@media only screen and (min-width: 769px) {
.luggage-gridrow,
.luggage-gridrow3,
.luggage-gridrow4 {
flex-basis: 48.6%;
min-width: 48.6%;
}
}

@media only screen and (min-width: 1024px) {
.luggage-gridrow4 {
flex-basis: 23.5%;
min-width: 23.5%;
}
}

@media only screen and (min-width: 1024px) {
.luggage-gridrow3 {
flex-basis: 31.3%;
min-width: 31.3%;
}

.luggage-gridrow3 .views-field-field-uri-1,
.luggage-gridrow4 .views-field-field-uri-1 {
overflow-wrap: break-word;
word-wrap: break-word;
}
}
15 changes: 15 additions & 0 deletions js/suitcase_external_links.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Function for adding a class to external links
* so they can be styled.
*/

(function ($) {

$(document).ready(function() {

$('a').filter(function() {
return this.hostname && this.hostname !== location.hostname;
}).not('a:has(img)').addClass('external');
});

})(jQuery);
Loading

0 comments on commit 40df8ea

Please sign in to comment.