diff options
| author | Erling Aaby <erlinaa@stud.hist.no> | 2013-04-25 23:41:01 +0200 |
|---|---|---|
| committer | Erling Aaby <erlinaa@stud.hist.no> | 2013-04-25 23:41:01 +0200 |
| commit | 0e393e40c4ca4429667b9d4a8fc8eca8aa1cc861 (patch) | |
| tree | de55b1dbf073586afc186d9a5187a64636779a9f /views/header.ejs | |
| parent | Removed animation showcase, added img instead, added colors to lower sections (diff) | |
| parent | been working on the last activity list. made it more pretty. (diff) | |
| download | Divid-0e393e40c4ca4429667b9d4a8fc8eca8aa1cc861.tar.gz | |
Fixed divid home placements, added text, styled and added pictures
Diffstat (limited to 'views/header.ejs')
| -rw-r--r-- | views/header.ejs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/views/header.ejs b/views/header.ejs index 2b3dbe6..74afad9 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -11,6 +11,10 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="stylesheet" href="/css/bootstrap.css" /> <link rel="stylesheet" href="/css/bootstrap-responsive.css"> +<<<<<<< HEAD <link rel="stylesheet" href="/css/styles.css" /> <link rel="stylesheet" href="/css/use.css" /> +======= + <link rel="stylesheet" href="/css/shame.css" /> +>>>>>>> 44b7b0b25befea64ab85d7da8eb93aa905c76e08 |