From 8edf4026e618f1da4067633615cc9d06c8d76867 Mon Sep 17 00:00:00 2001 From: rdrew Date: Wed, 6 May 2026 15:22:58 -0300 Subject: [PATCH] test --- bs.js | 18 ++++----- css/base.css | 87 +++++++++++++++++++++-------------------- css/header.css | 102 +++++++++++++++++++++++++++---------------------- deploy.sh | 14 +++---- logo.svg | 40 ++++++++++++++++++- logo.svg.old | 3 ++ 6 files changed, 158 insertions(+), 106 deletions(-) create mode 100644 logo.svg.old diff --git a/bs.js b/bs.js index 99cabf3..27de24f 100755 --- a/bs.js +++ b/bs.js @@ -2,15 +2,15 @@ var browserSync = require("browser-sync"); browserSync({ //proxy: 'http://137.149.200.93', - proxy: "https://ill.libraryupei.ca", + proxy: "https://drupal-theme-dev.ddev.site", // files: "css/**/*.css", files: ["css/**/*.css", "js/**/*.js"], - plugins: ["bs-rewrite-rules"], - serveStatic: ["."], - rewriteRules: [ - { - match: /\/themes\/custom\/olivesnews/g, - replace: "", - }, - ], + // plugins: ["bs-rewrite-rules"], + // serveStatic: ["."], + // rewriteRules: [ + // { + // match: /\/themes\/custom\/olivesnews/g, + // replace: "", + // }, + // ], }); diff --git a/css/base.css b/css/base.css index e437733..6151b0e 100644 --- a/css/base.css +++ b/css/base.css @@ -1,11 +1,11 @@ /* Variables ---------------------------------------- */ :root { - --primary: #365AB5; - --secondary: #D05700; + --primary: #8c2004; + --secondary: #d05700; --dark: #232742; - --light: #D5DCEE; - --border: #99A4C1; + --light: #d5dcee; + --border: #99a4c1; --color-text: #444444; --color-heading: #111111; @@ -40,7 +40,7 @@ html:focus-within { } html { font-size: 16px; - scroll-behavior: smooth; + scroll-behavior: smooth; } html, body { @@ -48,7 +48,8 @@ body { } body { color: var(--color-text); - font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 1rem; font-weight: 400; min-height: 100vh; @@ -60,6 +61,7 @@ body { -webkit-font-smoothing: subpixel-antialiased; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + background: #e0e0e0; } /* Regions ---------------------------------------- */ @@ -207,11 +209,12 @@ var { mark { background: var(--primary); } -acronym[title], abbr[title] { +acronym[title], +abbr[title] { border-bottom: none; text-decoration: underline; -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; + text-decoration: underline dotted; } abbr, acronym { @@ -225,7 +228,7 @@ canvas, progress, video { vertical-align: baseline; - max-width:100%; + max-width: 100%; } audio:not([controls]) { display: none; @@ -294,7 +297,7 @@ select { text-transform: none; } .button { - display:inline-block; + display: inline-block; } .button, button, @@ -487,38 +490,38 @@ blockquote > :last-child { /* List ---------------------------------------- */ - ul, - ol { - margin: 0; - padding: 0 0 0.25rem 1rem; - } - [dir="rtl"] ul, - [dir="rtl"] ol { - padding: 0 1rem 0.25rem 0; - } - ol ol, - ul ul { - margin: 0; - padding: 0 0 0.25rem 1rem; - } - [dir="rtl"] ol ol, - [dir="rtl"] ul ul { - padding: 0 1rem 0.25rem 0; - } - ul { - list-style: disc; - } - li > ul, - li > ol { - margin-bottom: 0; - } - [dir="rtl"] ul, - [dir="rtl"] ol { - padding: 0 1rem 0.25rem 0; - } - li { - padding: 4px 0; - } +ul, +ol { + margin: 0; + padding: 0 0 0.25rem 1rem; +} +[dir="rtl"] ul, +[dir="rtl"] ol { + padding: 0 1rem 0.25rem 0; +} +ol ol, +ul ul { + margin: 0; + padding: 0 0 0.25rem 1rem; +} +[dir="rtl"] ol ol, +[dir="rtl"] ul ul { + padding: 0 1rem 0.25rem 0; +} +ul { + list-style: disc; +} +li > ul, +li > ol { + margin-bottom: 0; +} +[dir="rtl"] ul, +[dir="rtl"] ol { + padding: 0 1rem 0.25rem 0; +} +li { + padding: 4px 0; +} /* Table ---------------------------------------- */ diff --git a/css/header.css b/css/header.css index 9966f28..84f70d5 100644 --- a/css/header.css +++ b/css/header.css @@ -7,7 +7,13 @@ position: relative; width: 100%; margin: 0; - padding: 0.5rem 0; + padding: 0.5rem 0; + background-color: #333; + .menu-wrap .menu, + .menu-wrap .menu a, + a { + color: #fff; + } } .header-top-container { position: relative; @@ -16,16 +22,16 @@ display: flex; -webkit-box-orient: vertical; -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - gap: 1rem; - flex-wrap: wrap; + -ms-flex-align: center; + align-items: center; + gap: 1rem; + flex-wrap: wrap; } .region-header-top-left, .region-header-top-right { @@ -61,11 +67,11 @@ display: -ms-flexbox; display: flex; -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; gap: 1rem; } /* Header -> Site branding */ @@ -75,14 +81,18 @@ display: -ms-flexbox; display: flex; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; padding-right: 1rem; } .site-logo { padding-right: 5px; } .site-logo img { + width: 142px; + border-right: 2px solid #fff; + padding-right: 0.5em; + margin-right: 0.5em; display: block; } .site-name-slogan { @@ -91,11 +101,11 @@ display: flex; -webkit-box-orient: vertical; -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; + -ms-flex-pack: center; + justify-content: center; } .site-name, .site-slogan { @@ -109,8 +119,8 @@ display: -ms-flexbox; display: flex; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; gap: 0.5rem; } .menu-wrap { @@ -126,8 +136,8 @@ box-shadow: none; z-index: 25; -webkit-transform: translateX(-100%); - -ms-transform: translateX(-100%); - transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); -webkit-transition: all 0.4s linear; -o-transition: all 0.4s linear; transition: all 0.4s linear; @@ -195,8 +205,8 @@ display: flex; -webkit-box-orient: vertical; -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; justify-content: space-between; width: 36px; height: 28px; @@ -239,13 +249,13 @@ .active-menu .menu-wrap { overflow-y: scroll; -webkit-transform: translateX(0); - -ms-transform: translateX(0); - transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); -webkit-transition: all 0.4s linear; -o-transition: all 0.4s linear; transition: all 0.4s linear; padding: 1rem; - box-shadow: 6px 0 1rem #111111; + box-shadow: 6px 0 1rem #111111; } .active-menu .menu { display: block; @@ -254,24 +264,24 @@ @-webkit-keyframes slideUp { 0% { -webkit-transform: translateY(20px); - transform: translateY(20px); + transform: translateY(20px); opacity: 0; } 100% { -webkit-transform: translateY(0px); - transform: translateY(0px); + transform: translateY(0px); opacity: 1; } } @keyframes slideUp { 0% { -webkit-transform: translateY(20px); - transform: translateY(20px); + transform: translateY(20px); opacity: 0; } 100% { -webkit-transform: translateY(0px); - transform: translateY(0px); + transform: translateY(0px); opacity: 1; } } @@ -287,11 +297,11 @@ display: -ms-flexbox; display: flex; -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; + -ms-flex-pack: center; + justify-content: center; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; cursor: pointer; width: 34px; height: 34px; @@ -309,8 +319,8 @@ width: 100%; z-index: 50; -webkit-transform: translate(0, -100%); - -ms-transform: translate(0, -100%); - transform: translate(0, -100%); + -ms-transform: translate(0, -100%); + transform: translate(0, -100%); -webkit-transition: -webkit-transform 0.5s; transition: -webkit-transform 0.5s; -o-transition: transform 0.5s; @@ -319,8 +329,8 @@ } .search-box.open { -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); } .search-box-content { position: relative; @@ -341,11 +351,11 @@ display: -ms-flexbox; display: flex; -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; + -ms-flex-pack: center; + justify-content: center; -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; + -ms-flex-align: center; + align-items: center; color: var(--dark); border: 3px solid var(--dark); border-radius: 50%; @@ -394,8 +404,8 @@ display: flex; -webkit-box-orient: vertical; -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; } /* Header -> Page Header-> breadcrumb */ .breadcrumb { diff --git a/deploy.sh b/deploy.sh index 83e4bea..2900d5c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -12,17 +12,17 @@ # -------------------------------------------------------- # --- CONFIGURATION (Edit these for new environments) --- -SERVER="newspapers2.islandarchives.ca" -THEME_DIR="/var/www/islandnewspapers2/web/themes/custom/olivesnews" -SITE_ROOT="/var/www/islandnewspapers2/web/sites/islandnewspapers2" -DRUSH_PATH="/var/www/islandnewspapers2/vendor/drush/drush/drush" +SERVER="137.149.52.34" +THEME_DIR="/var/www/html/ill_site/web/themes/custom/roblib_ill_theme" +SITE_ROOT="/var/www/html/ill_site" +DRUSH_PATH="/var/www/html/ill_site/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 + echo "❌ Error: Please provide a commit message." + echo "Usage: ./deploy.sh 'Your message here'" + exit 1 fi COMMIT_MSG="$1" diff --git a/logo.svg b/logo.svg index 13d5a8d..772529a 100644 --- a/logo.svg +++ b/logo.svg @@ -1,3 +1,39 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logo.svg.old b/logo.svg.old new file mode 100644 index 0000000..13d5a8d --- /dev/null +++ b/logo.svg.old @@ -0,0 +1,3 @@ + + +