Skip to content

Commit e8292f6

Browse files
authored
Merge pull request #95 from NfNitLoop/dec-03
Dec 03
2 parents 0a69694 + 5009db3 commit e8292f6

9 files changed

Lines changed: 376 additions & 367 deletions

File tree

web-client/client.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ input[type="text"]:hover
104104
gap: 0.3rem;
105105
}
106106

107+
.item .body > h1 {
108+
font-size: 1.5em;
109+
}
110+
111+
.item .body > h2 {
112+
font-size: 1.3em;
113+
}
114+
107115

108116
.item .header .text > * {
109117
display: inline-block;

web-client/components/Button.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="buttonPosition">
1+
<div class="buttonPosition {$$props.class}">
22
<div class="button" class:disabled class:confirmationMode on:mouseup={clicked} on:mouseleave={onMouseLeave}>
33
<slot/>
44
</div>
@@ -20,6 +20,7 @@ export let disabled = false
2020
export let href = ""
2121
2222
// This button requires confirmation, and is currently asking for confirmation
23+
// TODO: Get rid of confirmation. I think I've stopped using it everywhere. also get rid of buttonPositon container.
2324
let confirmationMode = false
2425
2526
let dispatcher = createEventDispatcher()
@@ -73,6 +74,7 @@ function onMouseLeave() {
7374
.button:active, .button.disabled{
7475
box-shadow: none;
7576
background-color: #eee;
77+
cursor: default;
7678
}
7779
.button.disabled {
7880
color: #888;

web-client/components/ColorPicker.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class:isIphone>
1+
<div class="colorPicker" class:isIphone>
22
<input bind:this={inputter} class="color" type="color" bind:value={color}>
33
<color-box bind:this={box} on:click={clicked}></color-box>
44
</div>

web-client/components/IndexPage.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import PostPage from "./pages/PostPage.svelte";
2323
import EditProfilePage from "./pages/EditProfilePage.svelte";
2424
import SyncPage from "./pages/SyncPage.svelte";
2525
import CreateIDPage from "./pages/login/CreateIDPage.svelte";
26+
import SecurityPage from "./pages/login/SecurityPage.svelte";
2627
2728
// This is a writable() store so that we can notify the app
2829
// that appState has been modified. Svelte doesn't/can't propagate updates
@@ -48,6 +49,7 @@ routes.set({
4849
4950
"/login": Login,
5051
"/login/create-id": CreateIDPage,
52+
"/login/security": SecurityPage,
5153
5254
// These are deprecated old paths.
5355
// TODO: Figure out a succinct way to do redirects?

web-client/components/PageHeading.svelte

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,24 +160,28 @@ let navTree = new NavNode({
160160
pattern: "/u/:uid/feed",
161161
linkAway: true,
162162
},
163-
{
164-
requireLoggedIn: false,
163+
{
164+
requireLoggedIn: true,
165+
title: "Log Out",
165166
pattern: "/login",
167+
linkAway: true,
168+
},
169+
{
170+
requireLoggedIn: false,
166171
title: "Log In",
167-
children: [
168-
{title: "Home", pattern: "/home", linkAway: true},
169-
{title: "Log In", pattern: "/login" },
170-
{title: "Create ID", pattern: "/login/create-id" },
171-
]
172+
pattern: "/login",
173+
linkAway: true,
172174
},
175+
173176
{
174-
requireLoggedIn: true,
175177
pattern: "/login",
176-
title: "Log Out",
178+
title: "Log In/Out",
179+
placeholder: true,
177180
children: [
178181
{title: "Home", pattern: "/home", linkAway: true},
179-
{title: "Log Out", pattern: "/login" },
182+
{title: "Identities", pattern: "/login" },
180183
{title: "Create ID", pattern: "/login/create-id" },
184+
{title: "Security", pattern: "/login/security", requireLoggedIn: true},
181185
]
182186
},
183187
{

web-client/components/ProfileImage.svelte

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
alt="identicon"
44
class:defaultSize
55
class:followFont
6+
class="profileImage"
67
height={sizeNum}
78
width={sizeNum}
89
/>
@@ -29,6 +30,9 @@ img {
2930
margin: 0.2rem;
3031
border-radius: 5px;
3132
box-shadow: 0px 3px 3px rgba(0,0,0,0.15);
33+
34+
/** top-level CSS has .item img { max-width: 100%; }, but that causes this image to be shrinkable. Do not want: */
35+
max-width: none;
3236
}
3337
3438
/* Size used in ItemView blocks:*/

0 commit comments

Comments
 (0)