From f81278a9522f0e1f4ef95a0708a985b3fab013a4 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Fri, 5 May 2017 20:48:36 -0500 Subject: [PATCH] css fixes --- app/assets/stylesheets/app/_header.scss | 2 ++ app/assets/stylesheets/app/_ui.scss | 4 ++++ .../templates/frontend/directives/account-menu.html.haml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/app/_header.scss b/app/assets/stylesheets/app/_header.scss index 325279473..304224676 100644 --- a/app/assets/stylesheets/app/_header.scss +++ b/app/assets/stylesheets/app/_header.scss @@ -101,6 +101,8 @@ h2 { position: relative; cursor: pointer; + user-select: none; + > a { color: #515263; } diff --git a/app/assets/stylesheets/app/_ui.scss b/app/assets/stylesheets/app/_ui.scss index d69d2faac..3bd163a6d 100644 --- a/app/assets/stylesheets/app/_ui.scss +++ b/app/assets/stylesheets/app/_ui.scss @@ -146,4 +146,8 @@ input, button, select, textarea { margin-left: auto; margin-right: auto; margin-bottom: 10px; + + input { + margin-left: 0px; + } } diff --git a/app/assets/templates/frontend/directives/account-menu.html.haml b/app/assets/templates/frontend/directives/account-menu.html.haml index e9951fcaf..d0d8edd66 100644 --- a/app/assets/templates/frontend/directives/account-menu.html.haml +++ b/app/assets/templates/frontend/directives/account-menu.html.haml @@ -34,8 +34,8 @@ %a.pull-right{"href" => "https://standardnotes.org/your-data", "target" => "_blank"} ⓘ %input.form-control.mt-5{:name => 'server', :placeholder => 'Server URL', :required => true, :type => 'text', 'ng-model' => 'formData.url'} - .checkbox{"ng-if" => "localNotesCount() > 0"} - %label + .checkbox.mt-10{"ng-if" => "localNotesCount() > 0"} + %p %input{"type" => "checkbox", "ng-model" => "formData.mergeLocal", "ng-bind" => "true", "ng-change" => "mergeLocalChanged()"} Merge local notes ({{localNotesCount()}} notes) %button.ui-button.block.mt-10{"ng-click" => "submitAuthForm()"} {{formData.showLogin ? "Sign In" : "Register"}}