rdrew
/
olivespostcards
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

menu fix

master
rdrew 1 week ago
parent
59c74eaf28
commit
9dc5958bcc
4 changed files with 107 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      css/base/base.css
  2. 67
      css/components/navigation/nav-primary-wide.css
  3. 2
      css/layout/social-bar_.css
  4. 53
      deploy.sh

4
css/base/base.css
Unescape View File

@ -27,8 +27,8 @@ html {
body {
margin: 0;
color: var(--color-text-neutral-medium);
background-color: var(--color--gray-100);
/*background-color: #ece8e3;*/
/* background-color: var(--color--gray-100); */
background-color: #ece8e3;
/*background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='50' height='84' viewBox='0 0 50 84'%3e %3cpath opacity='0.05' fill='%230e6ba6' d='M25,61.7C25,68.5,19.4,74,12.5,74S0,68.5,0,61.7c0-5.7,3.9-9.6,7.4-12.9c2.3-2.2,4.5-4.4,5.1-6.8c0.7,2.4,2.8,4.6,5.1,6.8C21.1,52.2,25,56,25,61.7z M42.6,6.8c-2.3-2.2-4.5-4.4-5.1-6.8c-0.7,2.4-2.9,4.6-5.1,6.8C28.9,10.2,25,14,25,19.7C25,26.5,30.6,32,37.5,32S50,26.5,50,19.7C50,14,46.1,10.2,42.6,6.8z'/%3e%3c/svg%3e");*/
/*background-position: top left; [> LTR <]*/
}

67
css/components/navigation/nav-primary-wide.css
Unescape View File

@ -10,17 +10,25 @@
* Nav Primary (wide widths).
*/
@media ((((min-width: 60rem)))) {
/* @media ((((min-width: 60rem)))) { */
@media ((((min-width: 86rem)))) {
body:not(.is-always-mobile-nav) .primary-nav__menu-item {
flex-wrap: nowrap; /* Ensure that sub navigation toggle button doesn't wrap underneath link. */
}
body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--link,
body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--nolink {
body:not(.is-always-mobile-nav)
.primary-nav__menu-item.primary-nav__menu-item--has-children
.primary-nav__menu-link--link,
body:not(.is-always-mobile-nav)
.primary-nav__menu-item.primary-nav__menu-item--has-children
.primary-nav__menu-link--nolink {
flex-basis: auto;
}
/* Remove hover state if submenu exists. */
body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--level-1 .primary-nav__menu-link-inner::after {
body:not(.is-always-mobile-nav)
.primary-nav__menu-item.primary-nav__menu-item--has-children
.primary-nav__menu-link--level-1
.primary-nav__menu-link-inner::after {
content: none;
}
@ -46,22 +54,26 @@
border: solid 2px var(--color--primary-50);
border-radius: 0.25rem;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--button.primary-nav__menu-link--has-children {
overflow: visible; /* Necessary to view icon in IE11 */
padding-inline-end: 0.5625rem;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:focus::before {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--button.primary-nav__menu-link--has-children:focus::before {
width: calc(100% + var(--sp1-5));
content: "";
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children::before {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--button.primary-nav__menu-link--has-children::before {
content: none;
}
/* Chevron icon for desktop navigation. */
body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children::after {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--button.primary-nav__menu-link--has-children::after {
position: absolute;
inset-block-start: 50%;
inset-inline-start: calc(100% - 0.1875rem);
@ -75,7 +87,8 @@
border-bottom: solid 2px currentColor;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children[aria-expanded="true"]::after {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--button.primary-nav__menu-link--has-children[aria-expanded="true"]::after {
opacity: 1;
}
@ -111,7 +124,8 @@
margin-inline-end: 0;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:not(:last-child) {
body:not(.is-always-mobile-nav)
.primary-nav__menu-item--level-1:not(:last-child) {
margin-inline-end: var(--sp2);
}
@ -125,7 +139,11 @@
width: 19.625rem;
/* Ensure that long level-2 menus will never overflow viewport (focused
* elements should always be in viewport per accessibility guidelines). */
max-height: calc(100vh - var(--site-header-height-wide) - var(--drupal-displace-offset-top, 0px) - var(--drupal-displace-offset-bottom, 0px) - var(--sp));
max-height: calc(
100vh - var(--site-header-height-wide) -
var(--drupal-displace-offset-top, 0px) -
var(--drupal-displace-offset-bottom, 0px) - var(--sp)
);
margin-block-start: 0;
margin-inline-start: 0;
padding-block: calc(3 * var(--sp));
@ -145,10 +163,11 @@
border-radius: 0 0 2px 2px;
background: var(--color--white);
box-shadow: 0 1px 36px rgba(0, 0, 0, 0.08);
padding-block: 1rem;
padding-block: 1rem;
}
body:not(.is-always-mobile-nav) .primary-nav__menu--level-2.is-active-menu-parent {
body:not(.is-always-mobile-nav)
.primary-nav__menu--level-2.is-active-menu-parent {
visibility: visible;
margin-block-start: 0;
transform: translate(-50%, 0);
@ -159,25 +178,33 @@ padding-block: 1rem;
display: block;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2:focus::before {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--level-2:focus::before {
top: 0;
left: calc(var(--sp0-5) * -1);
height: 100%;
transform: none;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--level-2
.primary-nav__menu-link-inner {
padding-block: var(--sp0-5);
padding-inline-start: 0;
padding-inline-end: 0;
}
body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner::after {
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--level-2
.primary-nav__menu-link-inner::after {
transform-origin: left; /* LTR */
border-top-width: 3px;
}
[dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner::after {
[dir="rtl"]
body:not(.is-always-mobile-nav)
.primary-nav__menu-link--level-2
.primary-nav__menu-link-inner::after {
transform-origin: right;
}
@ -212,7 +239,11 @@ padding-block: 1rem;
* little extra room when the toolbar is fixed (and is shorter).
*/
body:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2 {
max-height: calc(100vh - var(--site-header-height-wide) - var(--drupal-displace-offset-top, 0px) - var(--drupal-displace-offset-bottom, 0px) - var(--sp) + var(--sp4));
max-height: calc(
100vh - var(--site-header-height-wide) -
var(--drupal-displace-offset-top, 0px) -
var(--drupal-displace-offset-bottom, 0px) - var(--sp) + var(--sp4)
);
}
}

2
css/layout/social-bar_.css
Unescape View File

@ -16,6 +16,8 @@
flex-shrink: 0;
width: var(--content-left);
background-color: var(--color--gray-100);
background-color: #ece8e3;
border-right: 1px solid #ddd;
}
}

53
deploy.sh
Unescape View File

@ -0,0 +1,53 @@
#!/bin/bash
#====NEED TO AUTOMATE AUTH IN ADVANCE:
#(check for and create if missing on server)
#mkdir -p ~/.ssh
#chmod 700 ~/.ssh
#touch ~/.ssh/authorized_keys
#chmod 600 ~/.ssh/authorized_keys
#(run these on local)
#ssh-keygen -t ed25519
#ssh-copy-id rdrew@newspapers2.islandarchives.ca
# --------------------------------------------------------
# --- CONFIGURATION (Edit these for new environments) ---
# SERVER="newspapers2.islandarchives.ca"
SERVER="islandarchives2.islandarchives.ca"
THEME_DIR="/var/www/islandarchives2/web/themes/custom/olivespostcards"
SITE_ROOT="/var/www/islandarchives2/web/sites/islandarchives2.islandarchives.ca"
DRUSH_PATH="/var/www/islandarchives2/vendor/drush/drush/drush"
# --------------------------------------------------------
# 1. Check if a commit message was provided
if [ -z "$1" ]; then
echo "❌ Error: Please provide a commit message."
echo "Usage: ./deploy.sh 'Your message here'"
exit 1
fi
COMMIT_MSG="$1"
echo "🚀 Starting deployment workflow..."
# 2. Local Git workflow
echo "📦 Committing and pushing local changes..."
git add --all
git commit -m "$COMMIT_MSG"
git push
# 3. Remote Server workflow
echo "🔗 Connecting to $SERVER..."
# We wrap the remote commands in a single string for SSH
# The '&&' ensures that if one step fails, the script stops immediately.
ssh "$SERVER" "
echo '📥 Pulling code into theme folder...' && \
cd $THEME_DIR && \
git pull && \
echo '🧹 Rebuilding Drupal cache...' && \
cd $SITE_ROOT && \
$DRUSH_PATH cr
"
echo "✅ Done! Deployment successful."
Write Preview
Loading…
Cancel
Save