Skip to content

Resolves 252 : Make a clean CSS #274

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.

Sign up for GitHub

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

Open
yannis-mlgrn wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Resolves 252 : Make a clean CSS #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions front/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,20 @@ export default defineComponent({
probably not final style, just a kind of draft
*/
* {
/* background colors */
--bg0 : rgba(0, 0, 0, 0.2);
--bg1: #1e1d24;
--bg2: #4c4953;
--bg3: #393842;
--bg4: #2a2931;
--accent: rgb(14, 247, 149);
/* text fonts */
--font-text: white ;
--light-text:rgb(189, 189, 189);
--dark-text: rgb(158, 158, 158);
/* size */
--font-size: 25px;
--small-font-size : 0.8em;
--border-radius: 6px;
}

Expand Down
28 changes: 14 additions & 14 deletions front/src/components/ActivityBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@ export default defineComponent({
padding: 10px 15px;
display: flex;
justify-content: space-evenly;
color: white;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
color: var(--font-text);
box-shadow: 0 0 10px var(--bg0);
}

.room_id {
display: flex;
}

.room_id > span {
color:white;
color:var(--font-text);
}

.share_popup_background {
display: flex;
justify-content: center;
align-items: center;
background-color: rgba(0, 0, 0, 0.2);
background-color: var(--bg0);
position: fixed;
top: 0;
left: 0;
Expand All @@ -114,7 +114,7 @@ export default defineComponent({
}

.share_label {
color: rgb(189, 189, 189);
color: var(--light-text);
font-size: 0.9em;
margin-bottom: 0;
}
Expand All @@ -126,13 +126,13 @@ export default defineComponent({
border-radius: 4px;
padding: 5px;
font-size: 0.9em;
color: rgb(173, 173, 173);
color: var(--dark-text);
background-color: var(--bg2);
transition: 0.1s;
}

.share_input:focus {
color: white;
color: var(--text-font);
}

.share_submit_wrapper {
Expand All @@ -145,7 +145,7 @@ export default defineComponent({
transition: 0.1s;
border-radius: 4px;
background-color: var(--accent);
color: white;
color: var(--font-text);
padding: 4px 8px;
cursor: pointer;
font-size: 0.8em;
Expand All @@ -162,7 +162,7 @@ export default defineComponent({
display: flex;
background-color: var(--bg3);
margin: 0;
color: white;
color: var(--font-text);
padding: 10px;
align-items: center;
padding-left: 20px;
Expand All @@ -172,20 +172,20 @@ export default defineComponent({
.activity_bar_writing {
padding-left: 10px;
font-size: smaller;
color: rgb(168, 168, 168);
color: var(--dark-text);
}

.activity_bar_room::before {
content: "# ";
color: rgb(172, 172, 172);
color: var(--font-text);
}

.activity_bar_writing::before {
content: "|";
}
.room_id_input{
text-align: left;
color : white ;
color : var(--font-text) ;
font-size: 25px ;
border-top-style: hidden;
border-right-style: hidden;
Expand All @@ -201,7 +201,7 @@ export default defineComponent({
width: 100px;
font-size: 16px;
font-weight: 600;
color: #fff;
color: var(--font-text);
cursor: pointer;
height: 30px;
margin: auto;
Expand Down Expand Up @@ -229,7 +229,7 @@ export default defineComponent({
}

.copy_button.gradient {
background-image: linear-gradient(to right, #25aae1, #40e495, #30dd8a, #2bb673);
background-image: linear-gradient(to right, #25aae1, #40e495, #30dd8a, var(--accent));
box-shadow: 0 4px 15px 0 rgba(49, 196, 190, 0.75);
}
.copy_wrapper {
Expand Down
14 changes: 7 additions & 7 deletions front/src/components/Login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default defineComponent({

<style scoped>
.login_wrapper {
background-color: rgba(0, 0, 0, 0.2);
background-color: var(--bg0);
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -44,8 +44,8 @@ export default defineComponent({
padding: 10px 15px;
display: flex;
justify-content: space-evenly;
color: white;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
color: var(--font-text);
box-shadow: 0 0 10px var(--bg0);
}

.login_popup > * {
Expand All @@ -62,7 +62,7 @@ export default defineComponent({
}

.login_label {
color: rgb(189, 189, 189);
color: var(light-text);
font-size: 0.9em;
margin-bottom: 0;
}
Expand All @@ -74,13 +74,13 @@ export default defineComponent({
border-radius: 4px;
padding: 5px;
font-size: 0.9em;
color: rgb(173, 173, 173);
color: var(--dark-text);
background-color: var(--bg2);
transition: 0.1s;
}

.login_input:focus {
color: white;
color: var(--font-text);
}

.login_submit_wrapper {
Expand All @@ -93,7 +93,7 @@ export default defineComponent({
transition: 0.1s;
border-radius: 4px;
background-color: var(--accent);
color: white;
color: var(--font-text);
padding: 4px 8px;
cursor: pointer;
font-size: 0.8em;
Expand Down
8 changes: 4 additions & 4 deletions front/src/components/MessageEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default defineComponent({
border-radius: var(--border-radius);
font-size: calc(var(--font-size) - 5px);
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
color: rgb(158, 158, 158);
color: var(--dark-text);
transition: all 0.2s;
height: calc(var(--font-size) * 2);
resize: none;
Expand All @@ -65,13 +65,13 @@ export default defineComponent({
}

.message_editor_input:focus {
color: white;
color: var(--font-text);
}

.message_editor_button {
background-color: var(--accent);
border: none;
font-size: 20px;
font-size: var(--font-size);
display: flex;

--size: calc(var(--font-size) * 2);
Expand All @@ -92,7 +92,7 @@ export default defineComponent({
}

.message_editor_send_icon {
background-color: white;
background-color: var(--font-text);
clip-path: polygon(20% 47%, 12% 20%, 90% 50%, 12% 80%, 20% 53%, 50% 50%);
width: 100%;
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions front/src/components/MessageList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ export default defineComponent({
.messages_timestamp {
color: var(--bg2);
filter: brightness(1.5);
font-size: 0.6em;
font-size: var(--small-font-size);
}

.messages_content {
margin-top: 5px;
color: #ddd;
color: var(--font-text);
font-size: smaller;
}
</style>
24 changes: 12 additions & 12 deletions front/src/components/RoomEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default defineComponent({

<style scoped>
.room_editor_wrapper {
background-color: rgba(0, 0, 0, 0.2);
background-color: var(--bg0);
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -72,8 +72,8 @@ export default defineComponent({
display: flex;
flex-direction: column;
justify-content: space-evenly;
color: white;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
color: var(--font-text);
box-shadow: 0 0 10px var(--bg0);
}

.room_editor_content_wrapper > *,
Expand All @@ -97,7 +97,7 @@ export default defineComponent({
}

.room_editor_selected_tab {
border-bottom: solid white 2px;
border-bottom: solid var(--font-text) 2px;
}

.room_editor_content_wrapper {
Expand All @@ -114,8 +114,8 @@ export default defineComponent({
}

.room_editor_label {
color: rgb(189, 189, 189);
font-size: 0.8em;
color: var(--light-text);
font-size: var(--small-font-size);
margin-bottom: 0;
}

Expand All @@ -125,16 +125,16 @@ export default defineComponent({
border: none;
border-radius: 4px;
padding: 5px;
font-size: 0.9em;
color: rgb(173, 173, 173);
font-size: var(--small-font-size);
color: var(--light-text);
background-color: var(--bg2);
transition: 0.1s;
width: 30vw;
min-width: 400px;
}

.room_editor_input:focus {
color: white;
color: var(--font-text);
}

textarea.room_editor_input {
Expand All @@ -152,10 +152,10 @@ textarea.room_editor_input {
border: none;
transition: 0.1s;
border-radius: 4px;
color: white;
color: var(--font-text);
padding: 8px 12px;
cursor: pointer;
font-size: 0.9em;
font-size: var(--small-font-size);
}

.room_editor_button:hover {
Expand All @@ -167,6 +167,6 @@ textarea.room_editor_input {
}

.room_editor_cancel {
background-color: rgb(145, 145, 145);
background-color: var(--dark-text);
}
</style>
8 changes: 4 additions & 4 deletions front/src/components/RoomList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default defineComponent({
margin: 3px;
padding: 5px;
margin-left: 0;
color: rgb(146, 146, 146);
color: var(--dark-text);
transition: all 0.1s;
cursor: pointer;
border-radius: 4px;
Expand All @@ -62,15 +62,15 @@ export default defineComponent({
cursor: pointer;
width: 0;

--room_list_quit: rgb(145, 145, 145);
--room_list_quit: var(--dark-text);
}

.room_list_quit:hover {
--room_list_quit: white;
--room_list_quit: var(--font-text);
}

.room_list_room:hover {
color: white;
color: var(--font-text);
}

.room_list_item:hover > .room_list_quit {
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default defineComponent({
}

.user_list_item {
color: white;
color: var(--font-text);
margin-top: 5px;
white-space: nowrap;
text-overflow: ellipsis;
Expand Down