From 4be39459068dcad01e0df317aa480b0fea29eb70 Mon Sep 17 00:00:00 2001
From: perme950 <perme950@student.liu.se>
Date: Fri, 17 Nov 2023 12:08:44 +0100
Subject: [PATCH] =?UTF-8?q?Worked=20on=20the=20design=20of=20F=C3=B6rslag?=
=?UTF-8?q?=20changed=20colores=20and=20margings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
client/Activity_card_code/activitity_card.css | 9 +++---
.../Make_Suggestion_Code/makeSuggestion.css | 31 +++++++++----------
.../Make_Suggestion_Code/makeSuggestion.html | 7 ++---
3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/client/Activity_card_code/activitity_card.css b/client/Activity_card_code/activitity_card.css
index 486cc91f..81d1c4fa 100644
--- a/client/Activity_card_code/activitity_card.css
+++ b/client/Activity_card_code/activitity_card.css
@@ -1,5 +1,5 @@
.activityCardFont{
- font-family: 'Gill Sans MT';
+ font-family: "Roboto", sans-serif;
}
.activityCard{
height: 170px;
@@ -11,7 +11,7 @@
width: 100%;
height: 100%;
/*background: linear-gradient(to right, #efcdea 0%, #f3daef 11%, #edddeb 22%, #ffffff 35%);*/
- background: linear-gradient(to right, #efcdea 12%, #f3daef 25%, #edddeb 50%, #ffffff 75%);
+ background: linear-gradient(to right, #efcdea 0%, #edddeb 0%, #ffffff 30%, #ffffff 10%);
text-align: left;
display: flex;
flex-direction: row;
@@ -35,11 +35,12 @@
text-align: left;
margin-left: 15%;
-.activityCardMore {
+
+/* .activityCardMore {
flex: 1;
padding: 10px;
box-sizing: border-box;
-}
+}*/
}
#activityCardDepHeader{
diff --git a/client/Make_Suggestion_Code/makeSuggestion.css b/client/Make_Suggestion_Code/makeSuggestion.css
index a56bface..f7a81cfb 100644
--- a/client/Make_Suggestion_Code/makeSuggestion.css
+++ b/client/Make_Suggestion_Code/makeSuggestion.css
@@ -1,29 +1,31 @@
-/* .filterFont {
+ /*
+ .filterFont {
font-family: "Roboto", sans-serif;
margin-left: 5%;
-} */
+ }
+*/
.makeSuggestionFilterButtons {
margin-left: 5%;
margin-bottom: 1%;
+ margin-top: 1%;
+
}
.filterButtons {
- background-image: linear-gradient(
- to right,
- rgb(201, 164, 213),
- rgb(162, 88, 202)
- );
+ background-image: linear-gradient(to right, #845380, #303866);
+ border: none;
padding: 8px;
color: #fffafa;
font-weight: 1700;
border-radius: 8px;
- margin-right: 3%;
- width: 12%;
+ margin-right: 2%;
+ width: 13%;
font-family: "Roboto", sans-serif;
font-weight: 400;
font-size: medium;
- text-align: center;
+ text-align: left;
+ text-overflow: ellipsis;
}
#middleFilterButtonLabel {
@@ -56,7 +58,7 @@
width: 78%;
margin-top: 1%;
margin-left: 5%;
- border: 1px solid rgb(246, 144, 255);
+ border: none;
border-radius: 5px;
align-items: right;
}
@@ -79,11 +81,8 @@
}
#suggestionButton {
- background-image: linear-gradient(
- to right,
- rgb(201, 164, 213),
- rgb(162, 88, 202)
- );
+ background-image: linear-gradient(to right, #845380, #303866);
+ border: none;
padding: 6px;
color: #fffafa;
font-weight: 1700;
diff --git a/client/Make_Suggestion_Code/makeSuggestion.html b/client/Make_Suggestion_Code/makeSuggestion.html
index 920490bf..3a1720f2 100644
--- a/client/Make_Suggestion_Code/makeSuggestion.html
+++ b/client/Make_Suggestion_Code/makeSuggestion.html
@@ -22,15 +22,13 @@
<div id="suggestionPage">
<div class="filter-section">
- <!-- <p class="filterFont" id="filter-font">
- Fyll i vårdinstans och avdelning som förslaget gäller
- </p> -->
+
<div class="makeSuggestionFilterButtons">
<select
name="department"
id="selectHospital"
class="filterButtons"
- >
+ > <option class ="ideaCardFont" value="" disabled selected>Välj arbetsplats</option>
<!-- Options will be added dynamically here -->
</select>
@@ -41,6 +39,7 @@
<select name="section" id="selectDepartment" class="filterButtons">
<!-- Options will be added dynamically here -->
+ <option class ="ideaCardFont" value="" disabled selected>Välj avdelning</option>
</select>
<!-- <select class="filter" id="departmentDropdown">
<option value="all">Avdelningar</option> -->
--
GitLab