diff --git a/client/homebrew/googleDrive.png b/client/homebrew/googleDrive.png deleted file mode 100644 index f555103cc..000000000 Binary files a/client/homebrew/googleDrive.png and /dev/null differ diff --git a/client/homebrew/googleDrive.svg b/client/homebrew/googleDrive.svg new file mode 100644 index 000000000..a8cefd5b2 --- /dev/null +++ b/client/homebrew/googleDrive.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/client/homebrew/googleDriveMono.png b/client/homebrew/googleDriveMono.png deleted file mode 100644 index a573196d7..000000000 Binary files a/client/homebrew/googleDriveMono.png and /dev/null differ diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index aa2f47431..99bcc9351 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -6,7 +6,7 @@ const cx = require('classnames'); const moment = require('moment'); const request = require('../../../../utils/request-middleware.js'); -const googleDriveIcon = require('../../../../googleDrive.png'); +const googleDriveIcon = require('../../../../googleDrive.svg'); const dedent = require('dedent-tabs').default; const BrewItem = createClass({ diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 42e0fd07e..da46eeb01 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -94,7 +94,7 @@ } } .googleDriveIcon { - height : 20px; + height : 18px; padding : 0px; margin : -5px; } diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 87bc7eefb..0ce4db729 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -24,8 +24,7 @@ const Markdown = require('naturalcrit/markdown.js'); const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js'); -const googleDriveActive = require('../../googleDrive.png'); -const googleDriveInactive = require('../../googleDriveMono.png'); +const googleDriveIcon = require('../../googleDrive.svg'); const SAVE_TIMEOUT = 3000; @@ -222,10 +221,7 @@ const EditPage = createClass({ renderGoogleDriveIcon : function(){ return - {this.state.saveGoogle - ? googleDriveActive - : googleDriveInactive - } + Google Drive icon {this.state.confirmGoogleTransfer &&
diff --git a/client/homebrew/pages/editPage/editPage.less b/client/homebrew/pages/editPage/editPage.less index 581e6dfa2..f94b60c1b 100644 --- a/client/homebrew/pages/editPage/editPage.less +++ b/client/homebrew/pages/editPage/editPage.less @@ -18,8 +18,12 @@ position : relative; } .googleDriveStorage img{ - height : 20px; + height : 18px; padding : 0px; margin : -5px; + + &.inactive { + filter: grayscale(1); + } } } diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less index 61c9900fe..5c4733c6c 100644 --- a/themes/V3/5ePHB/style.less +++ b/themes/V3/5ePHB/style.less @@ -253,7 +253,7 @@ body { border-image-outset : 9px 0px; border-image-width : 11px; padding : 0.13cm 0.16cm; - filter : drop-shadow(1px 4px 6px #888); + box-shadow : 1px 4px 14px #888; .page :where(&) { margin-top : 9px; //Prevent top border getting cut off on colbreak } @@ -282,7 +282,7 @@ body { border-image : @descriptiveBoxImage 12 stretch; border-image-outset : 4px; padding : 0.1em; - filter : drop-shadow(0 0 3px #faf7ea); + box-shadow : 0 0 6px #faf7ea; .page :where(&) { margin-top : 4px; //Prevent top border getting cut off on colbreak } @@ -397,7 +397,7 @@ body { border-image-outset : 0px 2px; background-blend-mode : overlay; background-attachment : fixed; - filter : drop-shadow(1px 4px 6px #888); + box-shadow : 1px 4px 14px #888; padding : 4px 2px; margin-left : -0.16cm; margin-right : -0.16cm; @@ -687,11 +687,11 @@ h5 + table{ all: unset; } .logo { - position : absolute; - top : 0.5cm; - left : 0; - right : 0; - filter : drop-shadow(0 0 0.075cm black); + position : absolute; + top : 0.5cm; + left : 0; + right : 0; + filter :drop-shadow(0 0 0.075cm black); img { height : 2cm; width : 100%; @@ -746,7 +746,7 @@ h5 + table{ filter : drop-shadow(0 0 3px black); } .banner { - filter : drop-shadow(2px 2px 2px #000); + filter : drop-shadow(2px 2px 2px black); position : absolute; left : 0; bottom : 4.2cm;