diff --git a/applyProdDatabaseToDev.sh b/applyProdDatabaseToDev.sh index 91e77c8..5d3794f 100755 --- a/applyProdDatabaseToDev.sh +++ b/applyProdDatabaseToDev.sh @@ -10,7 +10,8 @@ echo '-------' # gzip -dk file.gz BACKUPDIR="/home/mab/databaseBackupSolidScribe" -DEVDBPASS="Crama!Lama*Jamma###88383!!!!!345345956245i" +#DEVDBPASS="Crama!Lama*Jamma###88383!!!!!345345956245i" +DEVDBPASS="RootPass1234!" cd $BACKUPDIR diff --git a/backupDatabase.sh b/backupDatabase.sh index 60fd4d0..409403e 100755 --- a/backupDatabase.sh +++ b/backupDatabase.sh @@ -9,7 +9,7 @@ NOW=$(date +"%Y-%m-%d_%H-%M") ssh mab@solidscribe.com -p 13328 "mysqldump --all-databases --single-transaction --user root -pRootPass1234!" > "backup-$NOW.sql" gzip "backup-$NOW.sql" -cp "backup-$NOW.sql" "/mnt/Windows Data/DatabaseBackups/backup-$NOW.sql" +# cp "backup-$NOW.sql" "/mnt/Windows Data/DatabaseBackups/backup-$NOW.sql" echo "Database Backup Complete on $NOW" diff --git a/client/src/assets/semantic-helper.css b/client/src/assets/semantic-helper.css index f2ca033..8d8a050 100644 --- a/client/src/assets/semantic-helper.css +++ b/client/src/assets/semantic-helper.css @@ -43,6 +43,7 @@ html { height:100%; padding: 0; margin: 0; + background: none; } a:hover { text-decoration: underline; @@ -80,9 +81,12 @@ div.ui.basic.segment.no-fluf-segment { /* OVERWRITE DEFAULT SEMANTIC STYLES FOR CUSTOM/NIGHT MODES*/ body { color: var(--text_color); - background-color: var(--body_bg_color); + background: none; font-family: 'Roboto', 'Helvetica Neue', Arial, Helvetica, sans-serif; } +#app { + background: var(--body_bg_color); +} .ui.segment { color: var(--text_color); @@ -163,6 +167,9 @@ div.ui.basic.green.label { i.green.icon.icon.icon.icon { color: var(--main-accent); } +.button { + box-shadow: 2px 2px 4px -2px rgba(40, 40, 40, 0.89) !important; +} .ui.green.buttons, .ui.green.button, .ui.green.button:hover { background-color: var(--main-accent); } @@ -176,6 +183,9 @@ i.green.icon.icon.icon.icon { .ui.grid > .green.row, .ui.grid > .green.column, .ui.grid > .row > .green.column { background-color: var(--main-accent); } +.ui.green.header { + color: var(--main-accent); +} /* OVERWRITE DEFAULT SEMANTIC STYLES FOR CUSTOM/NIGHT MODES*/ @@ -555,6 +565,10 @@ i.green.icon.icon.icon.icon { .ui.white.button { background: #FFF; } +.white.row { + background-color: rgba(255, 255, 255, 0.9); +} + .input-floating-button { position: absolute; top: 19px; @@ -865,4 +879,42 @@ i.green.icon.icon.icon.icon { [data-position="right center"][data-tooltip]:after { -webkit-transform-origin: left center; transform-origin: left center; +} + + +.glint:after { + + content: ''; + position: absolute; + + top: 0; + left: 0; + bottom: 0; + + width: 100%; + opacity: 0; + pointer-events: none; + z-index: 1; + + background: linear-gradient( + 130deg, + rgba(255,255,255,0) 45%, + rgba(255,255,255,1) 50%, + var(--main-accent) 55%, + rgba(255,255,255,0) 60% + ); + + animation: glint-animation 0.8s linear 1; + animation-delay: 0.9s; +} + +@keyframes glint-animation { + 0% { + left: -100%; + opacity: 1; + } + 100% { + left: 100%; + opacity: 0; + } } \ No newline at end of file diff --git a/client/src/assets/squire.js b/client/src/assets/squire.js index 219cbc9..29529ae 100644 --- a/client/src/assets/squire.js +++ b/client/src/assets/squire.js @@ -1265,7 +1265,9 @@ var keys = { 37: 'left', 39: 'right', 46: 'delete', + 191: '/', 219: '[', + 220: '\\', 221: ']' }; @@ -3888,10 +3890,9 @@ var increaseBlockQuoteLevel = function ( frag ) { }; var decreaseBlockQuoteLevel = function ( frag ) { - var root = this._root; var blockquotes = frag.querySelectorAll( 'blockquote' ); Array.prototype.filter.call( blockquotes, function ( el ) { - return !getNearest( el.parentNode, root, 'BLOCKQUOTE' ); + return !getNearest( el.parentNode, frag, 'BLOCKQUOTE' ); }).forEach( function ( el ) { replaceWith( el, empty( el ) ); }); @@ -4172,7 +4173,14 @@ proto._getHTML = function () { proto._setHTML = function ( html ) { var root = this._root; var node = root; - node.innerHTML = html; + var sanitizeToDOMFragment = this._config.sanitizeToDOMFragment; + if ( typeof sanitizeToDOMFragment === 'function' ) { + var frag = sanitizeToDOMFragment( html, false, this ); + empty( node ); + node.appendChild( frag ); + } else { + node.innerHTML = html; + } do { fixCursor( node, root ); } while ( node = getNextBlock( node, root ) ); diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue index 65ffd98..0313339 100644 --- a/client/src/components/GlobalSiteMenu.vue +++ b/client/src/components/GlobalSiteMenu.vue @@ -7,6 +7,7 @@ } .global-menu { width: 155px; + /* background: #221f2b; */ background: #221f2b; margin: 0; padding: 0; @@ -42,7 +43,8 @@ .menu-section {} .menu-section + .menu-section { - border-top: 1px solid #534c68; + /* border-top: 1px solid #534c68; */ + border-top: 1px solid #534c68e3; } .menu-button { cursor: pointer; @@ -73,21 +75,25 @@ /*color: var(--text_color);*/ /*width: 100%;*/ position: fixed; - top: 0; + bottom: 0; left: 0; right: 0; z-index: 999; background-color: var(--small_element_bg_color); - border-bottom: 1px solid; - border-color: var(--border_color); /*padding: 5px 1rem 5px;*/ display: flex; justify-content: space-around; width: 100vw; + border-top: 1px solid var(--dark_border_color); + display: flex; + + margin: 0; + padding: 0; } .place-holder { width: 100%; - height: 40px; + /*height: 40px;*/ + height: 0; } .logo-display { width: 27px; @@ -106,17 +112,35 @@ } .mobile-button { - display: inline-block; - font-size: 2em; - padding: 6px 3px 5px; + padding: 5px 0 0; + margin: 0; cursor: pointer; + font-size: 0.6em; + color: var(--menu-text); + text-align: center; + flex-basis: 100%; + line-height: 1.8em; + } + .mobile-button + .mobile-button { + border-left: 1px solid var(--dark_border_color); + } + .mobile-button i { + font-size: 2em; + margin: 0 auto; + padding: 0; + width: 100%; + } + .mobile-button svg { + margin: 0 46% 0; + display: inline-block; + width: 15px; + } + .mobile-button:active, .mobile-button:focus, .mobile-button:hover { + text-decoration: none; } .mobile-button.active { background-color: transparent; } - .mobile-button i { - margin: 0; - } @@ -128,11 +152,24 @@