Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: drop bootstrap #1124

Merged
merged 3 commits into from
Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"autosize": "^5.0.0",
"axios": "^0.21.1",
"bignumber.js": "^9.0.1",
"bootstrap": "^4.5.3",
"chart.js": "^2.9.4",
"chartjs-plugin-annotation": "^0.5.7",
"core-js": "^3.15.1",
Expand All @@ -34,6 +33,7 @@
"is-fqdn": "^2.0.1",
"jitsi-iframe-api": "^1.0.0",
"lodash-es": "^4.17.21",
"normalize.css": "^8.0.1",
"sophia-bonding-curve": "github:aeternity/BondingCurve#1.0.0-alpha.2",
"soundcloud-widget": "^0.2.1",
"tipping-contract": "github:aeternity/tipping-contract#v5.0.0-alpha1",
Expand Down
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:class="$route.meta.layoutClass"
>
<MobileNavigation v-if="!$route.meta.fullScreen" />
<div class="not-bootstrap-row">
<div class="row">
<div
v-if="!$route.meta.fullScreen"
class="sidebar-sticky"
Expand Down Expand Up @@ -140,7 +140,7 @@ export default {
display: flex;
flex-direction: column;

.not-bootstrap-row {
.row {
flex-grow: 1;
display: flex;
flex-wrap: nowrap;
Expand Down
13 changes: 6 additions & 7 deletions src/components/ActivityRibbon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
:class="{ active: value === tab.activity }"
@click="updateValue(tab.activity)"
>
<Component :is="tab.icon" />

<span class="text">
{{ tab.text }}
</span>
<Component :is="tab.icon" /> <span>{{ tab.text }}</span>
</FilterButton>
<slot name="left" />
<div class="separator" />
Expand Down Expand Up @@ -45,8 +41,11 @@ export default {
display: flex;
align-items: center;

.text {
padding-left: 0.15rem;
.filter-button {
svg,
span {
vertical-align: middle;
}
}

.separator {
Expand Down
2 changes: 1 addition & 1 deletion src/components/AeInputAmount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default {
height: 2.1rem;
}

.not-bootstrap-modal-content {
.modal-content {
margin-top: 0.25rem;
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/components/Dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export default {
color: $standard_font_color;
box-shadow: inset 0 0 0.1rem $article_content_color;
border-radius: unset;
white-space: nowrap;

&:first-child {
border-radius: 0.15rem 0.15rem 0 0;
Expand All @@ -121,7 +122,7 @@ export default {
padding: 0;
}

&::v-deep .not-bootstrap-modal-content {
&::v-deep .modal-content {
max-height: 10rem;
overflow-y: auto;
scrollbar-width: none;
Expand All @@ -132,7 +133,7 @@ export default {
}
}

&.right::v-deep .not-bootstrap-modal-content {
&.right::v-deep .modal-content {
right: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/FilterButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
border-radius: 50px;
font-size: 16px;
font-weight: 700;
line-height: 18px;
line-height: 22px;
padding: 8px 16px;
color: $tip_note_color;
height: 40px;
Expand Down
2 changes: 2 additions & 0 deletions src/components/Input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
padding: 8.5px 16px;

&:focus {
transition: 0.3s;
transition-property: background-color, border-color;
border-color: $secondary_color;
background-color: $actions_ribbon_background_color;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/Loader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ export default {
.svg {
width: 56px;
height: 56px;
display: block;
margin: 0 auto;
}

&.lg .svg {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Modal.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<template>
<div class="not-bootstrap-modal">
<div class="modal">
<div
class="overlay"
@click.stop="$emit('close')"
/>
<div class="not-bootstrap-modal-content">
<div class="modal-content">
<slot />
</div>
</div>
</template>

<style lang="scss" scoped>
.not-bootstrap-modal {
.modal {
.overlay {
bottom: 0;
left: 0;
Expand All @@ -21,7 +21,7 @@
z-index: 90;
}

.not-bootstrap-modal-content {
.modal-content {
position: absolute;
z-index: 90;
}
Expand Down
7 changes: 7 additions & 0 deletions src/components/TabBarButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,12 @@ export default {
border-color: $custom_links_color;
color: $custom_links_color;
}

::v-deep {
svg,
span {
vertical-align: middle;
}
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/ThreeDotsMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default {
color: #fff;
}

::v-deep .not-bootstrap-modal-content {
::v-deep .modal-content {
font-size: 0.75rem;
border-radius: 0.25rem;
border: 0.05rem solid $article_content_color;
Expand Down
8 changes: 4 additions & 4 deletions src/components/TipInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
maxlength="280"
:placeholder="$t('addMessage')"
/>
<div class="not-bootstrap-row">
<div class="row">
<AeInputAmount
v-model="inputValue"
:select-token-f="token => (inputToken = token)"
Expand Down Expand Up @@ -275,7 +275,7 @@ export default {
}
}

.not-bootstrap-modal > ::v-deep .not-bootstrap-modal-content {
.modal > ::v-deep .modal-content {
background-color: $article_content_color;
border-radius: 0.25rem;
margin-top: 0.25rem;
Expand All @@ -288,7 +288,7 @@ export default {
}
}

.not-bootstrap-modal .not-bootstrap-modal-content {
.modal .modal-content {
.error {
text-align: center;
font-size: 12px;
Expand All @@ -301,7 +301,7 @@ export default {
margin-bottom: 0.5rem;
}

.not-bootstrap-row {
.row {
display: flex;

.ae-button {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TopicList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div
v-for="[topic, data] in topics"
:key="topic"
class="not-bootstrap-row"
class="row"
>
<Topic
class="text-ellipsis"
Expand All @@ -30,7 +30,7 @@ export default {

<style lang="scss" scoped>
.topic-list {
.not-bootstrap-row {
.row {
display: flex;
align-items: center;
margin: 0.5rem 0;
Expand Down
5 changes: 5 additions & 0 deletions src/components/UserInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,10 @@ input[type="file"] {
color: $lighter_font_color;
font-size: 0.7rem;
vertical-align: middle;

img {
vertical-align: middle;
}
}

.profile-section {
Expand Down Expand Up @@ -775,6 +779,7 @@ input[type="file"] {
height: 0.9rem;
margin-bottom: 0.2rem;
margin-right: 0.2rem;
vertical-align: middle;
}
}

Expand Down
45 changes: 7 additions & 38 deletions src/components/VoteCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,12 @@
</OutlinedButton>
</div>

<label
v-if="vote.showVoteOption"
class="stake-label"
>
{{ $t('components.VoteCard.Amount') }}
</label>
<label
v-if="vote.accountHasVoted"
class="stake-label"
>
{{ $t('components.VoteCard.Staked') }}
</label>
<label
v-if="!vote.showVoteOption && !vote.accountHasVoted"
class="stake-label"
>
{{ $t('components.VoteCard.NotParticipate') }}
<label class="stake-label">
{{
vote.showVoteOption && $t('components.VoteCard.Amount')
|| vote.accountHasVoted && $t('components.VoteCard.Staked')
|| $t('components.VoteCard.NotParticipate')
}}
</label>

<div class="input-bar">
Expand Down Expand Up @@ -354,6 +343,7 @@ export default {
svg {
height: 16px;
width: auto;
vertical-align: middle;
}

time {
Expand Down Expand Up @@ -385,10 +375,6 @@ export default {
&:active,
&:hover {
background-color: $card_hover_color;

::v-deep .form-control {
background-color: $super_dark;
}
}

.vote-progress-bar {
Expand Down Expand Up @@ -460,23 +446,6 @@ export default {
}
}

.input-group {
width: 50%;
height: 100%;

.input-group-append > span.append__ae {
font-size: 0.62rem;
}

.form-control {
height: 100%;
}

@include mobile {
width: 100%;
}
}

::v-deep .ae-button {
font-weight: bold;
font-size: 0.8rem;
Expand Down
9 changes: 2 additions & 7 deletions src/components/WordBuySellButtons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,12 @@ export default {
}
}

::v-deep.not-bootstrap-modal {
::v-deep.modal {
.overlay {
z-index: 1;
}

.not-bootstrap-modal-content {
.modal-content {
background-color: $actions_ribbon_background_color;
border: 1px solid $background_color;
box-sizing: border-box;
Expand Down Expand Up @@ -412,11 +412,6 @@ export default {
}
}

.input-group {
width: 228px;
margin-bottom: 24px;
}

.return-amount {
display: flex;
flex-direction: row;
Expand Down
4 changes: 4 additions & 0 deletions src/components/WordInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,10 @@ export default {
}
}
}

figure {
margin: 0 0 1rem;
}
}

.legend {
Expand Down
Loading