From f1f1588891237c3b8bac4255fcec32320272d4c0 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 7 Mar 2019 17:44:17 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20#113=20s=C3=A9lecteur=20de=20calculette?=
=?UTF-8?q?=20trop=20=C3=A9pais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.html | 2 +-
src/app/app.component.scss | 22 +++++++++++++++++++---
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 24cf52ab3..f2863b8e4 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -11,7 +11,7 @@
<!-- calculators list as a dropdown menu-->
<div [hidden]="tabsFitInNavbar" id="dropdown-calc-container">
- <button *ngIf="! currentCalc" mat-button [matMenuTriggerFor]="menu" color="primary" class="calculators-menu-title">
+ <button *ngIf="! currentCalc" mat-button [matMenuTriggerFor]="menu" color="primary" class="calculators-menu-title no-calc-type">
<mat-icon class="dropdown-icon">arrow_drop_down</mat-icon>
<span class="calc-name">
{{ uitextSelectCalc }}
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 71b952009..cc1ce2441 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -129,19 +129,35 @@ button:focus {
.calculators-menu-title {
background-color: rgb(250, 250, 250);
- margin-top: 8px;
+ // margin-top: 8px;
+ margin-top: 14px;
+ height: 38px;
+
width: 100%; // adapts to small screens
- max-width: 400px;
+ max-width: 248px; // designed for 360px displays
.dropdown-icon {
float: right;
transform: scale(2);
- margin-top: 8px;
+ margin-top: 6px;
margin-left: 10px;
}
+ .calc-name {
+ line-height: 24px;
+ }
+
.calc-type {
color: #777;
+ line-height: 34px;
+ }
+
+ &.no-calc-type {
+ margin-top: 1px;
+
+ .dropdown-icon {
+ margin-top: 0;
+ }
}
}
--
GitLab