aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2018-11-21 21:23:07 +0300
committerHenry Jameson <me@hjkos.com>2018-11-21 21:23:07 +0300
commit621ab806e63e42e0495fa174fd64f8eaeeb46b91 (patch)
treed06537e9ac0f81030d156b9fdb73cad8c92fc53f
parent3bdcdefc9bd697413c5ef4b3e0b606e045b8e612 (diff)
more default shadows, replaced original shadows with generated ones. maybe gotta
update fallbacks...
-rw-r--r--src/App.scss17
-rw-r--r--src/components/status/status.vue1
-rw-r--r--src/components/user_card_content/user_card_content.vue1
-rw-r--r--src/i18n/en.json13
-rw-r--r--src/services/style_setter/style_setter.js76
5 files changed, 98 insertions, 10 deletions
diff --git a/src/App.scss b/src/App.scss
index 30020722..a41140ef 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -58,9 +58,10 @@ button {
border-radius: $fallback--btnRadius;
border-radius: var(--btnRadius, $fallback--btnRadius);
cursor: pointer;
- border-top: 1px solid rgba(255, 255, 255, 0.2);
- border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ /* border-top: 1px solid rgba(255, 255, 255, 0.2); */
+ /* border-bottom: 1px solid rgba(0, 0, 0, 0.2); */
box-shadow: 0px 0px 2px black;
+ box-shadow: var(--buttonShadow);
font-size: 14px;
font-family: sans-serif;
@@ -75,11 +76,12 @@ button {
&:hover {
box-shadow: 0px 0px 4px rgba(255, 255, 255, 0.3);
+ box-shadow: var(--buttonHoverShadow);
}
&:active {
- border-bottom: 1px solid rgba(255, 255, 255, 0.2);
- border-top: 1px solid rgba(0, 0, 0, 0.2);
+ /* border-bottom: 1px solid rgba(255, 255, 255, 0.2); */
+ /* border-top: 1px solid rgba(0, 0, 0, 0.2); */
}
&:disabled {
@@ -104,9 +106,10 @@ input, textarea, .select {
border: none;
border-radius: $fallback--inputRadius;
border-radius: var(--inputRadius, $fallback--inputRadius);
- border-bottom: 1px solid rgba(255, 255, 255, 0.2);
- border-top: 1px solid rgba(0, 0, 0, 0.2);
+ /* border-bottom: 1px solid rgba(255, 255, 255, 0.2); */
+ /* border-top: 1px solid rgba(0, 0, 0, 0.2); */
box-shadow: 0px 0px 2px black inset;
+ box-shadow: var(--inputShadow);
background-color: $fallback--fg;
background-color: var(--input, $fallback--fg);
color: $fallback--lightText;
@@ -184,6 +187,7 @@ input, textarea, .select {
border-bottom: 1px solid rgba(255, 255, 255, 0.2);
border-top: 1px solid rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 2px black inset;
+ box-shadow: var(--inputShadow);
margin-right: .5em;
background-color: $fallback--fg;
background-color: var(--input, $fallback--fg);
@@ -365,6 +369,7 @@ main-router {
background-color: $fallback--fg;
background-color: var(--panel, $fallback--fg);
align-items: baseline;
+ box-shadow: var(--panelHeaderShadow);
.title {
flex: 1 0 auto;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 57a007d9..c4a268d0 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -146,6 +146,7 @@
border-radius: $fallback--tooltipRadius;
border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
+ box-shadow: var(--popupShadow);
margin-top: 0.25em;
margin-left: 0.5em;
z-index: 50;
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index f1b54fad..a2bb99a1 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -155,6 +155,7 @@
width: 56px;
height: 56px;
box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
+ box-shadow: var(--avatarShadow);
object-fit: cover;
&.animated::before {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 18b47ba7..3fcc6da2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -212,11 +212,16 @@
"inset": "Inset",
"components": {
"panel": "Panel",
+ "panelHeader": "Panel header",
+ "topBar": "Top bar",
+ "avatar": "User avatar (in post display)",
+ "avatarStatus": "User avatar (in profile view)",
+ "popup": "Popups and tooltips",
"button": "Button",
- "button_hover": "Button (hover)",
- "button_pressed": "Button (pressed)",
- "button_pressed_hover": "Button (pressed+hover)",
- "input_box": "Input field"
+ "buttonHover": "Button (hover)",
+ "buttonPressed": "Button (pressed)",
+ "buttonPressedHover": "Button (pressed+hover)",
+ "input": "Input field"
}
}
}
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 57bd2841..8142da8b 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -258,6 +258,40 @@ const generateRadii = (input) => {
}
const generateShadows = (input) => {
+ const buttonInsetFakeBorders = [{
+ x: 0,
+ y: 101,
+ blur: 0,
+ spread: -100,
+ color: '#FFFFFF',
+ alpha: 0.2,
+ inset: true
+ }, {
+ x: 0,
+ y: -101,
+ blur: 0,
+ spread: -100,
+ color: '#000000',
+ alpha: 0.2,
+ inset: true
+ }]
+ const inputInsetFakeBorders = [{
+ x: 0,
+ y: 101,
+ blur: 0,
+ spread: -100,
+ color: '#000000',
+ alpha: 0.2,
+ inset: true
+ }, {
+ x: 0,
+ y: -101,
+ blur: 0,
+ spread: -100,
+ color: '#FFFFFF',
+ alpha: 0.3,
+ inset: true
+ }]
const shadows = {
panel: [{
x: 1,
@@ -267,6 +301,48 @@ const generateShadows = (input) => {
color: '#000000',
alpha: 0.6
}],
+ popup: [{
+ x: 2,
+ y: 2,
+ blur: 3,
+ spread: 0,
+ color: '#000000',
+ alpha: 0.5
+ }],
+ avatar: [{
+ x: 0,
+ y: 1,
+ blur: 8,
+ spread: 0,
+ color: '#000000',
+ alpha: 0.7
+ }],
+ panelHeader: [],
+ button: [{
+ x: 0,
+ y: 0,
+ blur: 2,
+ spread: 0,
+ color: '#000000',
+ alpha: 1
+ }, ...buttonInsetFakeBorders],
+ buttonHover: [{
+ x: 0,
+ y: 0,
+ blur: 4,
+ spread: 0,
+ color: '--faint',
+ alpha: 1
+ }, ...buttonInsetFakeBorders],
+ input: [{
+ x: 0,
+ y: 0,
+ blur: 2,
+ inset: true,
+ spread: 0,
+ color: '#000000',
+ alpha: 1
+ }, ...inputInsetFakeBorders],
...(input.shadows || {})
}