diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-23 21:07:43 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-23 21:07:43 +0300 |
| commit | 95685cafc9af5bd24606bbe5b9b3776670787973 (patch) | |
| tree | 34ddab7e969c1e5cd2d6d0ed0dc45d7c79577175 /app/assets/stylesheets/bootstrap_migration.scss | |
| parent | 1956a8a737d9db2813646abaadfd32a40d1f5567 (diff) | |
Fix alignment of MR conflict resolution
Diffstat (limited to 'app/assets/stylesheets/bootstrap_migration.scss')
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 0c492e7d4a5..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 - height: 34px; -} - table { // Remove any table border lines border-spacing: 0; |