Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@njbooher
njbooher committed Dec 28, 2016
2 parents 5ad074b + 43b9b80 commit d493e6a
Show file tree
Hide file tree
Showing 10 changed files with 241 additions and 238 deletions.
169 changes: 86 additions & 83 deletions css/suitcase.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,88 +310,6 @@ a>.fa {
/*////////////////////////////////////*/
/* Stuff */

.pwrapper {
background-color: #333;
}

/*////////////////////////////////////*/
/* Dark Ribbon */
.isu-dark-ribbon .wd-ribbon-menu {
list-style: none;
margin: 0;
padding: 0;
overflow: hidden;
}

.isu-dark-ribbon .isu-index {
float: left;
}

.isu-dark-ribbon .isu-directory-info {
float: right;
}

.isu-dark-ribbon .isu-alpha-index {
float: right;
margin-right: 3px;
}

.isu-dark-ribbon .wd-ribbon-menu-stack li,
.isu-dark-ribbon .wd-ribbon-menu li {
float: left;
}

.isu-dark-ribbon .wd-ribbon-menu li a,
.isu-dark-ribbon .wd-ribbon-menu-header {
color: #ccc;
display: block;
font-size: 13px;
line-height: 2.2;
padding: 0 6px;
text-decoration: none;
}

.isu-dark-ribbon .wd-ribbon-menu li a:hover,
.isu-dark-ribbon .wd-ribbon-menu-header:hover {
color: #fff;
background-color: #555;
transition: all 0.25s ease;
}

.isu-dark-ribbon .isu-directory-info.wd-ribbon-menu li a,
.isu-dark-ribbon .isu-index.wd-ribbon-menu li a {
border-left: 1px solid #aaa;
border-right: 1px solid #aaa;
}

.isu-dark-ribbon .isu-responsive-toggles {
display: none;
}

.isu-dark-ribbon .wd-ribbon-menu-group {
list-style: none;
margin: 0;
padding: 0;
}

.isu-dark-ribbon .wd-ribbon-menu-header {
display: none;
}

.isu-dark-ribbon .wd-ribbon-menu .isu-alpha-index li a {
padding: 0 2px;
min-width: 7px;
text-align: center;
}

.isu-dark-ribbon .hlist.borders.left > li > a {
border-right: 0;
}

.isu-dark-ribbon .isu-directory-info + .isu-alpha-index .wd-ribbon-menu {
margin-right: 3px;
}

.page {
background-color: #fff;
}
Expand Down Expand Up @@ -576,6 +494,91 @@ input[type="submit"] {
background-image: none;
}

/*////////////////////////////////////*/
/* ISU Menu Bar */

#zone-isu-menu-wrapper {
background: #333;
color: #ccc;
}

#isu-menu-nav .sm {
z-index: 499 !important;
}

#isu-menu-nav .sm li {
float: left;
}

#isu-menu-nav .sm ul li {
float: none;
}

#isu-menu-nav .sm a,
#isu-menu-nav .sm a:hover,
#isu-menu-nav .sm a:focus,
#isu-menu-nav .sm a:active {
color: #ccc;
font-size: 13px;
font-weight: 400;
line-height: 20px;
padding: 4px 8px;
text-decoration: none;
transition: all .25s ease;
}

#isu-menu-nav .sm a:hover,
#isu-menu-nav .sm a:focus,
#isu-menu-nav .sm a:active,
#isu-menu-nav .sm a.highlighted {
background-color: #555;
color: #fff;
transition: all 0.25s ease;
}

#isu-menu-nav .sm ul * {
transition: display 0.5s ease;
}

#isu-menu-nav .sm ul a,
#isu-menu-nav .sm ul a:hover,
#isu-menu-nav .sm ul a:focus,
#isu-menu-nav .sm ul a:active {
background-color: #555;
color: #ccc;
font-size: 13px;
font-weight: 300;
line-height: 20px;
padding: 4px 10px;
min-width: 20px;
transition: all .25s ease;
}

#isu-menu-nav .sm ul a:hover,
#isu-menu-nav .sm ul a:focus,
#isu-menu-nav .sm ul a:active,
#isu-menu-nav .sm ul a.highlighted {
background-color: #777;
color: #fff;
transition: all 0.25s ease;
}

#isu-menu-nav #isu-index-menu {
float: left;
}

#isu-menu-nav #isu-index-menu ul a,
#isu-menu-nav #isu-index-menu ul a:hover,
#isu-menu-nav #isu-index-menu ul a:focus,
#isu-menu-nav #isu-index-menu ul a:active {
padding: 4px 3px;
text-align: center;
}

#isu-menu-nav #isu-quick-links-menu {
float: right;
}

/*////////////////////////////////////*/
/* Site Name/Slogan */

Expand Down Expand Up @@ -694,7 +697,7 @@ input[type="submit"] {
/* Main menu */

.sm {
z-index: 499 !important;
z-index: 498 !important;
}

#main-menu a,
Expand Down
154 changes: 62 additions & 92 deletions css/suitcase_responsive.css
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,55 @@
@media (min-width: 740px) {

.isu-dark-ribbon .wd-ribbon-menu-stack {
padding-left: 10px;
padding-right: 10px;
#isu-menu-nav .sm a span.sub-arrow {
position: absolute;
left: auto;
overflow: hidden;
font: bold 16px/34px monospace !important;
text-align: center;
text-shadow: none;
top: 50%;
margin-top: -2px;
right: 8px;
width: 0;
height: 0;
border-width: 4px;
border-style: solid dashed dashed dashed;
border-color: #ccc transparent transparent transparent;
background: transparent;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0;
}

#isu-menu-nav .sm a.has-submenu {
padding-right: 24px;
}


#isu-menu-nav #isu-index-menu ul {
min-width: 528px;
}

#isu-menu-nav #isu-index-menu ul li {
float: left;
}

#isu-menu-nav #isu-index-menu ul li:first-of-type a,
#isu-menu-nav #isu-index-menu ul li:first-of-type a:hover,
#isu-menu-nav #isu-index-menu ul li:first-of-type a:focus,
#isu-menu-nav #isu-index-menu ul li:first-of-type a:active {
min-width: 24px;
padding-left: 6px;
}

#isu-menu-nav #isu-index-menu ul li:last-of-type a,
#isu-menu-nav #isu-index-menu ul li:last-of-type a:hover,
#isu-menu-nav #isu-index-menu ul li:last-of-type a:focus,
#isu-menu-nav #isu-index-menu ul li:last-of-type a:active {
min-width: 24px;
padding-right: 6px;
}

#main-menu a span.sub-arrow {
Expand All @@ -26,6 +73,10 @@
padding-right: 24px;
}

#main-menu ul {
min-width: 300px;
}

.zone-footer>.region:not(:last-child) {
border-bottom: none;
margin-bottom: 0;
Expand All @@ -44,6 +95,14 @@

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

.region-isu-menu {
margin: 0;
}

#isu-menu-nav .sm ul {
display: none !important;
}

.region-menu {
margin: 0;
}
Expand All @@ -56,77 +115,6 @@
margin-left: 0;
}

.isu-dark-ribbon .isu-responsive-toggles {
display: block;
float: left;
padding: 5px 0 5px 5px;
}

.isu-dark-ribbon .isu-responsive-toggles li a {
border-radius: 3px;
height: 28px;
margin-right: 5px;
padding: 3px;
position: relative;
}

.isu-dark-ribbon .wd-ribbon-menu-stack {
float: right;
padding: 8px 5px 8px 0;
}

.isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu {
background-color: #ddd;
opacity: 0;
padding: 5px 0 0;
position: absolute;
right: 0;
top: 0;
width: 100%;
z-index: 100;
}

.lt-ie10 .isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu {
top: -100%;
}

.isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu {
margin-right: 0;
display: none;
}

.isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu.active {
opacity: 1;
}

.lt-ie10 .isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu.active {
top: -34px;
}

.isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu li {
float: right;
}

.isu-dark-ribbon .wd-ribbon-menu-stack .wd-ribbon-menu li a {
background-color: #444;
border: 0;
border-radius: 3px;
color: #fff;
margin: 0 5px 5px 0;
padding: 3px 9px !important;
text-decoration: none;
}

.isu-dark-ribbon .wd-ribbon-menu-header {
display: block;
}

.isu-dark-ribbon .isu-alpha-index {
margin-right: 0;
border-left: 1px solid rgba(255, 255, 255, 0.5);
border-right: 1px solid rgba(255, 255, 255, 0.5);
}

.zone-footer .block-menu-footer {
float: none;
}
Expand Down Expand Up @@ -154,23 +142,6 @@
width: 100%;
}

/*-- Top strip --*/
.isu-dark-ribbon .isu-alpha-index .wd-ribbon-menu li a {
display: none;
}

.isu-dark-ribbon .isu-alpha-index .wd-ribbon-menu li.first a {
display: block;
}

.isu-dark-ribbon .isu-alpha-index .wd-ribbon-menu li.first a:before {
content: 'Index ';
}

.isu-dark-ribbon .isu-alpha-index .wd-ribbon-menu li.first a:after {
content: ' - Z';
}

.zone-content h2.block-title {
line-height: 2em;
}
Expand Down Expand Up @@ -212,7 +183,6 @@
.zone-header-wrapper,
.zone-preface-wrapper,
#breadcrumb,
.pwrapper,
.tabs,
.section-footer,
.content-type-indicator,
Expand Down
6 changes: 5 additions & 1 deletion js/suitcase_smart_menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
Drupal.behaviors.suitcaseSmartMenu = {
attach: function (context) {
$('body', context).once('suitcaseSmartMenu', function() {
$('.sm').smartmenus();
// do this using .each so that data-sm-options attribute is correctly
// detected and applied separately for each menu
$('.sm').each(function(index, element) {
$(this).smartmenus();
});
// https://www.smartmenus.org/docs/#menu-toggle-button
$('.sm-menu-state').change(function(e) {
var $menu = $('#' + this.id.slice(0, -6));
Expand Down
Loading

0 comments on commit d493e6a

Please sign in to comment.