Skip to content

Commit c4c5364

Browse files
committed
Fixed modal tabs
Change dropzone
1 parent 8522606 commit c4c5364

File tree

4 files changed

+32
-67
lines changed

4 files changed

+32
-67
lines changed

src/_common/modal/modal-tabs.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/_common/modal/modal-tabs.scss

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,19 @@
99
border-bottom: 1px solid #ddd;
1010
box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
1111

12-
.modal-tab-item {
13-
display: inline;
14-
15-
a {
16-
display: inline-block;
17-
padding: 10px 20px;
18-
}
12+
.nav-link {
13+
padding: 10px 20px;
14+
border: none;
1915

2016
&:hover,
2117
&.active {
22-
a {
23-
border-bottom: 2px solid $color-primary;
24-
}
18+
color: $color-primary;
19+
border-bottom: 2px solid $color-primary;
2520
}
2621

2722
&.active {
2823
font-weight: 600;
2924
}
3025
}
3126
}
32-
33-
.modal-tab-pane {
34-
display: none;
35-
padding: 0;
36-
37-
&.active {
38-
display: block;
39-
}
40-
}
4127
}

src/app/_common/modals/modal-media/modal-media.hbs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
</div>
1111
<div class="modal-body modal-tab-container">
1212

13-
<ul class="modal-tabs">
14-
<li class="modal-tab-item">
15-
<a href="#gallery">Gallery</a>
13+
<ul class="nav nav-tabs modal-tabs" role="tablist">
14+
<li class="nav-item">
15+
<a class="nav-link" href="#gallery" data-toggle="tab" role="tab">Gallery</a>
1616
</li>
17-
<li class="modal-tab-item">
18-
<a href="#upload">Upload</a>
17+
<li class="nav-item">
18+
<a class="nav-link active" href="#upload" data-toggle="tab" role="tab">Upload</a>
1919
</li>
2020
</ul>
2121

22-
<div class="modal-tab-content">
23-
<div class="modal-tab-pane fade" id="gallery">
22+
<div class="tab-content modal-tab-content">
23+
<div class="tab-pane fade" id="gallery" role="tabpanel">
2424
<div class="images-container">
2525
<div class="row">
2626
{{#each gallery}}
@@ -33,13 +33,14 @@
3333
</div>
3434
</div>
3535
</div>
36-
<div class="modal-tab-pane fade" id="upload">
36+
<div class="tab-pane fade active in" id="upload" role="tabpanel">
3737
<div class="upload-container">
3838
<div id="dropzone">
3939
<form action="/" method="POST" enctype="multipart/form-data" class="dropzone needsclick dz-clickable" id="demo-upload">
40-
<div class="dz-message needsclick">
41-
Drop files here or click to upload.<br>
42-
<span class="note needsclick">(This is just a demo dropzone. Selected files are <strong>not</strong> actually uploaded.)</span>
40+
<div class="dz-message-block">
41+
<div class="dz-message needsclick">
42+
Drop files here or click to upload.
43+
</div>
4344
</div>
4445
</form>
4546
</div>

src/app/_common/modals/modal-media/modal-media.scss

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,25 @@
3030
}
3131

3232
.upload-container {
33-
padding: 15px;
33+
padding: 15px;
3434

3535
.dropzone {
36-
border: 2px dashed $color-divider;
36+
position: relative;
37+
border: 2px dashed $color-primary;
3738
height: 270px;
3839

39-
.dz-message {
40-
margin: 5em 0;
40+
.dz-message-block {
41+
position: absolute;
42+
top: 50%;
43+
left: 50%;
44+
transform: translateY(-50%) translateX(-50%);
45+
46+
.dz-message {
47+
margin: 0;
48+
font-size: 24px;
49+
color: $color-primary;
50+
width: 230px;
51+
}
4152
}
4253
}
4354
}

0 commit comments

Comments
 (0)