Skip to content

Commit

Permalink
Merge pull request #386 from MrChristofferson/master
Browse files Browse the repository at this point in the history
front page
  • Loading branch information
RickCarlino committed Aug 8, 2017
2 parents 0f7ee7e + 92b2f44 commit 16c2598
Show file tree
Hide file tree
Showing 13 changed files with 442 additions and 353 deletions.
4 changes: 1 addition & 3 deletions app/views/user_mailer/password_reset.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@
</p>
<p>
You can reset your password
<a href='http:<%= @host %>/password_reset#/<%= @token %>'>
here
</a>.
<a href='http:<%= @host %>/password_reset#/<%= @token %>'>here</a>.
</p>
Binary file modified public/app-resources/img/farmbot-desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/app-resources/img/farmbot-tablet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/controls/controls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class Controls extends React.Component<Props, {}> {
return (
<Page className="controls">
<Row>
<Col xs={12} sm={6} md={4} mdOffset={1}>
<Col xs={12} sm={6} md={5} mdOffset={1}>
<Move bot={this.props.bot}
user={this.props.user}
dispatch={this.props.dispatch} />
Expand Down
12 changes: 6 additions & 6 deletions src/controls/move.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,18 @@ export class Move extends React.Component<MoveProps, {}> {
</Row>
<AxisDisplayGroup
position={motor_coordinates}
label={"Motor Coords."}
label={"Motor Coordinates (mm)"}
/>
{scaled_encoders &&
<AxisDisplayGroup
position={scaled_encoders_data}
label={"Scaled Encoder (steps)"}
/>}
{raw_encoders &&
<AxisDisplayGroup
position={raw_encoders_data}
label={"Raw Encoder data"}
/>}
{scaled_encoders &&
<AxisDisplayGroup
position={scaled_encoders_data}
label={"Scaled Encoder data"}
/>}
<AxisInputBoxGroup
position={motor_coordinates}
onCommit={input => moveAbs(input)} />
Expand Down
1 change: 1 addition & 0 deletions src/css/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@import "regimen_editor_widget";
@import "sequences";
@import "spinner";
@import "static_pages";
@import "status_ticker";
@import "steps";
@import "tables";
Expand Down
2 changes: 0 additions & 2 deletions src/css/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@
&.active {
box-shadow: none !important;
border: 1px solid $white;
// pointer-events: none;
// transform: translateY(2px);
}
&.gray {
background-color: $medium_light_gray !important;
Expand Down
242 changes: 121 additions & 121 deletions src/css/front_page.scss
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
@import url(https://fonts.googleapis.com/css?family=Roboto:400,400italic,700,700italic,100,100italic);
html {
height: 100%;
}
/** Hoping to get this css removed soon -CV */

.static-page {
min-height: 100vh;
padding: 2rem;
background: linear-gradient(-135deg, #089460, #159ACC);
background-size: 400% 400%;
.widget-wrapper {
box-shadow: none;
}
.forgot-password {
color: $blue;
font-size: 1rem;
}
h1,
h2 {
font-family: "Roboto", Arial, Helvetica, sans-serif;
font-weight: 100;
color: #f4f4f4;
text-align: center;
}
h1 {
font-size: 2.6rem;
line-height: 3.2rem;
margin-bottom: 10px;
}
h2 {
margin-top: 0;
font-size: 1.8rem;
margin-bottom: 3rem;
line-height: 2.2rem;
display: none;
}
img {
display: none;
}
* {
outline: none;
}
.image-login-wrapper {
display: flex;
}
.widget-header i {
float: right;
color: #fff;
padding: 0.2rem 0 0;
cursor: pointer;
}
.input-field {
display: flex;
width: 130%;
label {
flex: 1;
padding: 0.5rem 0 0;
}
input {
flex: 2;
}
}
// Mobile portrait
@media screen and (min-device-width: 320px) and (max-device-width: 480px) and (orientation: portrait) {
.all-content-wrapper.login-wrapper {
padding: 1.5rem 2rem 0rem 2rem;
}
.fb-mobile-show {
display: block;
}
h1,
h2 {
margin: 20px 0 20px;
}
}
// Tablet landscape
@media screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
.fb-tablet-show {
display: block;
}
.image-wrapper {
padding-top: 2.2rem;
}
h1 {
font-size: 3rem;
line-height: 0.2rem;
margin: 50px 0 32px;
}
}
// Tablet portrait
@media screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) {
.fb-tablet-show:not(img) {
display: block;
}
.all-content-wrapper {
padding: 3rem 16rem 0rem !important;
}
}
// Desktop
@media screen and (min-device-width: 1200px) and (max-device-width: 1600px) {
.fb-desktop-show {
display: block;
}
.image-wrapper {
padding: 2.6rem 0 0;
flex: 2;
}
img {
width: 100%;
}
.login-wrapper {
flex: 1;
}
.image-login-wrapper {
padding: 0 10rem !important;
}
}
}

.image-login-wrapper {
max-width: 160rem;
}
// @import url(https://fonts.googleapis.com/css?family=Roboto:400,400italic,700,700italic,100,100italic);
// html {
// height: 100%;
// }
// .static-page {
// min-height: 100vh;
// padding: 2rem;
// background: linear-gradient(-135deg, #089460, #159ACC);
// background-size: 400% 400%;
// .widget-wrapper {
// box-shadow: none;
// }
// .forgot-password {
// color: $blue;
// font-size: 1rem;
// }
// h1,
// h2 {
// font-family: "Roboto", Arial, Helvetica, sans-serif;
// font-weight: 100;
// color: #f4f4f4;
// text-align: center;
// }
// h1 {
// font-size: 2.6rem;
// line-height: 3.2rem;
// margin-bottom: 10px;
// }
// h2 {
// margin-top: 0;
// font-size: 1.8rem;
// margin-bottom: 3rem;
// line-height: 2.2rem;
// display: none;
// }
// img {
// display: none;
// }
// * {
// outline: none;
// }
// .image-login-wrapper {
// display: flex;
// }
// .widget-header i {
// float: right;
// color: #fff;
// padding: 0.2rem 0 0;
// cursor: pointer;
// }
// .input-field {
// display: flex;
// width: 130%;
// label {
// flex: 1;
// padding: 0.5rem 0 0;
// }
// input {
// flex: 2;
// }
// }
// // Mobile portrait
// @media screen and (min-device-width: 320px) and (max-device-width: 480px) and (orientation: portrait) {
// .all-content-wrapper.login-wrapper {
// padding: 1.5rem 2rem 0rem 2rem;
// }
// .fb-mobile-show {
// display: block;
// }
// h1,
// h2 {
// margin: 20px 0 20px;
// }
// }
// // Tablet landscape
// @media screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
// .fb-tablet-show {
// display: block;
// }
// .image-wrapper {
// padding-top: 2.2rem;
// }
// h1 {
// font-size: 3rem;
// line-height: 0.2rem;
// margin: 50px 0 32px;
// }
// }
// // Tablet portrait
// @media screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) {
// .fb-tablet-show:not(img) {
// display: block;
// }
// .all-content-wrapper {
// padding: 3rem 16rem 0rem !important;
// }
// }
// // Desktop
// @media screen and (min-device-width: 1200px) and (max-device-width: 1600px) {
// .fb-desktop-show {
// display: block;
// }
// .image-wrapper {
// padding: 2.6rem 0 0;
// flex: 2;
// }
// img {
// width: 100%;
// }
// .login-wrapper {
// flex: 1;
// }
// .image-login-wrapper {
// padding: 0 10rem !important;
// }
// }
// }
// .image-login-wrapper {
// max-width: 160rem;
// }
52 changes: 52 additions & 0 deletions src/css/static_pages.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
.static-page {
min-height: 100vh;
max-height: 100%;
* {
margin: 0 auto;
}
background: linear-gradient(-135deg, #089460, #159ACC);
background-size: 400% 400%;
padding-top: 1rem;
h1,
h2 {
font-family: "Roboto", Arial, Helvetica, sans-serif !important;
font-weight: 100 !important;
color: $white;
text-shadow: 0 0 25px rgba(0, 0, 0, 0.1), 0 0 25px rgba(0, 0, 0, 0.1);
}
h1 {
font-size: 3.4rem;
line-height: 3.6rem;
}
h2 {
margin-top: 1rem;
font-size: 2.2rem;
line-height: 2.6rem;
}
.widget-wrapper {
box-shadow: none;
}
.inner-width {
max-width: 1024px;
}
.forgot-password {
color: $blue;
margin-top: 0.6rem;
display: inline-block;
}
}

@media only screen and (min-device-width: 320px) and (max-device-width: 736px) {
h2 {
margin-bottom: 8rem !important;
}
}

@media only screen and (min-device-width: 768px) {
h2 {
margin-bottom: 6rem !important;
}
.widget-wrapper:first-child {
margin-top: 1rem;
}
}
Loading

0 comments on commit 16c2598

Please sign in to comment.