diff options
| author | Erling Aaby <erlinaa@stud.hist.no> | 2013-04-29 09:05:09 +0200 |
|---|---|---|
| committer | Erling Aaby <erlinaa@stud.hist.no> | 2013-04-29 09:05:09 +0200 |
| commit | a2655d69808dd11ed59888ae56a3d55ffa9043db (patch) | |
| tree | f6f7c38d9a43d8ecefd5ce43a979b744d3dab049 /public | |
| parent | created faq.ejs, added imgs, modified app.js (diff) | |
| parent | Fixed bugs and showcase (diff) | |
| download | Divid-a2655d69808dd11ed59888ae56a3d55ffa9043db.tar.gz | |
Merge branch 'master' of github.com:dennisse/Divid
Merge is necessary because faq.ejs should be added
Diffstat (limited to 'public')
| -rw-r--r-- | public/css/use.less | 16 | ||||
| -rw-r--r-- | public/img/appstore@2x.png | bin | 0 -> 5568 bytes | |||
| -rw-r--r-- | public/img/dashboard.png | bin | 64660 -> 127906 bytes | |||
| -rw-r--r-- | public/img/dashboard@2x.png | bin | 176071 -> 339575 bytes |
4 files changed, 9 insertions, 7 deletions
diff --git a/public/css/use.less b/public/css/use.less index 6f80224..fe1745b 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -15,7 +15,7 @@ } .content { - margin-left:0px; +/* margin-left:0px;*/ } .pitch { @@ -93,8 +93,7 @@ margin:10px; height:460px; margin-top: 40px; margin-bottom:20px; - margin-left:0px; - /*background-color: @grayLighter;*/ + background-color: @grayLighter; /*background-image: url('/img/people.png'); background-repeat:no-repeat; background-attachment:fixed; @@ -115,10 +114,14 @@ margin:10px; float:right; margin: 0px; } -.infoimg{ +.divideLine { +background-color:#66A3D2; +height:5px; +width:35%; +margin-top:40px; +margin-bottom:40px; } - /* .last { background-color:@grayLighter; @@ -180,9 +183,8 @@ margin:10px; display: block; } - /*#footer { background-color: #0D56A6; width:1170px; height:100px; -}*/
\ No newline at end of file +}*/ diff --git a/public/img/appstore@2x.png b/public/img/appstore@2x.png Binary files differnew file mode 100644 index 0000000..ca292a0 --- /dev/null +++ b/public/img/appstore@2x.png diff --git a/public/img/dashboard.png b/public/img/dashboard.png Binary files differindex d8c49ab..1b82ffc 100644 --- a/public/img/dashboard.png +++ b/public/img/dashboard.png diff --git a/public/img/dashboard@2x.png b/public/img/dashboard@2x.png Binary files differindex f9078bc..4f582b8 100644 --- a/public/img/dashboard@2x.png +++ b/public/img/dashboard@2x.png |
