aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDennis Eriksen <dennis.se@gmail.com>2013-04-24 23:44:36 -0700
committerDennis Eriksen <dennis.se@gmail.com>2013-04-24 23:44:36 -0700
commitdf554cd110b71e44a6986b7c0d991d481ebac741 (patch)
tree26d326571bcbc5aa37b4b941f90b0ea57445e62c
parentbranch test (diff)
parentRemoving margin-left (diff)
downloadDivid-df554cd110b71e44a6986b7c0d991d481ebac741.tar.gz
Merge pull request #2 from dennisse/master
test merge
-rw-r--r--public/css/styles.less19
-rw-r--r--public/img/people.pngbin0 -> 44517 bytes
2 files changed, 12 insertions, 7 deletions
diff --git a/public/css/styles.less b/public/css/styles.less
index 71eef3b..c047a17 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -210,12 +210,13 @@ div.lastactivity .activity .details {
}
.infobox {
-text-align:center;
-background-color: @grayLighter;
-margin:15px;
-padding:35px;
-height: 220px;
--webkit-border-radius: 15px;
+ text-align:center;
+ /*color:white;*/
+ background-color: @grayLighter;
+ margin:15px;
+ padding:35px;
+ height: 220px;
+ -webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
}
@@ -234,7 +235,11 @@ background-color: #FF9A00;
margin-top: 20px;
margin-bottom:20px;
padding:10px;
- /*background-image: url('/img/');*/
+ background-color: @grayLighter;
+ /*background-image: url('/img/people.png');
+ background-repeat:no-repeat;
+ background-attachment:fixed;
+ background-position:center;*/
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
diff --git a/public/img/people.png b/public/img/people.png
new file mode 100644
index 0000000..f971271
--- /dev/null
+++ b/public/img/people.png
Binary files differ