Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beta.ordbok.uib.no
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
The upgrade at is complete, normal operation is resumed.
Show more breadcrumbs
Margunn.Rauset
beta.ordbok.uib.no
Commits
e85086e7
Commit
e85086e7
authored
4 years ago
by
Ole Voldsæter
Browse files
Options
Downloads
Patches
Plain Diff
re meta#300 fant beste løsning for bakgrunnsbilde
parent
98d57148
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/App.vue
+0
-11
0 additions, 11 deletions
src/App.vue
src/components/DictionaryView.vue
+17
-5
17 additions, 5 deletions
src/components/DictionaryView.vue
with
17 additions
and
16 deletions
src/App.vue
+
0
−
11
View file @
e85086e7
...
...
@@ -5,9 +5,6 @@
<h1><a
:class=
"$vuetify.breakpoint.name"
href=
"/"
>
Ordbøkene
</a></h1>
<div
class=
"beta"
>
Beta
</div>
<p
class=
"sub-title"
><router-link
to=
"/"
>
Bokmålsordboka og Nynorskordboka
</router-link></p>
<p
class=
"description"
:class=
"$vuetify.breakpoint.name"
v-if=
"$vuetify.breakpoint.mdAndUp && ! $route.name"
>
Skrivemåte og bøying i tråd med norsk rettskriving
</p>
</header>
<router-view></router-view>
<footer>
...
...
@@ -80,14 +77,6 @@ p.about-link {
float
:
right
;
}
p
.description
{
font-size
:
36px
;
color
:
var
(
--v-primary-base
);
background-color
:
var
(
--v-tertiary-base
);
padding-top
:
40px
;
padding-bottom
:
40px
;
}
header
>
p
{
padding
:
3px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/components/DictionaryView.vue
+
17
−
5
View file @
e85086e7
<
template
>
<main
:class=
"(article || waiting || error || (search_results && search_results.length)) ? '' : 'welcome '"
>
<main>
<p
class=
"description"
:class=
"$vuetify.breakpoint.name"
v-if=
"$vuetify.breakpoint.mdAndUp && ! $route.name"
>
Skrivemåte og bøying i tråd med norsk rettskriving
</p>
<div
class=
"search_container"
>
<div
class=
"lang_select_container"
>
<v-radio-group
row
v-model=
"lang"
>
...
...
@@ -35,7 +38,7 @@
<div
id=
"spinner"
v-if=
"waiting"
>
<v-progress-circular
indeterminate
color=
"secondary"
size=
"120"
></v-progress-circular>
</div>
<SearchResults
:hits=
"search_results"
:lang=
"lang"
@
article-click=
"article_link_click"
v-if=
"! waiting"
/>
<SearchResults
:hits=
"search_results"
:lang=
"lang"
@
article-click=
"article_link_click"
v-if=
"
search_results.length &&
! waiting"
/>
<div
id=
"single_article_container"
v-if=
"article"
>
<Article
:key=
"article_key"
:article=
"article"
@
article-click=
"article_link_click"
/>
</div>
...
...
@@ -270,13 +273,14 @@ export default {
main
{
flex
:
1
0
auto
;
background-color
:
var
(
--v-tertiary-base
);
display
:
flex
;
flex-direction
:
column
;
}
main
.welcome
{
div
.welcome
{
flex-grow
:
10
;
background-image
:
url('../assets/books.jpg')
;
background-repeat
:
no-repeat
;
background-attachment
:
fixed
;
}
.search_container
{
...
...
@@ -285,7 +289,7 @@ main.welcome {
padding-bottom
:
10px
;
}
#search_results
,
#spinner
,
#single_article_container
,
div
.welcome
,
div
.search_container
,
.error
{
#search_results
,
#spinner
,
#single_article_container
,
div
.welcome
,
div
.search_container
,
p
.description
,
.error
{
padding-left
:
calc
((
100vw
-
1000px
)
/
2
);
padding-right
:
calc
((
100vw
-
1000px
)
/
2
);
}
...
...
@@ -294,6 +298,14 @@ main.welcome {
padding-top
:
40px
;
}
p
.description
{
font-size
:
36px
;
color
:
var
(
--v-primary-base
);
background-color
:
var
(
--v-tertiary-base
);
padding-top
:
40px
;
padding-bottom
:
10px
;
}
div
.monthly
{
padding
:
20px
;
border-radius
:
10px
;
...
...
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