From a81427bf9415c8697daf21b6390cab5a88eccf05 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Thu, 25 Apr 2013 08:55:50 +0200 Subject: test --- README.md | 2 +- app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1e8e032..0082347 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ DERS ==== Bachelorprosjekt - +hei Credit where credit is due: diff --git a/app.js b/app.js index 7fd9cbb..95f0b64 100644 --- a/app.js +++ b/app.js @@ -17,7 +17,7 @@ var app = express(); // initiates express app.configure(function(){ // this controls the port the application will be running on. // by adding 'process.enc.PORT' we enable the app to run on automated systems like heroku - app.set('port', process.env.PORT || 8000); + app.set('port', process.env.PORT || 8001); app.set('views', __dirname + '/views'); // sets views to the right directory app.set('view engine', 'ejs'); // initiates viewengine. We use EJS, or embedded js - http://embeddedjs.com/ -- cgit v1.2.3 From a76caf778561543ef28ea8c851f611052c933cf7 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 10:38:44 +0200 Subject: cut out part of the css --- public/css/styles.less | 1 + public/css/use.less | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 public/css/use.less diff --git a/public/css/styles.less b/public/css/styles.less index c047a17..b8175a6 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -260,3 +260,4 @@ position: relative; } +@import "use.less"; diff --git a/public/css/use.less b/public/css/use.less new file mode 100644 index 0000000..0ece7fa --- /dev/null +++ b/public/css/use.less @@ -0,0 +1,50 @@ + +#vertical(@startColor: #555, @endColor: #333) { + background-color: mix(@startColor, @endColor, 60%); + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down +} + +.infobox { + 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; +} + +.registrer { +margin-left: 20px; +background-color: #FF9A00; +} + +.infobtn { +} + +.showcase { + width:1200px; + height:400px; + margin-top: 20px; + margin-bottom:20px; + padding:10px; + 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; +} + +.logo { +float: left; -- cgit v1.2.3 From 8b16d303ebe9f1c031dccf92b363a2fc316ff533 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 10:45:11 +0200 Subject: removed code that was put into use.less --- public/css/styles.less | 60 -------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/public/css/styles.less b/public/css/styles.less index b8175a6..55c74a1 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -198,66 +198,6 @@ div.lastactivity .activity .details { text-decoration: none; } -#vertical(@startColor: #555, @endColor: #333) { - background-color: mix(@startColor, @endColor, 60%); - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down -} - -.infobox { - 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; -} - -.registrer { -margin-left: 20px; -background-color: #FF9A00; -} - -.infobtn { -} -.showcase { - width:1200px; - height:400px; - margin-top: 20px; - margin-bottom:20px; - padding:10px; - 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; -} - -.logo { -float: left; -padding: -10px -20px -10px; -margin-left: 20; -} - -.marketbtn { -margin: 5px; -position: relative; -} - -.tutorial { - -} @import "use.less"; -- cgit v1.2.3 From 72a64c1c04c680058065d268546349750dea76b7 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Thu, 25 Apr 2013 10:48:40 +0200 Subject: Correction missing bracket --- public/css/use.less | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/use.less b/public/css/use.less index 0ece7fa..cb208b2 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -48,3 +48,4 @@ background-color: #FF9A00; .logo { float: left; +} \ No newline at end of file -- cgit v1.2.3 From d4fe7cdce953c55dbb8955ce8d8b1596d65019e5 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 12:38:46 +0200 Subject: this really needs cleaning. renamed to shame.css until this is done. --- public/css/shame.less | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 public/css/shame.less diff --git a/public/css/shame.less b/public/css/shame.less new file mode 100644 index 0000000..4d8b4c8 --- /dev/null +++ b/public/css/shame.less @@ -0,0 +1,224 @@ +/* + * Divid stylesheet + */ + +//Imports the bootstrap-variables +@import "variables.less"; +//imports the functions from bootstrap +@import "bootstrapless/mixins.less"; +// The rest comes here + +body { + margin-top: @navbarHeight; + background-color:white; +} +@media (max-width: 767px) { + body { + margin-top: 0; + } +} +section.content { + padding: 30px 5px 5px; +} + +#login-form { + display: block; + float:right; + margin: 10px 0 0; + color: @grayLighter; +} + +#login-form input { + background-color: rgba(0,0,0,0); +} + +#login-form .input-prepend .add-on { + background-color: @grayDarker; +} + +#login-form .btn { + margin-top: -2px; +} + +#login-form .form-horizontal .control-group:last-child { + margin-bottom: 100px; +} + +@top-navbar-bgColor: @black; + +#top-navbar { + + min-height: 40px; + vertical-align: 100px; +/* background: rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.9); +*/ + #vertical(rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.9), rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.5)); + + } +.nav .menu{ +color: #FF9A00; +} +.navbar .brand.login { + float: right; + color: #FF9A00; +} + +.bs-docs-sidenav { + background-color: @white; + width: 200px; + top: 150px; + padding: 0; + margin: 0; + + -webkit-border-radius: @borderRadiusLarge; + -moz-border-radius: @borderRadiusLarge; + border-radius: @borderRadiusLarge; + -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065); + -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065); + box-shadow: 0 1px 4px rgba(0,0,0,.065); +} + +.bs-docs-sidenav > li > a { + display: block; + width: 190px \9; + margin: 0 0 -1px; + padding: 6px 14px; + border: 1px solid @grayLighter; +} + +.bs-docs-sidenav > li:first-child > a { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} + +.bs-docs-sidenav > li:last-child > a { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; +} + +.bs-docs-sidenav > li > a:hover { + background-color: @grayLighter; +} + +section.status table { + width: 80%; + margin-bottom: 0; + float: left; +} +section.status table tr td { + text-align: center; +} +section.status table tr td.success { + background-color: @successBackground; +} +section.status table tr td.error { + background-color: @errorBackground; +} +section.status i { margin: 5px; } + +section.projects section.project { + margin: 10px 0; + padding: 0; + + border: 2px solid @grayLight; + -webkit-border-radius: @borderRadiusLarge; + -moz-border-radius: @borderRadiusLarge; + border-radius: @borderRadiusLarge; +} + +section.projects section.project h1 { + font-size: @fontSizeLarge; + padding: 0; + margin: 0; + font-weight: normal; + line-height: @baseLineHeight; +} +section.projects section.project .row-fluid [class*="span"] { + min-height: 0; +} +section.projects section.project .span11 { + padding: 5px; + border-right: 2px solid @grayLight; +} +section.projects section.project .span1 { + display: inline-block; + height: 100%; + background-color: white; + min-height: inherit; + font-size: 3em; +} +section.projects a.btn-large { + font-weight: bold; + font-size: 3em; + border: 2px solid @grayLight; +} + + +section.overview .lastactivity { + -webkit-border-radius: @borderRadiusLarge; + -moz-border-radius: @borderRadiusLarge; + border-radius: @borderRadiusLarge; + +} + +section.overview .lastactivity > .activity { + border-bottom: 1px solid @grayLight; +} +section.overview .lastactivity > .activity:last-child { + border-bottom: none; +} +section.overview .lastactivity > .activity [class*="span"] { +} +[class*="span"] .info { + font-size: @fontSizeMini; + color: @grayLight; +} +@media (max-width: 480px) { + [class*="span"] .info { + text-align: left; + } +} +section.overview .lastactivity > .activity [class*="span"] > .row-fluid [class*="span"] { + min-height: 0; +} + +.lastactivity .activity:nth-child(even) { + background-color: @grayLighter; +} + +div.lastactivity .activity .details { + background-color: @infoBackground; +} + +.text-small { + font-size: @fontSizeSmall; +} +.no-text-decoration:hover { + text-decoration: none; +} + +@media (max-width: 480px) { + canvas { display: none; } +} + +@media(max-width: 767px) { + #grid > .fluid(@fluidGridColumnWidth768, @fluidGridGutterWidth768); + .row-fluid .smallfullwidth { + width: 100%; + margin-left: 0; + text-align: left; + } + .smallfullwidthh [class*="span"] { + width: 100%; + margin-left: 0; + text-align: left; + } + body { + padding: 0 5px; + } +} + + +@import "use.less"; -- cgit v1.2.3 From ae61d0fb4590e5002b40a5ea7dea87a23a0d090f Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 12:39:18 +0200 Subject: renamed styles.css to shame.css --- views/header.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/header.ejs b/views/header.ejs index f0185cb..84a2e15 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -11,5 +11,5 @@ - + -- cgit v1.2.3 From b28d5c46e76ab5399647560e3769d4aaa064d18d Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 14:02:33 +0200 Subject: changed navbarCollapseWidth --- public/css/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/variables.less b/public/css/variables.less index 31c131b..0211e71 100644 --- a/public/css/variables.less +++ b/public/css/variables.less @@ -177,7 +177,7 @@ // Navbar // ------------------------- -@navbarCollapseWidth: 979px; +@navbarCollapseWidth: 767px; @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; @navbarHeight: 40px; -- cgit v1.2.3 From 1174c33f92058d204c801ba62e1cceee82692cc4 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 14:16:28 +0200 Subject: moved some elements in the navbar and deleted styles.less --- public/css/styles.less | 203 ------------------------------------------------- views/navbar.ejs | 23 +++--- 2 files changed, 12 insertions(+), 214 deletions(-) delete mode 100644 public/css/styles.less diff --git a/public/css/styles.less b/public/css/styles.less deleted file mode 100644 index 55c74a1..0000000 --- a/public/css/styles.less +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Divid stylesheet - */ - -//Imports the bootstrap-variables -@import "variables.less"; - -// The rest comes here - -body { - margin-top: @navbarHeight; - background-color:white; -} -@media (max-width: 767px) { - body { - margin-top: 0; - } -} -section.content { - padding: 30px 5px 5px; -} - -#login-form { - display: block; - float:right; - margin: 10px 0 0; - color: @grayLighter; -} - -#login-form input { - background-color: rgba(0,0,0,0); -} - -#login-form .input-prepend .add-on { - background-color: @grayDarker; -} - -#login-form .btn { - margin-top: -2px; -} - -#login-form .form-horizontal .control-group:last-child { - margin-bottom: 100px; -} - -@top-navbar-bgColor: @black; - -#top-navbar { - - min-height: 40px; - vertical-align: 100px; -/* background: rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.9); -*/ - #vertical(rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.9), rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.5)); - - } -.nav .menu{ -color: #FF9A00; -} -.navbar .brand.login { - float: right; - color: #FF9A00; -} - -.bs-docs-sidenav { - background-color: @white; - width: 200px; - top: 150px; - padding: 0; - margin: 0; - - -webkit-border-radius: @borderRadiusLarge; - -moz-border-radius: @borderRadiusLarge; - border-radius: @borderRadiusLarge; - -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065); - -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065); - box-shadow: 0 1px 4px rgba(0,0,0,.065); -} - -.bs-docs-sidenav > li > a { - display: block; - width: 190px \9; - margin: 0 0 -1px; - padding: 6px 14px; - border: 1px solid @grayLighter; -} - -.bs-docs-sidenav > li:first-child > a { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.bs-docs-sidenav > li:last-child > a { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.bs-docs-sidenav > li > a:hover { - background-color: @grayLighter; -} - -section.status table { - width: 80%; - margin-bottom: 0; - float: left; -} -section.status table tr td { - text-align: center; -} -section.status table tr td.success { - background-color: @successBackground; -} -section.status table tr td.error { - background-color: @errorBackground; -} -section.status i { margin: 5px; } - -section.projects section.project { - margin: 10px 0; - padding: 0; - - border: 2px solid @grayLight; - -webkit-border-radius: @borderRadiusLarge; - -moz-border-radius: @borderRadiusLarge; - border-radius: @borderRadiusLarge; -} - -section.projects section.project h1 { - font-size: @fontSizeLarge; - padding: 0; - margin: 0; - font-weight: normal; - line-height: @baseLineHeight; -} -section.projects section.project .row-fluid [class*="span"] { - min-height: 0; -} -section.projects section.project .span11 { - padding: 5px; - border-right: 2px solid @grayLight; -} -section.projects section.project .span1 { - display: inline-block; - height: 100%; - background-color: white; - min-height: inherit; - font-size: 3em; -} -section.projects a.btn-large { - font-weight: bold; - font-size: 3em; - border: 2px solid @grayLight; -} - - -section.overview .lastactivity { - -webkit-border-radius: @borderRadiusLarge; - -moz-border-radius: @borderRadiusLarge; - border-radius: @borderRadiusLarge; - -} - -section.overview .lastactivity > .activity { - border-bottom: 1px solid @grayLight; -} -section.overview .lastactivity > .activity:last-child { - border-bottom: none; -} -section.overview .lastactivity > .activity [class*="span"] { -} -[class*="span"] .info { - font-size: @fontSizeMini; - color: @grayLight; -} -@media (max-width: 480px) { - [class*="span"] .info { - text-align: left; - } -} -section.overview .lastactivity > .activity [class*="span"] > .row-fluid [class*="span"] { - min-height: 0; -} - -.lastactivity .activity:nth-child(even) { - background-color: @grayLighter; -} - -div.lastactivity .activity .details { - background-color: @infoBackground; -} - -.text-small { - font-size: @fontSizeSmall; -} -.no-text-decoration:hover { - text-decoration: none; -} - - - -@import "use.less"; diff --git a/views/navbar.ejs b/views/navbar.ejs index 5d87ae4..e0ea1ab 100644 --- a/views/navbar.ejs +++ b/views/navbar.ejs @@ -38,25 +38,26 @@ <% } %>
- +
+ + <% if(!loggedin) { %> + <% } else { %> + <% } %> +
- <% if(!loggedin) { %> - <% } else { %> - <% } %>
-- cgit v1.2.3 From f0ea7d3ad0c840cea790604ca52fea5db63c1f98 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 14:17:18 +0200 Subject: been playing around with the mobile design --- public/css/shame.less | 23 +++++++++++++-- views/dashboard.ejs | 8 +++--- views/project.ejs | 80 ++++++++++++++++++++++++--------------------------- 3 files changed, 62 insertions(+), 49 deletions(-) diff --git a/public/css/shame.less b/public/css/shame.less index 4d8b4c8..ea569eb 100644 --- a/public/css/shame.less +++ b/public/css/shame.less @@ -12,7 +12,7 @@ body { margin-top: @navbarHeight; background-color:white; } -@media (max-width: 767px) { +@media (max-width: @navbarCollapseWidth) { body { margin-top: 0; } @@ -58,8 +58,10 @@ section.content { .nav .menu{ color: #FF9A00; } -.navbar .brand.login { +.navbar div.brand { float: right; +} +.navbar a.brand { color: #FF9A00; } @@ -192,6 +194,20 @@ div.lastactivity .activity .details { background-color: @infoBackground; } +.lastactivity .activity .date .row-fluid { + text-align: center; + width: 30px; +} +.lastactivity .activity .date .row-fluid:first-child { + background-color: @gray; + color: @white; +} +.lastactivity .activity .date .row-fluid:nth-child(2) { + background-color: @grayLight; + color: @black; + line-height: 10px; +} + .text-small { font-size: @fontSizeSmall; } @@ -218,6 +234,9 @@ div.lastactivity .activity .details { body { padding: 0 5px; } + .navbar-fixed-top { + margin: 0 -5px; + } } diff --git a/views/dashboard.ejs b/views/dashboard.ejs index c6b596a..e9df301 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -9,7 +9,7 @@
-
+

Prosjekter

@@ -77,13 +77,13 @@ -
+
-
+

Status total

-
+
diff --git a/views/project.ejs b/views/project.ejs index a67441f..fec8a6a 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -8,7 +8,7 @@ ================================================== -->
-
+
prosjekt @@ -52,13 +52,13 @@ -
+
-
+

Status total

-
+
@@ -86,7 +86,7 @@
-
+

Siste aktivitet

@@ -135,7 +135,7 @@ sum
- 2901 kr + 2901 kr
@@ -144,7 +144,6 @@
- [edit]
@@ -153,61 +152,57 @@
-
+
+
+
+
24
+
APR
+
▼
+
+
+
+
-
▼ for
-
Robert Joramo
+
for
+
Robert Joramo
-
hva
-
Tre horer, fire kaviartuber og alt for mye krem
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
-
+
delt på
-
+
Helene, Robert
-
-
-
- når -
-
- 2013-04-16 -
-
-
-
+
+
+
sum
-
- 583 kr +
+ 583 kr
-
-
-
-   -
-
- [edit] +
+
-
av
-
Dennis Eriksen
+
av
+
Dennis Eriksen
-
kommentar
+
kommentar
Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den...
@@ -215,13 +210,16 @@
-
+
kategori
-
+
Div
+
+ [edit] +
@@ -284,7 +282,6 @@
- [edit]
@@ -352,7 +349,6 @@
 
- [edit]
@@ -415,7 +411,6 @@  
- [edit]
@@ -483,7 +478,6 @@
 
- [edit]
-- cgit v1.2.3 From 49232b8b0e8b88c3380c25883521c4d05fdf5d66 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 14:53:22 +0200 Subject: made the lastactivity section PRETTY. OH SO PRETTY --- public/css/shame.less | 10 +- views/project.ejs | 444 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 441 insertions(+), 13 deletions(-) diff --git a/public/css/shame.less b/public/css/shame.less index ea569eb..dc5e7d7 100644 --- a/public/css/shame.less +++ b/public/css/shame.less @@ -194,18 +194,18 @@ div.lastactivity .activity .details { background-color: @infoBackground; } -.lastactivity .activity .date .row-fluid { - text-align: center; +.lastactivity .activity .date { width: 30px; } -.lastactivity .activity .date .row-fluid:first-child { +.lastactivity .activity .date .row-fluid .row-fluid { text-align: center; } +.lastactivity .activity .date .row-fluid .row-fluid:first-child { background-color: @gray; color: @white; } -.lastactivity .activity .date .row-fluid:nth-child(2) { +.lastactivity .activity .date .row-fluid .row-fluid:nth-child(2) { background-color: @grayLight; color: @black; - line-height: 10px; + line-height: 12px; } .text-small { diff --git a/views/project.ejs b/views/project.ejs index fec8a6a..bcb87fa 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -149,12 +149,83 @@ +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori +
+
+ Div +
+
+
+ [edit] +
+
+ +
+
+
-
+
-
+
24
APR
▼
@@ -181,15 +252,372 @@
-
-
-
- sum +
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori
-
- 583 kr +
+ Div
+
+ [edit] +
+
+ +
+
+ + +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori +
+
+ Div +
+
+
+ [edit] +
+
+ +
+
+ + +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori +
+
+ Div +
+
+
+ [edit] +
+
+ +
+
+ + +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori +
+
+ Div +
+
+
+ [edit] +
+
+ +
+
+ + +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
+
+ +
+
+
+
+
+
+
av
+
Dennis Eriksen
+
+
+
kommentar
+
+ Helene og robert hadde seg en hyggetur på byen og fant ut at det ble nødvendig med horer. Da er det selvsagt obligatorisk med kaviar. Hva de skulle med kremen er fortsatt uvisst, men jeg måtte betale for den... +
+
+
+
+
+
+ kategori +
+
+ Div +
+
+
+ [edit] +
+
+ +
+
+ + + +
+
+
+
+
+
24
+
APR
+
▼
+
+
+
+
+
+
for
+
Robert Joramo
+
+
+
hva
+
Tre horer, fire kaviartuber og alt for mye krem
+
+
+
+
+
+ delt på +
+
+ Helene, Robert +
+
+
+
+
+ sum + 583 kr +
-- cgit v1.2.3 From 44b7b0b25befea64ab85d7da8eb93aa905c76e08 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 25 Apr 2013 15:28:58 +0200 Subject: been working on the last activity list. made it more pretty. --- public/css/shame.less | 6 +++--- views/dashboard.ejs | 28 +++++++++++++++------------- views/project.ejs | 10 +++------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/public/css/shame.less b/public/css/shame.less index dc5e7d7..023aedd 100644 --- a/public/css/shame.less +++ b/public/css/shame.less @@ -197,12 +197,12 @@ div.lastactivity .activity .details { .lastactivity .activity .date { width: 30px; } -.lastactivity .activity .date .row-fluid .row-fluid { text-align: center; } -.lastactivity .activity .date .row-fluid .row-fluid:first-child { +.lastactivity .activity .date .row-fluid { text-align: center; } +.lastactivity .activity .date .row-fluid:first-child { background-color: @gray; color: @white; } -.lastactivity .activity .date .row-fluid .row-fluid:nth-child(2) { +.lastactivity .activity .date .row-fluid:nth-child(2) { background-color: @grayLight; color: @black; line-height: 12px; diff --git a/views/dashboard.ejs b/views/dashboard.ejs index e9df301..9009686 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -104,7 +104,11 @@

Siste aktivitet

-
+
+
12
+
MAR
+
+
prosjekt
turidl/Kosekveldene
@@ -118,18 +122,16 @@
Mer kaviar
-
-
-
når
-
2013-04-15 22:45
-
-
-
 
-
-
-
 
-
sum
-
24 kr
+
+
 
+
 
+
+
+
+
 
+
+
sum 
+
24 kr
diff --git a/views/project.ejs b/views/project.ejs index bcb87fa..4bee9fd 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -152,13 +152,9 @@
-
-
-
24
-
APR
-
▼
-
-
+
24
+
APR
+
▼
-- cgit v1.2.3