Skip to content

Commit b8733b8

Browse files
committed
fix: css styling
1 parent 792212b commit b8733b8

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

wiki/public/scss/edit_wiki.scss

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ body {
66
--editor-line-no-bg-color: var(--gray-100);
77

88
--editor-background-color: #f3f3f3;
9+
10+
--button-background-color: #383838;
911
}
1012

1113
body.dark {
1214
--editor-line-no-bg-color: var(--gray-800);
1315
--control-bg-on-gray: var(--gray-700);
1416
--editor-background-color: #333c44;
17+
18+
--button-background-color: #383838;
1519

1620
.draft-wiki-page {
1721
background: var(--gray-700);
@@ -21,6 +25,7 @@ body.dark {
2125

2226
.form-control {
2327
background-color: white;
28+
border: 1px solid var(--background-color);
2429
}
2530

2631
// edit page
@@ -577,7 +582,7 @@ $font-sizes-mobile: (
577582

578583
.btn.btn-primary:hover {
579584
color: #fff;
580-
background-color: var(--editor-background-color);
585+
background-color: var(--button-background-color);
581586
border-color: #383838;
582587
}
583588

wiki/public/scss/wiki.scss

+8-3
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,9 @@ body.dark {
657657
}
658658

659659
.dropdown-menu {
660-
background-color: var(--background-color);
661-
660+
background-color: var(--editor-background-color);
661+
border-color: var(--editor-background-color);
662+
662663
.dropdown-item {
663664
color: var(--text-color);
664665

@@ -670,6 +671,10 @@ body.dark {
670671
}
671672
}
672673

674+
.dropdown-menu.show {
675+
top: 4px !important;
676+
}
677+
673678
// main-content
674679
.main-column {
675680
background-color: var(--background-color);
@@ -816,7 +821,7 @@ h6:hover .feather-link {
816821
width: 25rem;
817822

818823
.form-control:focus {
819-
border: none;
824+
border: 1px solid var(--background-color);
820825
}
821826

822827
.rating-options-buttons {

wiki/wiki/doctype/wiki_page/templates/editor.html

+6-25
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,15 @@
77
Discard
88
</div>
99
<div class="btn-group">
10-
<div
11-
type="button"
12-
class="btn btn-group btn-primary save-wiki-page-btn btn-sm"
13-
data-wiki-button="saveWikiPage"
14-
>
10+
<div type="button" class="btn btn-group btn-primary save-wiki-page-btn btn-sm" data-wiki-button="saveWikiPage">
1511
Save
1612
</div>
17-
<div
18-
type="button"
19-
class="btn btn-primary btn-sm dropdown-toggle dropdown-toggle-split"
20-
data-toggle="dropdown"
21-
aria-haspopup="true"
22-
aria-expanded="false"
23-
>
13+
<div type="button" class="btn btn-primary btn-sm dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"
14+
aria-haspopup="true" aria-expanded="false">
2415
<span class="sr-only">Toggle Dropdown</span>
2516
</div>
2617
<div class="dropdown-menu" aria-labelledby="saveDropdownMenuButton">
27-
<a
28-
href="#"
29-
class="dropdown-item text-sm"
30-
data-wiki-button="draftWikiPage"
31-
>Draft</a
32-
>
18+
<a href="#" class="dropdown-item text-sm" data-wiki-button="draftWikiPage">Draft</a>
3319
</div>
3420
</div>
3521
</div>
@@ -39,13 +25,8 @@
3925
<div class="wiki-editor-container">
4026
<div class="wiki-title-container">
4127
<label class="text-sm">Title</label>
42-
<input
43-
type="text"
44-
class="form-control wiki-title-input"
45-
value=""
46-
placeholder="What's the Wiki Title?"
47-
/>
28+
<input type="text" class="form-control wiki-title-input" value="" placeholder="What's the Wiki Title?" />
4829
</div>
4930
<label class="text-sm">Content</label>
5031
<div id="wiki-editor"></div>
51-
</div>
32+
</div>

0 commit comments

Comments
 (0)