Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into add-osnap-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
daywiss committed Nov 27, 2023
2 parents b5f250f + 5b5d4db commit 1830349
Show file tree
Hide file tree
Showing 98 changed files with 2,870 additions and 484 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ jobs:
- name: Build
run: yarn run build

- name: Format
run: yarn run format:check

- name: Lint
run: yarn run lint
16 changes: 6 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
{
"name": "snapshot",
"version": "0.1.4",
"license": "MIT",
"repository": "snapshot-labs/snapshot",
"scripts": {
"dev": "vite --port=8080",
"preinstall": "yarn run init-submodules",
"build": "vite build",
"lint": "eslint \"*.{ts,js,vue,json}\" src/ --ext .ts,.js,.vue,.json",
"lint:fix": "yarn lint --fix",
"format": "prettier \"**/*.{ts,js,vue,json}\"",
"format:check": "yarn format --check || exit 1",
"format:fix": "yarn format --write",
"preinstall": "yarn run init-submodules",
"postinstall": "patch-package && husky install",
"init-submodules": "git submodule update --init",
"test:unit": "vitest run",
"test:unit:coverage": "vitest run --coverage"
},
"dependencies": {
"@adraffy/ens-normalize": "^1.10.0",
"@apollo/client": "^3.8.7",
"@braintree/sanitize-url": "^6.0.4",
"@ensdomains/eth-ens-namehash": "^2.0.15",
Expand All @@ -38,8 +36,7 @@
"@shutter-network/shutter-crypto": "1.0.1",
"@snapshot-labs/lock": "^0.2.1",
"@snapshot-labs/pineapple": "^1.1.0",
"@snapshot-labs/snapshot.js": "^0.9.2",
"@snapshot-labs/tune": "^0.1.34",
"@snapshot-labs/snapshot.js": "^0.9.5",
"@vue/apollo-composable": "4.0.0-beta.11",
"@vueuse/core": "^10.6.1",
"@vueuse/head": "^2.0.0",
Expand All @@ -52,6 +49,7 @@
"js-sha256": "^0.10.1",
"jsonexport": "^3.2.0",
"lodash": "^4.17.21",
"minisearch": "^6.2.0",
"mixpanel-browser": "^2.48.1",
"remarkable": "^2.0.1",
"remove-markdown": "^0.5.0",
Expand Down Expand Up @@ -105,7 +103,5 @@
"resolutions": {
"ansi-regex": "^5.0.1",
"axios": "^0.21.1"
},
"license": "MIT",
"repository": "snapshot-labs/snapshot"
}
}
137 changes: 7 additions & 130 deletions src/style.scss → src/assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import './assets/fonts/iconfont.css';
@import '../fonts/iconfont.css';
@import 'viewerjs/dist/viewer.css';
@import './tippy.scss';
@import './tune.scss';

@tailwind base;
@tailwind components;
Expand Down Expand Up @@ -33,21 +36,21 @@
@layer base {
@font-face {
font-family: 'Calibre';
src: url('./assets/fonts/Calibre-Medium-Custom.woff2') format('woff2');
src: url('../fonts/Calibre-Medium-Custom.woff2') format('woff2');
font-weight: 500;
font-style: normal;
}

@font-face {
font-family: 'Calibre';
src: url('./assets/fonts/Calibre-Semibold-Custom.woff2') format('woff2');
src: url('../fonts/Calibre-Semibold-Custom.woff2') format('woff2');
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: 'SpaceMono';
src: url('./assets/fonts/space-mono-v11-latin-700.woff2') format('woff2');
src: url('../fonts/space-mono-v11-latin-700.woff2') format('woff2');
}

html {
Expand Down Expand Up @@ -115,44 +118,6 @@
}
}

// Tune component styles

.tune-label {
@apply font-sans;
}

.tune-sublabel {
@apply font-sans;
}

.tune-button {
@apply rounded-full;
}

.tune-input {
@apply rounded-full;
}

.tune-textarea {
@apply rounded-3xl px-3;
}

.tune-listbox-button {
@apply rounded-full;
}

.tune-button-select {
@apply rounded-full;
}

.tune-input-duration {
@apply rounded-full;
}

.tune-error-text {
@apply font-sans;
}

// Fade transition for Vue's transition and transition-group
.fade-enter-active,
.fade-leave-active {
Expand Down Expand Up @@ -219,94 +184,6 @@ input[type='number'] {
-moz-appearance: textfield;
}

// V-Tippy tooltip package styling - could be moved somewhere else?
.tippy-box[data-animation='fade'][data-state='hidden'] {
opacity: 0;
}
[data-tippy-root] {
max-width: calc(100vw - 10px);
}
.tippy-box {
position: relative;
background-color: var(--text-color);
color: var(--header-bg);
border-radius: 7px;
font-size: 16px;
line-height: 1.4;
outline: 0;
transition-property: transform, visibility, opacity;
padding: 2px 4px;
text-align: center;
font-weight: 500;
}
.tippy-box[data-placement^='top'] > .tippy-arrow {
bottom: 0;
}
.tippy-box[data-placement^='top'] > .tippy-arrow:before {
bottom: -7px;
left: 0;
border-width: 8px 8px 0;
border-top-color: var(--text-color);
transform-origin: center top;
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow {
top: 0;
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow:before {
top: -7px;
left: 0;
border-width: 0 8px 8px;
border-bottom-color: var(--text-color);
transform-origin: center bottom;
}
.tippy-box[data-placement^='left'] > .tippy-arrow {
right: 0;
}
.tippy-box[data-placement^='left'] > .tippy-arrow:before {
border-width: 8px 0 8px 8px;
border-left-color: var(--text-color);
right: -7px;
transform-origin: center left;
}
.tippy-box[data-placement^='right'] > .tippy-arrow {
left: 0;
}
.tippy-box[data-placement^='right'] > .tippy-arrow:before {
left: -7px;
border-width: 8px 8px 8px 0;
border-right-color: var(--text-color);
transform-origin: center right;
}
.tippy-box[data-inertia][data-state='visible'] {
transition-timing-function: cubic-bezier(0.54, 1.5, 0.38, 1.11);
}
.tippy-arrow {
width: 16px;
height: 16px;
color: #333;
}
.tippy-arrow:before {
content: '';
position: absolute;
border-color: transparent;
border-style: solid;
}
.tippy-content {
position: relative;
padding: 5px 9px;
z-index: 1;
overflow-wrap: break-word;
}
.tippy-box[data-theme~='urlified'] {
max-width: 200px;
white-space: pre-wrap;
color: var(--header-bg);

a {
color: var(--header-bg);
}
}

.lazy-loading {
@apply animate-pulse-fast bg-skin-border;
}
Expand Down
87 changes: 87 additions & 0 deletions src/assets/css/tippy.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// V-Tippy tooltip package styling - could be moved somewhere else?
.tippy-box[data-animation='fade'][data-state='hidden'] {
opacity: 0;
}
[data-tippy-root] {
max-width: calc(100vw - 10px);
}
.tippy-box {
position: relative;
background-color: var(--text-color);
color: var(--header-bg);
border-radius: 7px;
font-size: 16px;
line-height: 1.4;
outline: 0;
transition-property: transform, visibility, opacity;
padding: 2px 4px;
text-align: center;
font-weight: 500;
}
.tippy-box[data-placement^='top'] > .tippy-arrow {
bottom: 0;
}
.tippy-box[data-placement^='top'] > .tippy-arrow:before {
bottom: -7px;
left: 0;
border-width: 8px 8px 0;
border-top-color: var(--text-color);
transform-origin: center top;
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow {
top: 0;
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow:before {
top: -7px;
left: 0;
border-width: 0 8px 8px;
border-bottom-color: var(--text-color);
transform-origin: center bottom;
}
.tippy-box[data-placement^='left'] > .tippy-arrow {
right: 0;
}
.tippy-box[data-placement^='left'] > .tippy-arrow:before {
border-width: 8px 0 8px 8px;
border-left-color: var(--text-color);
right: -7px;
transform-origin: center left;
}
.tippy-box[data-placement^='right'] > .tippy-arrow {
left: 0;
}
.tippy-box[data-placement^='right'] > .tippy-arrow:before {
left: -7px;
border-width: 8px 8px 8px 0;
border-right-color: var(--text-color);
transform-origin: center right;
}
.tippy-box[data-inertia][data-state='visible'] {
transition-timing-function: cubic-bezier(0.54, 1.5, 0.38, 1.11);
}
.tippy-arrow {
width: 16px;
height: 16px;
color: #333;
}
.tippy-arrow:before {
content: '';
position: absolute;
border-color: transparent;
border-style: solid;
}
.tippy-content {
position: relative;
padding: 5px 9px;
z-index: 1;
overflow-wrap: break-word;
}
.tippy-box[data-theme~='urlified'] {
max-width: 200px;
white-space: pre-wrap;
color: var(--header-bg);

a {
color: var(--header-bg);
}
}
Loading

0 comments on commit 1830349

Please sign in to comment.