diff --git a/client/naturalcrit/googleRedirect/googleRedirect.less b/client/naturalcrit/googleRedirect/googleRedirect.less deleted file mode 100644 index 0bb359b..0000000 --- a/client/naturalcrit/googleRedirect/googleRedirect.less +++ /dev/null @@ -1,157 +0,0 @@ -.loginPage { - text-align: center; - padding-top: 30px; - - .content { - - width: 400px; - margin: 0 auto; - padding: 20px; - padding-top: 30px; - - .switchView { - width: 100%; - - &>div { - .animate(background-color); - display: inline-block; - width: 50%; - padding: 10px; - cursor: pointer; - background-color: transparent; - font-size: 0.8em; - font-weight: 800; - text-transform: uppercase; - - i { - vertical-align: middle; - font-size: 2em; - } - } - - .login:hover, - .login.selected { - background-color: fade(@blue, 20%); - } - - .signup:hover, - .signup.selected { - background-color: fade(@green, 20%); - } - } - - .field { - position: relative; - margin: 20px 0px; - text-align: left; - - label { - display: block; - width: 100%; - font-size: 0.6em; - font-weight: 800; - line-height: 1.1em; - text-transform: uppercase; - } - - input { - width: 100%; - padding: 10px; - font-size: 1.2em; - color: #333; - } - - .control { - position: absolute; - display: block; - right: -40px; - bottom: 0px; - height: 46px; - width: 40px; - text-align: center; - - i { - margin-top: 15px; - } - } - - &.password .control { - cursor: pointer; - } - - .userExists { - font-size: 0.6em; - position: absolute; - right: 0px; - color: @red; - } - } - - button.action { - .animate(opacity); - padding: 10px 20px; - cursor: pointer; - opacity: 0.8; - font-size: 0.8em; - font-weight: 800; - color: black; - text-transform: uppercase; - border: none; - outline: none; - - &:hover { - opacity: 1; - } - - &:disabled { - cursor: not-allowed; - opacity: 0.3; - background-color: #ddd; - } - - &.login { - background-color: @blue; - } - - &.signup { - background-color: @green; - } - - i { - margin-right: 10px; - font-size: 1.5em; - } - } - - button.google { - cursor: pointer; - width: 191px; - height: 46px; - border: none; - outline: none; - background-image: url('../assets/naturalcrit/styles/btn_google_signin_light_normal_web.png'); - background-size: contain; - - &:hover { - background-image: url('../assets/naturalcrit/styles/btn_google_signin_light_hover_web.png'); - } - - &:focus { - background-image: url('../assets/naturalcrit/styles/btn_google_signin_light_pressed_web.png'); - } - } - - .errors { - margin-bottom: 20px; - color: @red; - } - } - - .divider { - font-size: 1em; - font-weight: 800; - color: black; - text-transform: uppercase; - padding: 12px 20px 10px; - } -} \ No newline at end of file diff --git a/client/naturalcrit/main/main.less b/client/naturalcrit/main/main.less index e6405ac..caa3237 100644 --- a/client/naturalcrit/main/main.less +++ b/client/naturalcrit/main/main.less @@ -16,8 +16,8 @@ color: black; svg { - height: .9em; - margin-right: .2em; + height: 0.9em; + margin-right: 0.2em; cursor: pointer; fill: black; } @@ -54,7 +54,7 @@ text-align: center; text-decoration: none; - &+.tool { + & + .tool { border-left: 1px solid #666; } @@ -66,7 +66,6 @@ padding: 35px; &:hover { - svg, h2 { .transform(scale(1.3)); @@ -101,10 +100,9 @@ .content { &:hover { - svg, h2 { - .transform(scale(1.0)); + .transform(scale(1)); } } @@ -115,7 +113,7 @@ &:after { .animateAll(); - content: "beta!"; + content: 'beta!'; position: absolute; display: block; top: 120px; @@ -136,7 +134,6 @@ } .addSketch(@length, @color : black) { - path, line, polyline, @@ -197,4 +194,4 @@ @keyframes sketch { .sketchKeyFrames(); } -} \ No newline at end of file +} diff --git a/client/naturalcrit/naturalcrit.less b/client/naturalcrit/naturalcrit.less index a73d73f..0b4531a 100644 --- a/client/naturalcrit/naturalcrit.less +++ b/client/naturalcrit/naturalcrit.less @@ -1,23 +1,5 @@ @import 'naturalcrit/styles/core.less'; - -* { - box-sizing: border-box; -} - -a { - cursor: pointer; -} - -b { - font-weight: bold; -} - -small { - font-size: 12px; - font-style: italic; -} - .logo { font-size: 4em; color: black; diff --git a/shared/naturalcrit/styles/core.less b/shared/naturalcrit/styles/core.less index dc796b3..daf48f0 100644 --- a/shared/naturalcrit/styles/core.less +++ b/shared/naturalcrit/styles/core.less @@ -1,5 +1,5 @@ @import 'naturalcrit/styles/reset.less'; -//@import 'naturalcrit/styles/elements.less'; +@import 'naturalcrit/styles/elements.less'; @import 'naturalcrit/styles/animations.less'; @import 'naturalcrit/styles/colors.less'; @import 'naturalcrit/styles/tooltip.less'; diff --git a/shared/naturalcrit/styles/elements.less b/shared/naturalcrit/styles/elements.less index d01214d..d32c156 100644 --- a/shared/naturalcrit/styles/elements.less +++ b/shared/naturalcrit/styles/elements.less @@ -5,9 +5,7 @@ body { position: relative; height: 100%; min-height: 100%; - background-color: #eee; font-family: 'Lato', sans-serif; - color: @copyGrey; } .container { @@ -45,6 +43,15 @@ p { line-height: 1.5em; } +b, strong { + font-weight: bold; +} + +small { + font-size: 12px; + font-style: italic; +} + code { background-color: #F8F8F8; font-family: 'Courier', mono; @@ -54,10 +61,7 @@ code { a { color: inherit; -} - -strong { - font-weight: bold; + cursor: pointer; } button { diff --git a/shared/naturalcrit/styles/reset.less b/shared/naturalcrit/styles/reset.less index bdcdb83..eac3bd7 100644 --- a/shared/naturalcrit/styles/reset.less +++ b/shared/naturalcrit/styles/reset.less @@ -1 +1,4 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0} +* { + box-sizing: border-box; +} \ No newline at end of file