diff --git a/_config.yml b/_config.yml index d949249..0bb4d2c 100644 --- a/_config.yml +++ b/_config.yml @@ -74,6 +74,7 @@ pagination_dir: page ## Plugins: http://hexo.io/plugins/ ## Themes: http://hexo.io/themes/ theme: computer-lab +brand_color: rgba(55, 50, 60, 1) # SASS node_sass: diff --git a/package.json b/package.json index 0a2ec4e..c4b6b08 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "version": "5.4.2" }, "scripts": { + "dev": "hexo server", "develop": "hexo server", "start": "hexo server", "generate": "hexo generate", @@ -25,4 +26,4 @@ "hexo-server": "^2.0.0", "hexo-renderer-sass": "github:kmuncie/hexo-renderer-sass" } -} \ No newline at end of file +} diff --git a/themes/computer-lab/_config.yml b/themes/computer-lab/_config.yml index 22c5618..53629cf 100644 --- a/themes/computer-lab/_config.yml +++ b/themes/computer-lab/_config.yml @@ -33,9 +33,3 @@ twitter_widget_id: "678830341331820544" # as a string, from https://twitter.com/ twitter_username: computerlab_ # twitter username without the @ default_author: Anonymous - - - - - - diff --git a/themes/computer-lab/layout/_partial/site/footer.pug b/themes/computer-lab/layout/_partial/site/footer.pug index 4404b70..25a6368 100644 --- a/themes/computer-lab/layout/_partial/site/footer.pug +++ b/themes/computer-lab/layout/_partial/site/footer.pug @@ -11,7 +11,7 @@ footer.footer | Suite #2 br | New York, NY 10013 - span © 2016-2023 Computer Lab + span © 2016-2024 Computer Lab .col-sm-3 .col-sm-3 h4 Connect diff --git a/themes/computer-lab/layout/_partial/site/header.pug b/themes/computer-lab/layout/_partial/site/header.pug index 87920b6..a8b41ed 100644 --- a/themes/computer-lab/layout/_partial/site/header.pug +++ b/themes/computer-lab/layout/_partial/site/header.pug @@ -6,8 +6,8 @@ nav.navbar.navbar-custom.navbar-fixed-top(role='navigation') svg.logo(id='logo-svg' version='1.0', xmlns='http://www.w3.org/2000/svg', width='85px', height='85px' viewbox='0 0 54.5 54.5') defs style. - .cls-1{fill:#fff;}.cls-2{fill:#652ded;} - title Asset 4 + .cls-1{fill:#fff;}.cls-2{fill: #{config.brand_color};} + title Computer Lab Logo g#Layer_2(data-name='Layer 2') g#Layer_1-2(data-name='Layer 1') path.cls-1(d='M20.63,24.94v1.61a24.74,24.74,0,0,1-3-1.4,18.11,18.11,0,0,1-2.94-2V21.75c.58.41,1.23.83,1.94,1.24A26.41,26.41,0,0,0,20.63,24.94Z', transform='translate(-0.25 -0.25)') diff --git a/themes/computer-lab/layout/_partial/svg/giphy-logo.pug b/themes/computer-lab/layout/_partial/svg/giphy-logo.pug index abfec61..cf41295 100644 --- a/themes/computer-lab/layout/_partial/svg/giphy-logo.pug +++ b/themes/computer-lab/layout/_partial/svg/giphy-logo.pug @@ -1,4 +1,6 @@ -svg#Layer_1(xmlns='http://www.w3.org/2000/svg', xmlns:xlink='http://www.w3.org/1999/xlink', version='1.1', x='0px', y='0px', width='431px', height='151px', viewbox='-66 -142.5 431 151', enable-background='new -66 -142.5 431 151', xml:space='preserve', fill='#652ded') +svg#Layer_1(xmlns='http://www.w3.org/2000/svg', xmlns:xlink='http://www.w3.org/1999/xlink', +version='1.1', x='0px', y='0px', width='431px', height='151px', viewbox='-66 -142.5 431 151', +enable-background='new -66 -142.5 431 151', xml:space='preserve', fill=config.brand_color) g g rect(x='121.593', y='-98.531', width='19.915', height='68.557') diff --git a/themes/computer-lab/source/css/base/_variables.scss b/themes/computer-lab/source/css/base/_variables.scss index 64772db..3ec2ce7 100644 --- a/themes/computer-lab/source/css/base/_variables.scss +++ b/themes/computer-lab/source/css/base/_variables.scss @@ -9,7 +9,7 @@ $alt-white: #FAFAFA; $white: #FFF; $grey: #B1B1B1; -$brand: #625ded; +$brand: rgba(55,50,60,1); $secondary: #B1B1B1; //#00cb98; $accent: #CCC0B4; diff --git a/themes/computer-lab/source/css/pages/_home.scss b/themes/computer-lab/source/css/pages/_home.scss index 6b3f1c0..c7068e6 100644 --- a/themes/computer-lab/source/css/pages/_home.scss +++ b/themes/computer-lab/source/css/pages/_home.scss @@ -1,12 +1,12 @@ #home { margin-top: - $menu-height; // center in viewport, regardless of menu height height: 115vh; - background: -moz-linear-gradient(270deg, rgba(101,45,237,1) 12%, rgba(250, 250, 250,1) 100%); /* ff3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(12%, rgba(101,45,237,1)), color-stop(100%, rgba(250, 250, 250,1))); /* safari4+,chrome */ - background: -webkit-linear-gradient(270deg, rgba(101,45,237,1) 12%, rgba(250, 250, 250,1) 100%); /* safari5.1+,chrome10+ */ - background: -o-linear-gradient(270deg, rgba(101,45,237,1) 12%, rgba(250, 250, 250,1) 100%); /* opera 11.10+ */ - background: -ms-linear-gradient(270deg, rgba(101,45,237,1) 12%, rgba(250, 250, 250,1) 100%); /* ie10+ */ - background: linear-gradient(180deg, rgba(101,45,237,1) 12%, rgba(250, 250, 250,1) 100%); /* w3c */ + background: -moz-linear-gradient(270deg, $brand 12%, rgba(250, 250, 250,1) 100%); /* ff3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(12%, $brand), color-stop(100%, rgba(250, 250, 250,1))); /* safari4+,chrome */ + background: -webkit-linear-gradient(270deg, $brand 12%, rgba(250, 250, 250,1) 100%); /* safari5.1+,chrome10+ */ + background: -o-linear-gradient(270deg, $brand 12%, rgba(250, 250, 250,1) 100%); /* opera 11.10+ */ + background: -ms-linear-gradient(270deg, $brand 12%, rgba(250, 250, 250,1) 100%); /* ie10+ */ + background: linear-gradient(180deg, $brand 12%, rgba(250, 250, 250,1) 100%); /* w3c */ .hero { height: 250px;