Skip to content

Commit 71bf870

Browse files
author
Julia Bakerink
committed
Updated transparency of dropdown
1 parent ba440e0 commit 71bf870

File tree

4 files changed

+30
-41
lines changed

4 files changed

+30
-41
lines changed

src/components/file_system_interface/OpenProjectComponent.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010
<div class="settings-dropdown column items-center">
1111
<p class="center">Import:</p>
1212
<q-btn class="menu-btn" no-caps color="secondary" label="Project" @click="openProjectJSON"/>
13-
<ImportComponent no-caps title="Component"/>
13+
<ImportComponent class="import-comp" no-caps title="Component"/>
1414
<!-- <q-btn class="menu-btn" no-caps color="secondary" label="Component" @click="exportProject"/> -->
1515
</div>
1616
</q-menu>
@@ -74,4 +74,10 @@ export default {
7474
margin: 10px 0px;
7575
box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
7676
}
77+
78+
.import-comp{
79+
width: 80% !important;
80+
margin: 10px 0px;
81+
box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
82+
}
7783
</style>

src/components/home_sidebar_items/ComponentTab/ImportComponent.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,8 @@ export default {
257257

258258
<style scoped>
259259
#import-component-btn{
260-
width: 85%;
260+
width: 100%;
261261
margin: 10px 0px;
262-
box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
263262
}
264263
</style>
265264

src/components/slack_login/SlackLoginWindow.vue

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
11
<!--<template v-if="show">-->
22
<template>
3-
<q-btn
4-
class="menu-btn"
5-
color= "purple"
6-
no-caps
7-
@click="openLogin"
8-
>
9-
<svg
10-
xmlns="http://www.w3.org/2000/svg"
11-
style="height: 20px; width: 20px; margin-right: 12px"
12-
viewBox="0 0 122.8 122.8"
13-
>
14-
<path
15-
d="M25.8 77.6c0 7.1-5.8 12.9-12.9 12.9S0 84.7 0 77.6s5.8-12.9 12.9-12.9h12.9v12.9zm6.5 0c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V77.6z"
16-
fill="#e01e5a"
17-
></path>
18-
<path
19-
d="M45.2 25.8c-7.1 0-12.9-5.8-12.9-12.9S38.1 0 45.2 0s12.9 5.8 12.9 12.9v12.9H45.2zm0 6.5c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H12.9C5.8 58.1 0 52.3 0 45.2s5.8-12.9 12.9-12.9h32.3z"
20-
fill="#36c5f0"
21-
></path>
22-
<path
23-
d="M97 45.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9H97V45.2zm-6.5 0c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V12.9C64.7 5.8 70.5 0 77.6 0s12.9 5.8 12.9 12.9v32.3z"
24-
fill="#2eb67d"
25-
></path>
26-
<path
27-
d="M77.6 97c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9V97h12.9zm0-6.5c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H77.6z"
28-
fill="#ecb22e"
29-
></path>
30-
</svg>
31-
Slack Login
32-
</q-btn>
3+
<q-btn class="menu-btn" color= "purple" no-caps @click="openLogin">
4+
<!-- Slack logo -->
5+
<svg xmlns="http://www.w3.org/2000/svg" style="height: 20px; width: 20px; margin-right: 12px" viewBox="0 0 122.8 122.8">
6+
<path d="M25.8 77.6c0 7.1-5.8 12.9-12.9 12.9S0 84.7 0 77.6s5.8-12.9 12.9-12.9h12.9v12.9zm6.5 0c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V77.6z" fill="#e01e5a" ></path>
7+
<path d="M45.2 25.8c-7.1 0-12.9-5.8-12.9-12.9S38.1 0 45.2 0s12.9 5.8 12.9 12.9v12.9H45.2zm0 6.5c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H12.9C5.8 58.1 0 52.3 0 45.2s5.8-12.9 12.9-12.9h32.3z" fill="#36c5f0"></path>
8+
<path d="M97 45.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9H97V45.2zm-6.5 0c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V12.9C64.7 5.8 70.5 0 77.6 0s12.9 5.8 12.9 12.9v32.3z" fill="#2eb67d"></path>
9+
<path d="M77.6 97c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9V97h12.9zm0-6.5c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H77.6z" fill="#ecb22e" ></path>
10+
</svg>
11+
Slack Login
12+
</q-btn>
3313
<div>
3414
<!-- <div>
3515
<q-btn class="glossy bg-black openModalBtn" size="5px" @click="openLogin">
@@ -182,6 +162,7 @@ export default {
182162
color: $menutext;
183163
background-color: purple;
184164
margin-bottom: 10px;
165+
width: 100%
185166
186167
}
187168
@@ -190,7 +171,7 @@ export default {
190171
background-color: $subprimary;
191172
border: 1px solid $subprimary;
192173
text-decoration: underline;
193-
margin-top: 30px;
174+
margin-top: 20px;
194175
}
195176
196177
#skipButton:hover {

src/layouts/MyLayout.vue

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,20 +424,23 @@ q-btn > i {
424424
height: 100%;
425425
}
426426
427-
.scroll {
428-
// overflow: hidden;
429-
}
430427
.menu-btn{
431428
width: 80%;
432429
margin: 10px 0px;
433-
box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
430+
box-shadow:inset 0 -0.6em 0 -0.35em rgba(0, 0, 0, 0.055);
434431
}
435-
.settings-dropdown {
436-
background: #5c5e61;
432+
433+
.menu-btn:disabled{
434+
background: #437962 !important;
435+
opacity: 100% !important;
436+
color: #959a98 !important;
437437
}
438+
438439
.dropdown{
439-
width: 15%;
440+
width: 200px;
440441
height: auto;
442+
overflow:visible;
443+
background: rgba(#000000, .8);
441444
}
442445
/* Typescript toggle
443446
========================== */

0 commit comments

Comments
 (0)