Skip to content
Snippets Groups Projects
Commit 97305155 authored by Johanna Wikander's avatar Johanna Wikander
Browse files

Merge branch 'UX-buttons-project' into 'dev'

Ux buttons project

See merge request !232
parents 1dd77405 d664a55c
No related branches found
No related tags found
1 merge request!232Ux buttons project
Pipeline #113032 passed
......@@ -6,6 +6,53 @@ body{
padding: 20px;
}
#projectButton{
background-color:#845380;
border: none;
padding: 6px;
color: #fffafa;
font-weight: 1700;
border-radius: 8px;
font-family: "Roboto", sans-serif;
font-weight: 400;
font-size: medium;
text-align: center;
margin-left: 0%;
margin-top: 1%;
width: 20vh;
}
#addMemberButton{
background-color: #845380;
border: none;
padding: 6px;
color: #fffafa;
font-weight: 1700;
border-radius: 8px;
font-family: "Roboto", sans-serif;
font-weight: 400;
font-size: medium;
text-align: center;
margin-left: 0%;
margin-top: 1%;
width: 30vh;
}
#projectButton2{
background-color: #845380;
border: none;
padding: 6px;
color: #fffafa;
font-weight: 1700;
border-radius: 8px;
font-family: "Roboto", sans-serif;
font-weight: 400;
font-size: medium;
text-align: center;
margin-left: 0%;
margin-top: 1%;
width: 30vh;
}
.pageView{
display: flex;
......
......@@ -25,8 +25,8 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
<button>+ Lägg till medlem</button>
<button>Redigera</button>
<button id="projectButton2">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
<!-- Right content -->
......
......@@ -26,8 +26,8 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
<button>+ Lägg till medlem</button>
<button>Redigera</button>
<button id="projectButton2">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
<!-- Right content -->
......
......@@ -23,7 +23,7 @@
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
<button id="addMemberButton">+ Lägg till medlem</button>
<button>Redigera</button>
<button id="projectButton">Redigera</button>
</div>
<!-- Right content -->
......
......@@ -24,8 +24,8 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
<button>+ Lägg till medlem</button>
<button>Redigera</button>
<button id="projectButton2">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
<!-- Right content -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment