Browse Source

Make Matcha a stylesheet addition of Bookish

biotorrents 4 years ago
parent
commit
e691b575e8

+ 4
- 5
gazelle.sql View File

1808
 
1808
 
1809
 
1809
 
1810
 INSERT INTO `stylesheets` (`ID`, `Name`, `Description`, `Default`, `Additions`, `Color`) VALUES
1810
 INSERT INTO `stylesheets` (`ID`, `Name`, `Description`, `Default`, `Additions`, `Color`) VALUES
1811
-  (1, 'bookish', 'BioTorrents.de Stylesheet', '1', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue', '#000000'),
1812
-  (2, 'matcha', 'Alternate Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue', '#000000'),
1813
-  (3, 'postmod', 'What.cd Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue;', '#000000');
1814
-  (4, 'oppai', 'Oppaitime Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue', '#fbc2e5'),
1815
-  (5, 'beluga', 'Beluga Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue;checkbox=pink;checkbox=haze', '#23252a'),
1811
+  (1, 'bookish', 'BioTorrents.de Stylesheet', '1', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue;checkbox=matcha', '#000000'),
1812
+  (2, 'postmod', 'What.cd Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue;', '#000000'),
1813
+  (3, 'oppai', 'Oppaitime Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue', '#fbc2e5'),
1814
+  (4, 'beluga', 'Beluga Stylesheet', '0', 'select=noto_sans;select=luxi_sans;select=cmodern_sans;select=noto_serif;select=luxi_serif;select=cmodern_serif;select=opendyslexic;select=comic_neue;checkbox=pink;checkbox=haze', '#23252a');
1816
 
1815
 
1817
 
1816
 
1818
 INSERT INTO `wiki_articles` (`ID`, `Revision`, `Title`, `Body`, `MinClassRead`, `MinClassEdit`, `Date`, `Author`) VALUES
1817
 INSERT INTO `wiki_articles` (`ID`, `Revision`, `Title`, `Body`, `MinClassRead`, `MinClassEdit`, `Date`, `Author`) VALUES

+ 5
- 5
sections/wiki/search.php View File

170
   </div>
170
   </div>
171
   <?php } ?>
171
   <?php } ?>
172
 
172
 
173
-  <table width="100%">
174
-    <tr class="colhead">
175
-      <td>Article</td>
176
-      <td>Last updated on</td>
177
-      <td>Last edited by</td>
173
+  <table class="skeleton-fix">
174
+    <tr>
175
+      <th>Article</th>
176
+      <th>Last updated on</th>
177
+      <th>Last edited by</th>
178
     </tr>
178
     </tr>
179
 
179
 
180
     <?php
180
     <?php

+ 1
- 0
static/styles/bookish/bookish.scss View File

1
 @import "../assets/go";
1
 @import "../assets/go";
2
+@import "matcha/matcha";
2
 @import "scss/bookish";
3
 @import "scss/bookish";
3
 
4
 
4
 @import "scss/colors";
5
 @import "scss/colors";

+ 371
- 0
static/styles/bookish/matcha/matcha.scss View File

1
+/**
2
+ * Matcha Additions
3
+ */
4
+
5
+body.style_matcha {
6
+    /* Body */
7
+    background: #edeae5;
8
+
9
+    /* Header and logo */
10
+    #header {
11
+        background: url("/static/styles/bookish/matcha/sam-komon.png");
12
+    }
13
+
14
+    #logo {
15
+        background: url("/static/common/logos/matcha.png") no-repeat center;
16
+        background-size: contain;
17
+        width: 250px;
18
+        height: 50px;
19
+        margin: 0 0 0 10%;
20
+    }
21
+
22
+    /* Main menu */
23
+    #menu {
24
+        background-color: #016670;
25
+    }
26
+
27
+    #menu ul li a.active {
28
+        background-color: #016670;
29
+    }
30
+
31
+    #menu ul li a:hover {
32
+        background-color: #0298a6;
33
+    }
34
+
35
+    /* Dropdown menu */
36
+    #menu .nav_dropdown {
37
+        background: #016670;
38
+        margin-top: 0;
39
+    }
40
+
41
+    .nav_dropdown > div {
42
+        box-shadow: 2px 2px 10px -2px slategray;
43
+        position: absolute;
44
+        background-color: #016670;
45
+        width: 100%;
46
+        z-index: 99999;
47
+        margin-top: 2.4em;
48
+        /* margin-top: 32px; */
49
+        left: 0;
50
+    }
51
+
52
+    .nav_dropdown > div > a {
53
+        display: none;
54
+        color: white;
55
+        height: 2.4em;
56
+        line-height: 2.4em;
57
+        text-decoration: none;
58
+    }
59
+
60
+    .nav_dropdown:hover > div > a {
61
+        display: block;
62
+    }
63
+
64
+    /* Search bars */
65
+    #searchbars {
66
+        text-align: center;
67
+        background-color: #9fedd7;
68
+        box-sizing: content-box;
69
+        padding: 0.5em 10%;
70
+        display: flex;
71
+
72
+        input {
73
+            position: relative;
74
+            border: 1px solid transparent;
75
+            box-sizing: border-box;
76
+            padding: 0.25em 0.25em 0.25em 0.5em;
77
+            background-color: white;
78
+            width: 100%;
79
+            color: black;
80
+        }
81
+
82
+        ul {
83
+            margin: 0 auto;
84
+            display: block;
85
+            text-align: center;
86
+
87
+            li {
88
+                display: inline;
89
+                margin: 0px 1px;
90
+                list-style: none;
91
+                position: relative;
92
+
93
+                form {
94
+                    display: inline;
95
+                }
96
+
97
+                ul {
98
+                    display: block;
99
+                    position: absolute;
100
+                    top: 1em;
101
+                    left: 0;
102
+                    z-index: 1000;
103
+                    background-color: white;
104
+                    width: 12em;
105
+                    margin-top: 1em;
106
+
107
+                    li {
108
+                        margin: 0 0 0 0;
109
+                        padding: 0;
110
+                        display: block;
111
+                        width: 100%;
112
+
113
+                        .highlight {
114
+                            background: white;
115
+                        }
116
+                    }
117
+                }
118
+            }
119
+        }
120
+    }
121
+
122
+    #searchbars > .search_form {
123
+        flex: 1 1 auto;
124
+        text-align: center;
125
+        margin: 0 0.1em;
126
+    }
127
+
128
+    /* Upload, Invite, etc. */
129
+    #userinfo {
130
+        background: #fff9c7;
131
+        box-shadow: 0 2px 10px -2px slategray;
132
+        color: black;
133
+        padding: 0.5em 0;
134
+        width: 100%;
135
+        text-align: center;
136
+
137
+        a {
138
+            color: black;
139
+            text-decoration: none;
140
+
141
+            &:hover {
142
+                text-decoration: underline;
143
+            }
144
+        }
145
+
146
+        b a {
147
+            font-weight: normal;
148
+            font-size: 0.9em;
149
+            font-weight: bold;
150
+        }
151
+
152
+        ul {
153
+            display: inline;
154
+            margin: 0 1%;
155
+
156
+            li {
157
+                display: inline;
158
+                margin: 0 0.1em;
159
+                line-height: 2em;
160
+                vertical-align: middle;
161
+                padding: 0;
162
+            }
163
+        }
164
+    }
165
+
166
+    #userinfo_minor > li > ul {
167
+        display: none;
168
+        position: absolute;
169
+        padding: 5px;
170
+        left: -5px;
171
+        background-color: #fff9c7;
172
+        z-index: 100;
173
+    }
174
+
175
+    /* Alerts, Toolbox, etc. */
176
+    .alertbar {
177
+        background-color: #fff9c7;
178
+        text-align: center;
179
+        color: black;
180
+        font-weight: bold;
181
+        width: 320px;
182
+        margin: 2em auto;
183
+        padding: 1em;
184
+
185
+        a {
186
+            color: black;
187
+            text-decoration: none;
188
+
189
+            &:hover {
190
+                color: black;
191
+                text-decoration: underline;
192
+            }
193
+        }
194
+
195
+        .warning {
196
+            background-color: #ffe68a;
197
+        }
198
+
199
+        .error {
200
+            background-color: #ff8a8a;
201
+        }
202
+    }
203
+
204
+    /* Column heads */
205
+    .head {
206
+        background: #9fedd7;
207
+        color: black;
208
+        padding: 0.5em 1em;
209
+    }
210
+
211
+    .colhead {
212
+        background: #9fedd7;
213
+        font-weight: bold;
214
+        color: black;
215
+    }
216
+
217
+    .colhead_dark {
218
+        background: #9fedd7;
219
+        color: black;
220
+    }
221
+
222
+    /* Box */
223
+    .box,
224
+    section {
225
+        background-color: white;
226
+        border: none;
227
+        margin-bottom: 1em;
228
+    }
229
+
230
+    /* Shadows */
231
+    .box,
232
+    .border,
233
+    .alertbar,
234
+    .artist_table,
235
+    .request_table,
236
+    .forum_index,
237
+    #userinfo_minor > li > ul,
238
+    .permissions table {
239
+        box-shadow: 2px 2px 10px -2px slategray;
240
+    }
241
+
242
+    /* Links */
243
+    a {
244
+        color: #016670;
245
+        text-decoration: none;
246
+
247
+        &:hover {
248
+            color: black;
249
+            text-decoration: underline;
250
+        }
251
+    }
252
+
253
+    /* Special links */
254
+    .forum_post .body a:not([href="#"]),
255
+    .rule_summary a,
256
+    .wiki_article a,
257
+    #actual_rules a,
258
+    .news_post .pad a,
259
+    .store_table a {
260
+        color: #016670;
261
+        text-decoration: none;
262
+    }
263
+
264
+    .forum_post .body a:hover:not([href="#"]),
265
+    .rule_summary a:hover,
266
+    .wiki_article a:hover,
267
+    #actual_rules a:hover,
268
+    .news_post .pad a:hover,
269
+    .store_table a:hover {
270
+        color: black;
271
+        text-decoration: underline;
272
+    }
273
+
274
+    /* Blockquote */
275
+    blockquote {
276
+        margin: 0.5em 2em;
277
+        padding: 1em;
278
+        border: 1px solid #bbb;
279
+    }
280
+
281
+    /* Buttons */
282
+    button:not(.editor-toolbar button),
283
+    input[type="button"],
284
+    input[type="submit"] {
285
+        background: #fbe180;
286
+        border-radius: 0.25rem;
287
+        box-shadow: 2px 2px 10px -5px slategray;
288
+    }
289
+
290
+    button:hover,
291
+    input[type="button"]:hover,
292
+    input[type="submit"]:hover {
293
+        background: #fff9c7;
294
+    }
295
+
296
+    button:focus,
297
+    input[type="button"]:focus,
298
+    input[type="submit"]:focus {
299
+        background: #fff9c7;
300
+    }
301
+
302
+    /* Text input */
303
+    input.inputtext {
304
+        border: none;
305
+        border-bottom: 1px solid #edeae5;
306
+        background-color: white;
307
+        font-size: 13px;
308
+        outline: none;
309
+        transition: ease-in-out 0.12s;
310
+
311
+        &:focus {
312
+            border-bottom: 1px solid #fbe180;
313
+        }
314
+    }
315
+
316
+    /* Cover images */
317
+    #coverCont {
318
+        background-color: #fff9c7;
319
+        padding: 5px;
320
+        box-shadow: 2px 2px 10px -2px slategray;
321
+    }
322
+
323
+    #coverCont img {
324
+        background-color: #fff9c7;
325
+    }
326
+
327
+    /* Captions */
328
+    caption {
329
+        border-bottom: 1px solid #edeae5;
330
+        font-weight: bold;
331
+    }
332
+
333
+    /* Messages */
334
+    .error_message {
335
+        padding: 1em;
336
+        background-color: #ff8a8a;
337
+        text-align: center;
338
+        color: white;
339
+        font-weight: bold;
340
+        box-shadow: 2px 2px 10px -5px slategray;
341
+    }
342
+
343
+    .save_message {
344
+        padding: 1em;
345
+        width: 50%;
346
+        margin: 2em auto;
347
+        background: #fbe180;
348
+        text-align: center;
349
+        color: black;
350
+        font-weight: bold;
351
+        box-shadow: 2px 2px 10px -5px slategray;
352
+    }
353
+
354
+    /* Forums */
355
+    .forum_post .colhead_dark {
356
+        background: #9fedd7;
357
+    }
358
+
359
+    .forum_post.staff_post .colhead_dark {
360
+        background: #fbe180;
361
+    }
362
+
363
+    .forum_post.sticky_post {
364
+        border: 2px solid #fbe180;
365
+    }
366
+
367
+    /* Inbox */
368
+    tr.unreadpm {
369
+        background-color: #fff9c7;
370
+    }
371
+} /* end body.style_matcha */

static/styles/matcha/sam-komon.png → static/styles/bookish/matcha/sam-komon.png View File


+ 8
- 16
static/styles/bookish/scss/colors.scss View File

34
  * For semi-transparent elements,
34
  * For semi-transparent elements,
35
  * e.g., unread forum post borders
35
  * e.g., unread forum post borders
36
  */
36
  */
37
-@mixin transparent-border($color, $alpha) {
38
-    border: 2px solid change-color($color, $alpha);
37
+@mixin transparent-border($c, $a) {
38
+    border: 2px solid change-color($color: $c, $alpha: $a);
39
 }
39
 }
40
 
40
 
41
 /**
41
 /**
71
     border: 1px solid $bg;
71
     border: 1px solid $bg;
72
 }
72
 }
73
 
73
 
74
-/*
75
-@mixin alertbar($bg) {
76
-    background: $bg;
77
-    box-shadow: $shadow;
78
-    text-align: center;
79
-    color: black;
80
-    font-weight: bold;
81
-    /* font-size: 0.95rem; * /
82
-    width: 33%;
83
-    margin: 2em auto;
84
-    padding: 1rem;
85
-}
86
-*/
87
-
88
 .alertbar {
74
 .alertbar {
89
     @include alertbar(silver);
75
     @include alertbar(silver);
90
     /* @include alertbar($lb100); */
76
     /* @include alertbar($lb100); */
133
         /* border: 2px solid $lb700; */
119
         /* border: 2px solid $lb700; */
134
     }
120
     }
135
 }
121
 }
122
+
123
+/* Experimental: whitesmoke brackets? */
124
+a.brackets {
125
+    /* background: whitesmoke; */
126
+    margin: 0 0.25rem;
127
+}

+ 5
- 3
static/styles/bookish/scss/fonts.scss View File

65
 }
65
 }
66
 
66
 
67
 /* Dupe for grouped "Details" on browse.php */
67
 /* Dupe for grouped "Details" on browse.php */
68
-a.search_link {
68
+a.search_link,
69
+a.brackets,
70
+table#taglist a {
69
     color: black;
71
     color: black;
70
     text-decoration: none;
72
     text-decoration: none;
71
 
73
 
81
 blockquote {
83
 blockquote {
82
     margin: 0.5em 2rem;
84
     margin: 0.5em 2rem;
83
     padding: 1rem;
85
     padding: 1rem;
84
-    @include transparent-border($color: black, $alpha: 0.1);
86
+    @include transparent-border($c: purple, $a: 0.1);
85
 }
87
 }
86
 
88
 
87
 caption {
89
 caption {
108
 
110
 
109
 /* Markdown Extra new features */
111
 /* Markdown Extra new features */
110
 hr {
112
 hr {
111
-    @include transparent-border($color: black, $alpha: 0.1);
113
+    @include transparent-border($c: black, $a: 0.5);
112
     margin: 2rem auto;
114
     margin: 2rem auto;
113
     width: 66%;
115
     width: 66%;
114
 }
116
 }

+ 2
- 2
static/styles/global/scss/colors.scss View File

3
  * For semi-transparent elements,
3
  * For semi-transparent elements,
4
  * e.g., unread forum post borders
4
  * e.g., unread forum post borders
5
  */
5
  */
6
-@mixin transparent-border($R: 0, $G: 0, $B: 0, $A: 1) {
7
-    border: 2px solid rgba($R, $G, $B, $A);
6
+@mixin transparent-border($c, $a) {
7
+    border: 2px solid change-color($color: $c, $alpha: $a);
8
 }
8
 }
9
 
9
 
10
 /* Torrent labels for the Format class */
10
 /* Torrent labels for the Format class */

+ 1
- 1
static/styles/global/scss/layout.scss View File

57
      * admonishment on torrent_form.class.php.
57
      * admonishment on torrent_form.class.php.
58
      */
58
      */
59
     &.upload_notice {
59
     &.upload_notice {
60
-        @include transparent-border($R: 255, $A: 0.5);
60
+        @include transparent-border($c: red, $a: 0.5);
61
         margin: 1rem auto;
61
         margin: 1rem auto;
62
         padding-top: 1rem;
62
         padding-top: 1rem;
63
         text-align: center;
63
         text-align: center;

+ 2
- 0
static/styles/global/scss/legacy.scss View File

798
     margin: 10px 0;
798
     margin: 10px 0;
799
 }
799
 }
800
 
800
 
801
+/* 2021-07-26
801
 .number_column {
802
 .number_column {
802
     text-align: right;
803
     text-align: right;
803
 }
804
 }
805
+*/
804
 
806
 
805
 .wide_input_text {
807
 .wide_input_text {
806
     width: 95%;
808
     width: 95%;

+ 2
- 2
static/styles/global/scss/skeleton-fixes.scss View File

69
 /* Forum list headings */
69
 /* Forum list headings */
70
 table.forum_index {
70
 table.forum_index {
71
     h4 {
71
     h4 {
72
-        margin: 0 !important;
72
+        margin: 0.25rem !important;
73
     }
73
     }
74
 }
74
 }
75
 
75
 
88
 /* requests? */form.create_form,
88
 /* requests? */form.create_form,
89
 /* top10 and many */ form.search_form,
89
 /* top10 and many */ form.search_form,
90
 /* edit collage */ table.collage_edit,
90
 /* edit collage */ table.collage_edit,
91
+/* forum lists */ table.forum_index,
91
 /* notif filters */ form[name="notification"],
92
 /* notif filters */ form[name="notification"],
92
 /* GENERIC */ table.skeleton-fix {
93
 /* GENERIC */ table.skeleton-fix {
93
-    th,
94
     td {
94
     td {
95
         border-bottom: 0 !important;
95
         border-bottom: 0 !important;
96
         padding: 0.25rem !important;
96
         padding: 0.25rem !important;

+ 0
- 2
static/styles/matcha/matcha.scss View File

1
-@import "../assets/go";
2
-@import "scss/matcha";

+ 0
- 1399
static/styles/matcha/scss/matcha.scss
File diff suppressed because it is too large
View File


BIN
static/styles/preview/thumb_matcha.png View File


Loading…
Cancel
Save