diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-13 12:48:21 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-13 12:48:21 +0000 |
| commit | 04984f7cbfb3b6f3946970ca0eb8ff7df7d46557 (patch) | |
| tree | 0250922d29e48cd477a230c67e615caffacdd0af | |
| parent | Merge branch 'valid-html' into 'master' (diff) | |
| parent | Add some example CSS (diff) | |
| download | pages-plain-html-04984f7cbfb3b6f3946970ca0eb8ff7df7d46557.tar.gz | |
Merge branch 'add-css' into 'master'
Add some example CSS
## What does this MR do?
- add some minimalist CSS
- show an example of how to correctly reference CSS
## Are there points in the code the reviewer needs to double check?
Not really...
## Why was this MR needed?
The README mentions wrongly referencing CSS in Troubleshooting but does not show an example of how to do it right.
## What are the relevant issue numbers?
None.
## Screenshots
## Before
## After
See merge request !12
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | public/index.html | 7 | ||||
| -rw-r--r-- | public/style.css | 24 |
3 files changed, 33 insertions, 1 deletions
@@ -55,8 +55,9 @@ unless you want to contribute back to the upstream project. ## Troubleshooting 1. CSS is missing! That means that you have wrongly set up the CSS URL in your - HTML files. + HTML files. Have a look at the [index.html] for an example. [ci]: https://about.gitlab.com/gitlab-ci/ +[index.html]: https://gitlab.com/pages/plain-html/blob/master/public/index.html [userpages]: http://doc.gitlab.com/ee/pages/README.html#user-or-group-pages [projpages]: http://doc.gitlab.com/ee/pages/README.html#project-pages diff --git a/public/index.html b/public/index.html index 3a19205..6652c7d 100644 --- a/public/index.html +++ b/public/index.html @@ -4,8 +4,15 @@ <meta charset="utf-8"> <meta name="generator" content="GitLab Pages"> <title>Plain HTML site using GitLab Pages</title> + <link rel="stylesheet" href="style.css"> </head> <body> + <div class="navbar"> + <a href="https://pages.gitlab.io/plain-html/">Plain HTML Example</a> + <a href="https://gitlab.com/pages/plain-html/">Repository</a> + <a href="https://gitlab.com/pages/">Other Examples</a> + </div> + <h1>Hello World!</h1> <p> diff --git a/public/style.css b/public/style.css new file mode 100644 index 0000000..3eae408 --- /dev/null +++ b/public/style.css @@ -0,0 +1,24 @@ +body { + font-family: sans-serif; + margin: auto; + max-width: 1280px; +} + +.navbar { + background-color: #313236; + border-radius: 2px; + max-width: 800px; +} + +.navbar a { + color: #aaa; + display: inline-block; + font-size: 15px; + padding: 10px; + text-decoration: none; +} + +.navbar a:hover { + color: #ffffff; +} + |