Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Veebiraamistik
Veera
veera-html
Commits
6e3ee2a7
Commit
6e3ee2a7
authored
Nov 28, 2019
by
Kaarel Teder
Browse files
Merge branch 'master' into 'Navigation'
# Conflicts: # app/views/partials/head.html
parents
79af4b73
1115b8f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/views/partials/components/textfield.html
View file @
6e3ee2a7
...
...
@@ -12,4 +12,8 @@
<label
for=
"focus"
>
Vormivälja focus
</label>
<input
type=
"text"
class=
"c-textfield"
name=
"väärtus"
id=
"focus"
placeholder=
"Click to focus"
/>
</div>
<div
class=
"c-textfield-mobile"
>
<label
for=
"focusMobile"
>
Vormivälja focus mobile
</label>
<input
type=
"text"
class=
"c-textfield"
name=
"väärtus"
id=
"focusMobile"
placeholder=
"Click to focus"
/>
</div>
</form>
app/views/partials/head.html
View file @
6e3ee2a7
...
...
@@ -6,19 +6,8 @@
<title>
{{ site.title }}
</title>
<link
href=
"https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
rel=
"stylesheet"
>
<link
rel=
"stylesheet"
href=
"..{{ paths.root + paths.styles }}/main.css"
/>
<script
src=
"https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity=
"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin=
"anonymous"
></script>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity=
"sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin=
"anonymous"
></script>
<link
rel=
"stylesheet"
href=
"https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity=
"sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu"
crossorigin=
"anonymous"
>
<script
src=
"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity=
"sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin=
"anonymous"
></script>
<link
href=
"https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
rel=
"stylesheet"
>
<link
rel=
"stylesheet"
href=
"..{{ paths.root + paths.styles }}/scss/main.css"
/>
{%- endblock -%}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment