소스 검색

Removed global and colors scss files

Owen Diffey 4 년 전
부모
커밋
1c1babf66c
55개의 변경된 파일4개의 추가작업 그리고 143개의 파일을 삭제
  1. 4 6
      frontend/src/App.vue
  2. 0 2
      frontend/src/components/Modal.vue
  3. 0 2
      frontend/src/components/Sidebar.vue
  4. 0 2
      frontend/src/components/layout/MainFooter.vue
  5. 0 2
      frontend/src/components/layout/MainHeader.vue
  6. 0 2
      frontend/src/components/modals/CreatePlaylist.vue
  7. 0 2
      frontend/src/components/modals/EditPlaylist/components/PlaylistSongItem.vue
  8. 0 2
      frontend/src/components/modals/EditPlaylist/index.vue
  9. 0 2
      frontend/src/components/modals/EditSong.vue
  10. 0 2
      frontend/src/components/modals/EditStation.vue
  11. 0 2
      frontend/src/components/modals/Login.vue
  12. 0 4
      frontend/src/components/modals/Register.vue
  13. 0 2
      frontend/src/components/modals/WhatIsNew.vue
  14. 0 2
      frontend/src/components/ui/FloatingBox.vue
  15. 0 2
      frontend/src/components/ui/PlaylistItem.vue
  16. 0 2
      frontend/src/components/ui/ProfilePicture.vue
  17. 0 2
      frontend/src/components/ui/SearchQueryItem.vue
  18. 0 2
      frontend/src/pages/404.vue
  19. 0 2
      frontend/src/pages/About.vue
  20. 0 2
      frontend/src/pages/Admin/EditNews.vue
  21. 0 2
      frontend/src/pages/Admin/EditUser.vue
  22. 0 2
      frontend/src/pages/Admin/ViewReport.vue
  23. 0 2
      frontend/src/pages/Admin/index.vue
  24. 0 2
      frontend/src/pages/Admin/tabs/NewStatistics.vue
  25. 0 2
      frontend/src/pages/Admin/tabs/News.vue
  26. 0 2
      frontend/src/pages/Admin/tabs/Playlists.vue
  27. 0 2
      frontend/src/pages/Admin/tabs/Punishments.vue
  28. 0 2
      frontend/src/pages/Admin/tabs/QueueSongs.vue
  29. 0 2
      frontend/src/pages/Admin/tabs/Reports.vue
  30. 0 2
      frontend/src/pages/Admin/tabs/Songs.vue
  31. 0 2
      frontend/src/pages/Admin/tabs/Stations.vue
  32. 0 2
      frontend/src/pages/Admin/tabs/Statistics.vue
  33. 0 2
      frontend/src/pages/Admin/tabs/Users.vue
  34. 0 2
      frontend/src/pages/Banned.vue
  35. 0 2
      frontend/src/pages/Home/index.vue
  36. 0 2
      frontend/src/pages/News.vue
  37. 0 2
      frontend/src/pages/Profile.vue
  38. 0 2
      frontend/src/pages/ResetPassword.vue
  39. 0 2
      frontend/src/pages/Settings/index.vue
  40. 0 2
      frontend/src/pages/Settings/mixins/SaveButton.vue
  41. 0 2
      frontend/src/pages/Settings/tabs/Preferences.vue
  42. 0 2
      frontend/src/pages/Settings/tabs/Profile.vue
  43. 0 2
      frontend/src/pages/Station/AddSongToQueue.vue
  44. 0 2
      frontend/src/pages/Station/Report.vue
  45. 0 2
      frontend/src/pages/Station/components/AddToPlaylistDropdown.vue
  46. 0 2
      frontend/src/pages/Station/components/CurrentlyPlaying.vue
  47. 0 2
      frontend/src/pages/Station/components/Sidebar/MyPlaylists.vue
  48. 0 2
      frontend/src/pages/Station/components/Sidebar/Queue/QueueItem.vue
  49. 0 2
      frontend/src/pages/Station/components/Sidebar/Queue/index.vue
  50. 0 2
      frontend/src/pages/Station/components/Sidebar/Users.vue
  51. 0 2
      frontend/src/pages/Station/components/Sidebar/index.vue
  52. 0 2
      frontend/src/pages/Station/index.vue
  53. 0 2
      frontend/src/pages/Team.vue
  54. 0 30
      frontend/src/styles/colors.scss
  55. 0 1
      frontend/src/styles/global.scss

+ 4 - 6
frontend/src/App.vue

@@ -180,8 +180,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "./styles/global.scss";
-
 :root {
 	--primary-color: var(--blue);
 	--blue: rgb(2, 166, 242);
@@ -200,15 +198,15 @@ export default {
 	--white: rgb(255, 255, 255);
 	--black: rgb(0, 0, 0);
 	--light-grey: rgb(245, 245, 245);
-	--light-grey-2: rgb(221, 221, 221); //was night-mode-text
-	--light-grey-3: rgb(195, 193, 195); //was light-grey-2
+	--light-grey-2: rgb(221, 221, 221);
+	--light-grey-3: rgb(195, 193, 195);
 	--grey: rgb(107, 107, 107);
 	--grey-2: rgb(113, 113, 113);
 	--grey-3: rgb(126, 126, 126);
 	--dark-grey: rgb(77, 77, 77);
 	--dark-grey-2: rgb(51, 51, 51);
-	--dark-grey-3: rgb(34, 34, 34); //was night-mode-bg-secondary
-	--dark-grey-4: rgb(26, 26, 26); // was dark-grey-3
+	--dark-grey-3: rgb(34, 34, 34);
+	--dark-grey-4: rgb(26, 26, 26);
 	--youtube: rgb(189, 46, 46);
 }
 

+ 0 - 2
frontend/src/components/Modal.vue

@@ -43,8 +43,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .night-mode {
 	.modal-card-head,
 	.modal-card-foot {

+ 0 - 2
frontend/src/components/Sidebar.vue

@@ -16,8 +16,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .inner-wrapper {
 	overflow: auto;
 	height: 100%;

+ 0 - 2
frontend/src/components/layout/MainFooter.vue

@@ -43,8 +43,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "./../../styles/global.scss";
-
 .night-mode {
 	footer.footer,
 	footer.footer .container,

+ 0 - 2
frontend/src/components/layout/MainHeader.vue

@@ -110,8 +110,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.nav {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/components/modals/CreatePlaylist.vue

@@ -96,8 +96,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .menu {
 	padding: 0 20px;
 }

+ 0 - 2
frontend/src/components/modals/EditPlaylist/components/PlaylistSongItem.vue

@@ -46,8 +46,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../styles/global.scss";
-
 .night-mode {
 	.playlist-song-item {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/components/modals/EditPlaylist/index.vue

@@ -682,8 +682,6 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.section {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/components/modals/EditSong.vue

@@ -1425,8 +1425,6 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.edit-section,
 	.api-section,

+ 0 - 2
frontend/src/components/modals/EditStation.vue

@@ -903,8 +903,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.modal-card,
 	.modal-card-head,

+ 0 - 2
frontend/src/components/modals/Login.vue

@@ -121,8 +121,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.modal-card,
 	.modal-card-head,

+ 0 - 4
frontend/src/components/modals/Register.vue

@@ -259,8 +259,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.modal-card,
 	.modal-card-head,
@@ -298,8 +296,6 @@ a {
 </style>
 
 <style lang="scss">
-@import "../../styles/global.scss";
-
 .grecaptcha-badge {
 	z-index: 2000;
 }

+ 0 - 2
frontend/src/components/modals/WhatIsNew.vue

@@ -127,8 +127,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.modal-card,
 	.modal-card-head,

+ 0 - 2
frontend/src/components/ui/FloatingBox.vue

@@ -130,8 +130,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .box {
 	background-color: var(--white);
 	position: fixed;

+ 0 - 2
frontend/src/components/ui/PlaylistItem.vue

@@ -47,8 +47,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.playlist-item {
 		background-color: var(--dark-grey-2) !important;

+ 0 - 2
frontend/src/components/ui/ProfilePicture.vue

@@ -46,8 +46,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .profile-picture {
 	width: 100px;
 	height: 100px;

+ 0 - 2
frontend/src/components/ui/SearchQueryItem.vue

@@ -75,8 +75,6 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.search-query-item {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/pages/404.vue

@@ -22,8 +22,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .wrapper {
 	min-height: calc(100vh - 100px);
 	display: flex;

+ 0 - 2
frontend/src/pages/About.vue

@@ -80,8 +80,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .night-mode {
 	.card {
 		background-color: var(--dark-grey-3);

+ 0 - 2
frontend/src/pages/Admin/EditNews.vue

@@ -249,8 +249,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 input[type="range"] {
 	-webkit-appearance: none;
 	width: 100%;

+ 0 - 2
frontend/src/pages/Admin/EditUser.vue

@@ -232,8 +232,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .save-changes {
 	color: var(--white);
 }

+ 0 - 2
frontend/src/pages/Admin/ViewReport.vue

@@ -158,8 +158,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.message,
 	.table {

+ 0 - 2
frontend/src/pages/Admin/index.vue

@@ -190,8 +190,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	.tabs {
 		background-color: var(--dark-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/NewStatistics.vue

@@ -242,8 +242,6 @@ export default {
 
 //
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/News.vue

@@ -354,8 +354,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Playlists.vue

@@ -130,8 +130,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Punishments.vue

@@ -160,8 +160,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/QueueSongs.vue

@@ -325,8 +325,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Reports.vue

@@ -154,8 +154,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Songs.vue

@@ -426,8 +426,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Stations.vue

@@ -356,8 +356,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Statistics.vue

@@ -326,8 +326,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Admin/tabs/Users.vue

@@ -120,8 +120,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.table {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Banned.vue

@@ -27,8 +27,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .container {
 	display: flex;
 	justify-content: center;

+ 0 - 2
frontend/src/pages/Home/index.vue

@@ -686,8 +686,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "../../styles/global.scss";
-
 * {
 	box-sizing: border-box;
 }

+ 0 - 2
frontend/src/pages/News.vue

@@ -131,8 +131,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .night-mode {
 	p {
 		color: var(--light-grey-2);

+ 0 - 2
frontend/src/pages/Profile.vue

@@ -583,8 +583,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 @media only screen and (max-width: 750px) {
 	.info-section {
 		margin-top: 0 !important;

+ 0 - 2
frontend/src/pages/ResetPassword.vue

@@ -419,8 +419,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .night-mode {
 	.content-box,
 	.step:not(.selected) {

+ 0 - 2
frontend/src/pages/Settings/index.vue

@@ -135,8 +135,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 /deep/ .character-counter {
 	display: flex;
 	justify-content: flex-end;

+ 0 - 2
frontend/src/pages/Settings/mixins/SaveButton.vue

@@ -51,8 +51,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .save-changes {
 	margin-top: 20px;
 

+ 0 - 2
frontend/src/pages/Settings/tabs/Preferences.vue

@@ -120,8 +120,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .checkbox-control {
 	input[type="checkbox"] {
 		opacity: 0;

+ 0 - 2
frontend/src/pages/Settings/tabs/Profile.vue

@@ -287,8 +287,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .content .control {
 	margin-bottom: 15px;
 }

+ 0 - 2
frontend/src/pages/Station/AddSongToQueue.vue

@@ -335,8 +335,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 .night-mode {
 	div {
 		color: var(--dark-grey);

+ 0 - 2
frontend/src/pages/Station/Report.vue

@@ -306,8 +306,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 h6 {
 	margin-bottom: 15px;
 }

+ 0 - 2
frontend/src/pages/Station/components/AddToPlaylistDropdown.vue

@@ -148,8 +148,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 .night-mode {
 	.nav-dropdown-items {
 		background-color: var(--dark-grey-2);

+ 0 - 2
frontend/src/pages/Station/components/CurrentlyPlaying.vue

@@ -110,8 +110,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/global.scss";
-
 #currently-playing {
 	display: flex;
 	flex-direction: row;

+ 0 - 2
frontend/src/pages/Station/components/Sidebar/MyPlaylists.vue

@@ -205,8 +205,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../styles/global.scss";
-
 #my-playlists {
 	background-color: var(--white);
 	margin-bottom: 20px;

+ 0 - 2
frontend/src/pages/Station/components/Sidebar/Queue/QueueItem.vue

@@ -130,8 +130,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../../styles/global.scss";
-
 .night-mode {
 	.queue-item {
 		background-color: var(--dark-grey-2) !important;

+ 0 - 2
frontend/src/pages/Station/components/Sidebar/Queue/index.vue

@@ -125,8 +125,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../../styles/global.scss";
-
 .night-mode {
 	#queue {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/pages/Station/components/Sidebar/Users.vue

@@ -100,8 +100,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../styles/global.scss";
-
 .night-mode {
 	#users {
 		background-color: var(--dark-grey-3) !important;

+ 0 - 2
frontend/src/pages/Station/components/Sidebar/index.vue

@@ -67,8 +67,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../../styles/global.scss";
-
 .night-mode {
 	#tab-selection .button {
 		background: var(--dark-grey);

+ 0 - 2
frontend/src/pages/Station/index.vue

@@ -1595,8 +1595,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/global.scss";
-
 #page-loader-container {
 	height: inherit;
 

+ 0 - 2
frontend/src/pages/Team.vue

@@ -128,8 +128,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
-
 .night-mode {
 	.card {
 		background-color: var(--dark-grey-3);

+ 0 - 30
frontend/src/styles/colors.scss

@@ -1,30 +0,0 @@
-$musare-blue: hsl(199, 98%, 48%);
-$teal: hsl(171, 100%, 41%);
-$purple: hsl(302, 56%, 36%);
-$light-purple: hsl(263, 49%, 70%);
-// $yellow: hsl(46, 93%, 53%);
-$yellow: #f1c40f;
-$light-pink: hsl(351, 57%, 75%);
-$dark-pink: hsl(351, 79%, 60%);
-$light-orange: hsl(22, 100%, 50%);
-$dark-orange: hsl(12, 100%, 49%);
-$lime: hsl(114, 69%, 49%);
-// $green: hsl(114, 76%, 36%);
-$green: #44bd32;
-$blue: hsl(214, 82%, 48%);
-// $red: hsl(0, 86%, 49%);
-$red: #e74c3c;
-$white: hsl(0, 0%, 100%);
-$black: hsl(0, 0%, 0%);
-$light-grey: hsl(0, 0%, 96%);
-$light-grey-2: hsl(300, 2%, 76%);
-$grey: hsl(0, 0%, 42%);
-$dark-grey: hsl(0, 0%, 30%);
-$dark-grey-2: hsl(0, 0%, 20%);
-$dark-grey-3: hsl(0, 0%, 10%);
-
-$primary-color: $musare-blue;
-
-/* DARK MODE */
-$night-mode-text: #ddd;
-$night-mode-bg-secondary: #222;

+ 0 - 1
frontend/src/styles/global.scss

@@ -1 +0,0 @@
-@import 'colors.scss';