From d400c37b6d6a6017f7f937498617190398bfeee1 Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Mon, 14 Nov 2016 23:03:58 -0500 Subject: [PATCH] Updated style to navbar --- client/homebrew/editor/editor.less | 31 ++++++++++++++++--- client/homebrew/pages/newPage/newPage.jsx | 3 -- client/homebrew/pages/sharePage/sharePage.jsx | 30 +++++++++++------- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less index 377c71607..611f44d76 100644 --- a/client/homebrew/editor/editor.less +++ b/client/homebrew/editor/editor.less @@ -3,11 +3,12 @@ position : relative; width : 100%; .snippetBar{ - display : flex; - padding : 5px; + @height : 25px; + position : relative; + height : @height; background-color : #ddd; - align-items : center; .snippetGroup{ + /* .animate(background-color); margin : 0px 8px; padding : 3px; @@ -16,8 +17,26 @@ &:hover, &.selected{ background-color : #999; } + */ + display : inline-block; + height : @height; + padding : 0px 5px; + cursor : pointer; + font-size : 0.6em; + font-weight : 800; + line-height : @height; + text-transform : uppercase; + border-right : 1px solid black; + i{ + vertical-align : middle; + margin-right : 3px; + font-size : 1.2em; + } + &:hover, &.selected{ + background-color : #999; + } .text{ - line-height : 20px; + line-height : @height; .groupName{ margin-left : 6px; font-size : 10px; @@ -31,8 +50,10 @@ .dropdown{ position : absolute; visibility : hidden; + top : 100%; z-index : 1000; - padding : 5px; + padding : 0px; + margin-left: -5px; background-color : #ddd; .snippet{ .animate(background-color); diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index d8a2bd470..14ab83b30 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -26,8 +26,6 @@ const NewPage = React.createClass({ errors : [] }; }, - - componentDidMount: function() { const storage = localStorage.getItem(KEY); if(storage){ @@ -80,7 +78,6 @@ const NewPage = React.createClass({ text : this.state.text }) .end((err, res)=>{ - if(err){ this.setState({ isSaving : false diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index ebe2f54d0..3add2b35c 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -1,17 +1,16 @@ -var React = require('react'); -var _ = require('lodash'); -var cx = require('classnames'); +const React = require('react'); +const _ = require('lodash'); +const cx = require('classnames'); -var Nav = require('naturalcrit/nav/nav.jsx'); -var Navbar = require('../../navbar/navbar.jsx'); -var PrintLink = require('../../navbar/print.navitem.jsx'); -var RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed; +const Nav = require('naturalcrit/nav/nav.jsx'); +const Navbar = require('../../navbar/navbar.jsx'); +const PrintLink = require('../../navbar/print.navitem.jsx'); +const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed; -var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); +const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); -var HijackPrint = require('../hijackPrint.js'); -var SharePage = React.createClass({ +const SharePage = React.createClass({ getDefaultProps: function() { return { ver : '0.0.0', @@ -27,10 +26,17 @@ var SharePage = React.createClass({ }, componentDidMount: function() { - document.onkeydown = HijackPrint(this.props.brew.shareId); + document.addEventListener('keydown', this.handleControlKeys); }, componentWillUnmount: function() { - document.onkeydown = function(){}; + document.removeEventListener('keydown', this.handleControlKeys); + }, + handleControlKeys : function(e){ + if(!(e.ctrlKey || e.metaKey)) return; + e.stopPropagation(); + e.preventDefault(); + const P_KEY = 80; + if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus(); }, render : function(){