KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#97 [bug] fix duplicated inlined assets

This commit is contained in:
Avris 2020-11-11 22:53:55 +01:00
parent f239b6377e
commit 26078936b9
10 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/style.scss
View File

@ -1,20 +1,7 @@
@import "fonts"; @import "fonts";
$font-family-sans-serif: Nunito, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$headings-font-family: Quicksand, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$primary: #C71585; @import "variables";
$alert-border-level: -3;
$container-max-widths: (
sm: 540px,
md: 768px,
lg: 769px,
xl: 770px
) !default;
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/root"; @import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot"; @import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type"; @import "~bootstrap/scss/type";
@ -61,8 +48,6 @@ html {
} }
body { body {
//padding-top: 2rem;
//padding-bottom: 2rem;
margin: 2rem auto; margin: 2rem auto;
max-width: min(90vw, 768px); max-width: min(90vw, 768px);
} }

18
assets/variables.scss Normal file
View File

@ -0,0 +1,18 @@
$font-family-sans-serif: Nunito, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$headings-font-family: Quicksand, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$primary: #C71585;
$alert-border-level: -3;
$container-max-widths: (
sm: 540px,
md: 768px,
lg: 769px,
xl: 770px
) !default;
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
@import '~@fortawesome/fontawesome-pro/scss/variables';

2
components/Account.vue
View File

@ -201,7 +201,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
.profile-current { .profile-current {
border-left: 3px solid $primary; border-left: 3px solid $primary;

2
components/Confirm.vue
View File

@ -86,7 +86,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
.modal { .modal {
background-color: rgba($black, 0.5); background-color: rgba($black, 0.5);

2
components/Dictionary.vue
View File

@ -274,7 +274,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import "assets/style"; @import "assets/variables";
.list-singular { .list-singular {
padding-left: 0; padding-left: 0;

2
components/Header.vue
View File

@ -160,7 +160,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
@include media-breakpoint-down('sm', $grid-breakpoints) { @include media-breakpoint-down('sm', $grid-breakpoints) {
.nav-custom { .nav-custom {

2
components/ScrollButton.vue
View File

@ -36,7 +36,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
.scroll-btn { .scroll-btn {
position: fixed; position: fixed;

2
components/Separator.vue
View File

@ -15,7 +15,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
// https://front-back.com/pure-css-3-fancy-separator/ // https://front-back.com/pure-css-3-fancy-separator/

2
components/SquareButton.vue
View File

@ -14,7 +14,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "assets/style"; @import "assets/variables";
$size: 2.2rem; $size: 2.2rem;
.btn-square { .btn-square {

2
components/Table.vue
View File

@ -104,7 +104,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import "assets/style"; @import "assets/variables";
.marked { .marked {
border-left: 3px solid $primary; border-left: 3px solid $primary;