Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Fullstack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Madeleine Stenberg Jonassen
Fullstack
Commits
889a0cd3
Commit
889a0cd3
authored
1 year ago
by
Maddy
Browse files
Options
Downloads
Patches
Plain Diff
Added :root in main.css to make colors more uniform
parent
1a0f2b77
No related branches found
No related tags found
1 merge request
!45
Root colors
Pipeline
#269930
passed
1 year ago
Stage: build
Stage: test
Stage: package
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
FullstackProsjekt/src/frontend/src/assets/main.css
+54
-24
54 additions, 24 deletions
FullstackProsjekt/src/frontend/src/assets/main.css
FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue
+1
-5
1 addition, 5 deletions
...kt/src/frontend/src/components/shared/sidebar/Sidebar.vue
with
55 additions
and
29 deletions
FullstackProsjekt/src/frontend/src/assets/main.css
+
54
−
24
View file @
889a0cd3
:root
{
--all-background-color
:
#F2F2F2
;
--sidebar-bd-color
:
#242F40
;
--sidebar-item-hover
:
#CCA43B
;
--sidebar-item-active
:
#CCA43B
;
--field-placeholder
:
#b0b0b0
;
--card-background
:
#d7d7d7
;
--text-light-color
:
#d7d7d7
;
--text-dark-color
:
#242F40
;
--danger-color
:
#d2442b
;
--danger-hover
:
#d9563e
;
--safe-color
:
#242F40
;
--safe-hover
:
#425575
;
--safe-active
:
#425575
;
--option-color
:
#CCA43B
;
--option-hover
:
#b2891b
;
--option-active
:
#D9C590
;
}
body
{
font-family
:
monospace
;
margin
:
0
0
0
28px
;
background-color
:
#F2F2F2
;
background-color
:
var
(
--all-background-color
)
;
}
input
{
padding
:
5px
;
border-radius
:
5px
;
border
:
none
;
background-color
:
#dedede
;
margin-bottom
:
10px
;
font-family
:
monospace
;
}
input
::placeholder
{
color
:
#b0b0b0
;
color
:
var
(
--field-placeholder
)
;
}
label
{
...
...
@@ -38,7 +63,7 @@ select{
}
.course-col
{
flex-basis
:
31%
;
background
:
#d7d7d7
;
background
:
var
(
--card-background
)
;
border-radius
:
10px
;
margin-bottom
:
5%
;
padding
:
20px
;
...
...
@@ -49,7 +74,7 @@ select{
box-shadow
:
0
0
20px
0px
rgba
(
0
,
0
,
0
,
0.3
);
}
.error-message
{
color
:
#e53a1c
;
color
:
var
(
--danger-color
)
;
padding
:
10px
;
font-size
:
16px
;
margin-bottom
:
20px
;
...
...
@@ -57,44 +82,50 @@ select{
.play-btn
{
padding
:
10px
;
text-decoration
:
none
;
background-color
:
#242F40
;
background-color
:
var
(
--safe-color
)
;
border-color
:
transparent
;
color
:
#FFFFFF
;
color
:
var
(
--text-light-color
)
;
border-radius
:
10px
;
}
.play-btn
:hover
{
background-color
:
#425575
;
background-color
:
var
(
--safe-hover
)
;
transition
:
0.4s
;
}
.play-btn
:active
{
background-color
:
#425575
;
background-color
:
var
(
--safe-active
)
;
transition
:
0.2s
;
}
.edit-btn
{
padding
:
10px
;
text-decoration
:
none
;
background-color
:
#CCA43B
;
background-color
:
var
(
--option-color
)
;
border-color
:
transparent
;
color
:
#242F40
;
border-radius
:
10px
;
cursor
:
pointer
;
}
.edit-btn
:hover
{
background-color
:
var
(
--option-hover
);
}
.edit-btn
:active
{
background-color
:
var
(
--option-active
);
}
.delete-btn
{
padding
:
10px
;
background-color
:
#cc513b
;
background-color
:
var
(
--danger-color
)
;
border-color
:
transparent
;
color
:
#242F40
;
color
:
var
(
--text-dark-color
)
;
border-radius
:
10px
;
font-family
:
monospace
;
cursor
:
pointer
;
text-decoration
:
none
;
}
.delete-btn
:hover
{
background-color
:
#d9563e
;
background-color
:
var
(
--danger-hover
)
;
}
.add-Btn
{
background-color
:
#242F40
;
background-color
:
var
(
--safe-color
)
;
color
:
white
;
font-size
:
16px
;
padding
:
10px
;
...
...
@@ -105,14 +136,14 @@ select{
}
.add-Btn
:hover
{
cursor
:
pointer
;
background-color
:
#2f3d54
;
background-color
:
var
(
--safe-hover
)
;
}
.add-Btn
:active
{
background-color
:
#425575
;
background-color
:
var
(
--safe-active
)
;
transition
:
0.2s
;
}
.save-Btn
{
background-color
:
#CCA43B
;
background-color
:
var
(
--option-color
)
;
font-size
:
24px
;
padding
:
15px
;
border-radius
:
20px
;
...
...
@@ -121,7 +152,7 @@ select{
cursor
:
pointer
;
}
.close-btn
{
background-color
:
#d2442b
;
background-color
:
var
(
--danger-color
)
;
padding
:
10px
;
border-radius
:
5px
;
border-color
:
transparent
;
...
...
@@ -132,10 +163,10 @@ select{
color
:
white
;
}
.close-btn
:hover
{
background-color
:
#e15238
;
background-color
:
var
(
--danger-hover
)
;
}
.submit-btn
{
background-color
:
#CCA43B
;
background-color
:
var
(
--option-color
)
;
font-size
:
20px
;
padding
:
10px
;
border-radius
:
5px
;
...
...
@@ -147,12 +178,11 @@ select{
height
:
50px
;
}
.submit-btn
:hover
{
background-color
:
#a67d0e
;
color
:
white
;
background-color
:
var
(
--option-hover
)
;
color
:
var
(
--text-light-color
)
;
}
.submit-btn
:active
{
background-color
:
#2D333B
;
color
:
white
;
background-color
:
var
(
--option-active
);
}
@media
(
max-width
:
700px
){
...
...
This diff is collapsed.
Click to expand it.
FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue
+
1
−
5
View file @
889a0cd3
...
...
@@ -45,11 +45,7 @@ export default {
<
style
>
:root
{
--sidebar-bd-color
:
#242F40
;
--sidebar-item-hover
:
#CCA43B
;
--sidebar-item-active
:
#CCA43B
;
}
</
style
>
<
style
scoped
>
.sidebar
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment