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 /public | |
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 'public')
-rw-r--r-- | public/css/shame.less (renamed from public/css/styles.less) | 46 | ||||
-rw-r--r-- | public/css/use.less | 189 | ||||
-rw-r--r-- | public/css/variables.less | 2 |
3 files changed, 176 insertions, 61 deletions
diff --git a/public/css/styles.less b/public/css/shame.less index 55c74a1..023aedd 100644 --- a/public/css/styles.less +++ b/public/css/shame.less @@ -4,14 +4,15 @@ //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) { +@media (max-width: @navbarCollapseWidth) { body { margin-top: 0; } @@ -57,8 +58,10 @@ section.content { .nav .menu{ color: #FF9A00; } -.navbar .brand.login { +.navbar div.brand { float: right; +} +.navbar a.brand { color: #FF9A00; } @@ -191,6 +194,20 @@ div.lastactivity .activity .details { background-color: @infoBackground; } +.lastactivity .activity .date { + width: 30px; +} +.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:nth-child(2) { + background-color: @grayLight; + color: @black; + line-height: 12px; +} + .text-small { font-size: @fontSizeSmall; } @@ -198,6 +215,29 @@ div.lastactivity .activity .details { 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; + } + .navbar-fixed-top { + margin: 0 -5px; + } +} @import "use.less"; diff --git a/public/css/use.less b/public/css/use.less index 73d667b..4b8a897 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -1,6 +1,6 @@ /*#wrapper { -width:100%; -background-position: center 40%; + width:100%; + background-position: center 40%; }*/ #vertical(@startColor: #555, @endColor: #333) { @@ -14,82 +14,129 @@ background-position: center 40%; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down } +.content { + margin-left:0px; +} + .pitch { -position:relative; + position:relative; + margin-left: 10px; +} + +.join { + float:left; + position:absolute; + margin-top:220px; + margin-left: 10px; +} + +.sectionleft { + float:left; + margin-left: 10px; + margin-right: 0px; +} +.sectionright { + float:right; + margin-right: 10px; + margin-left: 0px; +} + +.tutorial { + padding:5px; } .infobox { text-align:center; - /*color:white;*/ /*background-color: @grayLighter;*/ - margin:15px; - padding:50px; - height: 220px; + padding:46px; + margin-bottom:20px; + border: 1px solid white; + /*text-shadow: 0 -1px 0 rgba(0, 0, 0, 1.25 );*/ -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; } - -.registrer { -color: #ffffff; -text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -background-color: #ffb440; -background-image: -moz-linear-gradient(top, #fbb440, #ff9a00); -background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb440), to(#ff9a00)); -background-image: -webkit-linear-gradient(top, #fbb440, #ff9a00); -background-image: -o-linear-gradient(top, #fbb440, #ff9a00); -background-image: linear-gradient(to bottom, #fbb440, #ff9a00); -background-repeat: repeat-x; -filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbb440', endColorstr='#ff9a00', GradientType=0); -border-color: #ff9a00 #ff9a00 #ad6704; -border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -/* -margin-left: 20px; -color: #ffffff; -text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -background-image: linear-gradient(to bottom, #FF9A00, #FFB440); -background-repeat: repeat-x; -border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);*/ +#first:hover { +color:#ff9a00; +border: 1px solid @grayLighter; +text-shadow: 0 -1px 0 rgba(0, 0, 0, 1.25); +} +#second:hover { +color:#ff9a00; +border: 1px solid @grayLighter; +text-shadow: 0 -1px 0 rgba(0, 0, 0, 1.25); +} +#third:hover { +color:#ff9a00; +border: 1px solid @grayLighter; +text-shadow: 0 -1px 0 rgba(0, 0, 0, 1.25); } -.infobtn { +.register { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-image: -moz-linear-gradient(top, #fbb440, #ff9a00); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb440), to(#ff9a00)); + background-image: -webkit-linear-gradient(top, #fbb440, #ff9a00); + background-image: -o-linear-gradient(top, #fbb440, #ff9a00); + background-image: linear-gradient(to bottom, #fbb440, #ff9a00); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbb440', endColorstr='#ff9a00', GradientType=0); + border-color: #ff9a00 #ff9a00 #ad6704; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + /* + margin-left: 20px; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-image: linear-gradient(to bottom, #FF9A00, #FFB440); + background-repeat: repeat-x; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);*/ + } + .showcase { + height:460px; + margin-top: 40px; + margin-bottom:20px; + margin-left:0px; + /*background-color: @grayLighter;*/ + /*background-image: url('/img/people.png'); + background-repeat:no-repeat; + background-attachment:fixed; + background-position:center;*/ + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.showcase { - width:1200px; - height:400px; - margin-top: 40px; - 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; } -.logo { -float: left; +.devices { + float:right; + margin: 0px; +} +.infoimg{ + } /* .last { -background-color:@grayLighter; + background-color:@grayLighter; }*/ #hvem { margin-top:25px; /*border-top: 2px solid #9fd5df;*/ - color: #143352; - background-color: #689AD3; + color: #4186D3; + background-color: @grayLighter; box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); @@ -102,7 +149,7 @@ background-color:@grayLighter; #hvor { margin-top:25px; /*border-top: 2px solid #9fd5df;*/ - color: #143352; + color: #0D56A6; background-color: #4186D3; box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); @@ -116,7 +163,7 @@ background-color:@grayLighter; #hvordan { margin-top:25px; /*border-top: 2px solid #9fd5df;*/ - color: #143352; + color: #4186D3; background-color: #0D56A6; box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); @@ -127,9 +174,37 @@ background-color:@grayLighter; display: block; } +#FAQ { + margin-top:25px; + /*border-top: 2px solid #9fd5df;*/ + color: #FF9A00; + background-color: #232323; + box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); + margin: 0 auto; + font-size: 18px; + line-height: 26px; + display: block; +} + +#register { + margin-top:25px; + /*border-top: 2px solid #9fd5df;*/ + color: #FFFFFF; + background-color: #000000; + box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2); + margin: 0 auto; + font-size: 18px; + line-height: 26px; + display: block; + } + /*#footer { -background-color: #0D56A6; -width:1170px; -height:100px; + background-color: #0D56A6; + width:1170px; + height:100px; }*/
\ No newline at end of file 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; |