From 2ad4348ecb9433c880aa57ee5b8e5000a560e7e4 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 23 May 2018 18:36:17 -0700
Subject: Fix clone URL alignment on project page

---
 app/assets/stylesheets/bootstrap_migration.scss          | 6 ------
 app/assets/stylesheets/framework/broadcast_messages.scss | 6 ++++++
 app/assets/stylesheets/pages/projects.scss               | 6 ++++--
 app/views/admin/broadcast_messages/_form.html.haml       | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 7ec399c1bf8..3d850523480 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -46,12 +46,6 @@ a {
   text-align: right;
 }
 
-.form-control,
-.search form {
-  // Bootstrap 4 does not have a height
-  min-height: 34px;
-}
-
 table {
   // Remove any table border lines
   border-spacing: 0;
diff --git a/app/assets/stylesheets/framework/broadcast_messages.scss b/app/assets/stylesheets/framework/broadcast_messages.scss
index 9b54fb94cdc..d3e7d751e63 100644
--- a/app/assets/stylesheets/framework/broadcast_messages.scss
+++ b/app/assets/stylesheets/framework/broadcast_messages.scss
@@ -19,3 +19,9 @@
   @extend .broadcast-message;
   margin-bottom: 20px;
 }
+
+.toggle-colors {
+  input {
+    min-height: 34px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 3976812dfdb..22964163e95 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -251,7 +251,7 @@
     margin: 15px 5px 0 0;
 
     input {
-      height: 29px;
+      height: 28px;
     }
   }
 
@@ -875,6 +875,7 @@ pre.light-well {
 
 .git-clone-holder {
   width: 380px;
+  height: 28px;
 
   .btn-clipboard {
     border: 1px solid $border-color;
@@ -890,7 +891,8 @@ pre.light-well {
 
   .form-control {
     @extend .monospace;
-    background: $white-light;
+    background-color: $white-light;
+    border-color: $border-color;
     font-size: 14px;
     margin-left: -1px;
     cursor: auto;
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index 07f0ef98f44..7f34357f147 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -18,11 +18,11 @@
   .form-group.row.js-toggle-colors-container
     .col-sm-10.offset-sm-2
       = link_to 'Customize colors', '#', class: 'js-toggle-colors-link'
-  .form-group.row.js-toggle-colors-container.hide
+  .form-group.row.js-toggle-colors-container.toggle-colors.hide
     = f.label :color, "Background Color", class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.color_field :color, class: "form-control"
-  .form-group.row.js-toggle-colors-container.hide
+  .form-group.row.js-toggle-colors-container.toggle-colors.hide
     = f.label :font, "Font Color", class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.color_field :font, class: "form-control"
-- 
cgit v1.2.1