Skip to content
Snippets Groups Projects
Commit e1e2d762 authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Merge branch 'dev' into 'prod'

Dev

See merge request spraksamlingane/beta.ordbok.uib.no!81
parents c9540b39 5d0aae1f
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,6 @@ header > p { ...@@ -99,7 +99,6 @@ header > p {
.beta { .beta {
position: absolute; position: absolute;
white-space: nowrap;
top: 2px; top: 2px;
font-size: 18px; font-size: 18px;
color: #BBBBBB; color: #BBBBBB;
...@@ -121,8 +120,8 @@ header { ...@@ -121,8 +120,8 @@ header {
footer { footer {
position: relative; position: relative;
padding-left: calc((100vw - 1000px) / 2); padding-left: calc((100vw - 1200px) / 2);
padding-right: calc((100vw - 1000px) / 2); padding-right: calc((100vw - 1200px) / 2);
} }
footer a { footer a {
......
...@@ -619,8 +619,8 @@ main { ...@@ -619,8 +619,8 @@ main {
} }
.about { .about {
padding-left: calc((100vw - 1000px) / 2); padding-left: calc((100vw - 1200px) / 2);
padding-right: calc((100vw - 1000px) / 2); padding-right: calc((100vw - 1200px) / 2);
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
:append-icon="null" :append-icon="null"
return-object return-object
rounded rounded
clearable
hide-no-data hide-no-data
auto-select-first auto-select-first
no-filter no-filter
......
...@@ -408,8 +408,8 @@ div.welcome article { ...@@ -408,8 +408,8 @@ div.welcome article {
} }
#search_results, #spinner, #single_article_container, div.welcome, div.search_container, .error { #search_results, #spinner, #single_article_container, div.welcome, div.search_container, .error {
padding-left: calc((100vw - 1000px) / 2); padding-left: calc((100vw - 1200px) / 2);
padding-right: calc((100vw - 1000px) / 2); padding-right: calc((100vw - 1200px) / 2);
} }
.error > p { .error > p {
......
...@@ -239,14 +239,8 @@ article h2.secondary_header { ...@@ -239,14 +239,8 @@ article h2.secondary_header {
} }
.infl-wrapper { .infl-wrapper {
background-color: #ffffff;
border: solid 1px;
color: var(--v-primary-base); color: var(--v-primary-base);
border-color: var(--v-border-base);
border-radius: 10px;
padding: 10px;
width: min-content; width: min-content;
margin: 5px;
font-size: 14px; font-size: 14px;
} }
......
...@@ -59,7 +59,7 @@ export default new Vuetify({ ...@@ -59,7 +59,7 @@ export default new Vuetify({
anchor: '#880E4F', anchor: '#880E4F',
error: '#FDF4F5', error: '#FDF4F5',
border: '#9E9E9E', border: '#9E9E9E',
text: 'black' text: '#000000'
} }
} }
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment