diff options
author | Erling Aaby <spa440w@gmail.com> | 2013-04-23 10:45:13 +0200 |
---|---|---|
committer | Erling Aaby <spa440w@gmail.com> | 2013-04-23 10:45:13 +0200 |
commit | fb809fdf33a72ffae0fb5a4aab0fc8da0bc7229c (patch) | |
tree | 7cf391d70245d6db907d73e5eaa5d7083bf86671 /public | |
parent | Revert "Added images for the animation on divid home" (diff) | |
download | Divid-fb809fdf33a72ffae0fb5a4aab0fc8da0bc7229c.tar.gz |
Revert "Added devanim.less & style.css"
This reverts commit cadfe87a7c4eec171d4fa10e0c791997cb8c938c.
Diffstat (limited to 'public')
-rw-r--r-- | public/css/devanim.less | 332 | ||||
-rw-r--r-- | public/css/styles.less | 211 |
2 files changed, 67 insertions, 476 deletions
diff --git a/public/css/devanim.less b/public/css/devanim.less deleted file mode 100644 index ea7f23a..0000000 --- a/public/css/devanim.less +++ /dev/null @@ -1,332 +0,0 @@ - -.animation { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -o-box-sizing: border-box; - box-sizing: border-box; -} - -.screen { - position: relative; - border: solid 2px black; - margin: 0 auto; - margin-top: 100px; - background: white; - -webkit-animation: devices 9s ease 0s infinite; - -moz-animation: devices 9s ease 0s infinite; - -o-animation: devices 9s ease 0s infinite; - animation: devices 9s ease 0s infinite; -} - -@-webkit-keyframes devices { - 0% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } - - 29% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png') - /*background-repeat: no-repeat;*/ - } - - 33% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 60% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 66% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 94% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 100% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } -} -moz-webkit-keyframes devices { - 0% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } - - 29% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png') - /*background-repeat: no-repeat;*/ - } - - 33% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 60% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 66% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 94% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 100% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } -} -@-o-keyframes devices { - 0% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } - - 29% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png') - /*background-repeat: no-repeat;*/ - } - - 33% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 60% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 66% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 94% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 100% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } -} -@keyframes devices { - 0% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png'); - /*background-repeat: no-repeat;*/ - } - - 29% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png') - /*background-repeat: no-repeat;*/ - } - - 33% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 60% { - top: 68px; - width: 280px; - height: 210px; - border-radius: 5px; - border-width: 16px; - background-image: url('/img/pad.png') - /*background-repeat: no-repeat;*/ - } - - 66% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 15px; - border-bottom-width: 20px; - border-radius: 5px; - background-image: url('/img/mobil.png') - /*background-repeat: no-repeat;*/ - } - - 94% { - top: 100px; - width: 100px; - height: 190px; - border-width: 6px; - border-top-width: 7px; - border-bottom-width: 10px; - border-radius: 2px; - background-image: url('/img/mobil.png') - background-repeat: no-repeat; - } - - 100% { - top: 0; - width: 600px; - height: 337px; - border-width: 10px; - border-radius: 2px; - border-bottom-width: 15px; - background-image: url('/img/desktop.png') - /*background-repeat: no-repeat;*/ - } -}
\ No newline at end of file diff --git a/public/css/styles.less b/public/css/styles.less index 324f804..20fe3a8 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -1,83 +1,101 @@ /* * Divid stylesheet */ + +//Imports the bootstrap-variables +@import "variables.less"; + +// The rest comes here + body { - margin-top: 40px; + margin-top: @navbarHeight; } + section.content { - padding: 30px 5px 5px; + padding: 30px 5px 5px; } + #login-form { - display: block; - float: right; - margin: 10px 0 0; - color: #eeeeee; + display: block; + float:right; + margin: 10px 0 0; + color: @grayLighter; } -#login-form input { - background-color: rgba(0, 0, 0, 0); + +#login-form input { + background-color: rgba(0,0,0,0); } + #login-form .input-prepend .add-on { - background-color: #222222; + background-color: @grayDarker; } + #login-form .btn { - margin-top: -2px; + margin-top: -2px; } + #login-form .form-horizontal .control-group:last-child { - margin-bottom: 100px; + 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); + + 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)); + + } - background-color: rgba(0, 0, 0, 0.74); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0.5)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.9)), to(rgba(0, 0, 0, 0.5))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0.5)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0.5)); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0.5)); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6000000', endColorstr='#80000000', GradientType=0); +.navbar { } + .navbar .brand.login { - float: right; - color: #ffc40d; + float: right; + color: @yellow; } + .bs-docs-sidenav { - background-color: #ffffff; - width: 200px; - top: 150px; - padding: 0; - margin: 0; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + 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 #eeeeee; + 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; + -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; + -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: #eeeeee; + background-color: @grayLighter; } -<<<<<<< HEAD section.status table { width: 80%; @@ -180,100 +198,5 @@ div.lastactivity .activity .details { 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 -======= -section.status table { - width: 80%; - margin-bottom: 0; - float: left; ->>>>>>> Changed divid home -} -section.status table tr td { - text-align: center; -} -section.status table tr td.success { - background-color: #dff0d8; -} -section.status table tr td.error { - background-color: #f2dede; -} -section.status i { - margin: 5px; -} -section.projects section.project { - margin: 10px 0; - padding: 0; - border: 2px solid #999999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -section.projects section.project h1 { - font-size: 17.5px; - padding: 0; - margin: 0; - font-weight: normal; - line-height: 20px; -} -section.projects section.project .row-fluid [class*="span"] { - min-height: 0; -} -section.projects section.project .span11 { - padding: 5px; - border-right: 2px solid #999999; -} -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 #999999; -} -section.overview .lastactivity { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -section.overview .lastactivity > .activity { - border-bottom: 1px solid #999999; -} -section.overview .lastactivity > .activity:last-child { - border-bottom: none; -} -[class*="span"] .info { - font-size: 10.5px; - color: #999999; -} -section.overview .lastactivity > .activity [class*="span"] > .row-fluid [class*="span"] { - min-height: 0; -} -.lastactivity .activity:nth-child(even) { - background-color: #eeeeee; -} -div.lastactivity .activity .details { - background-color: #d9edf7; -} -.text-small { - font-size: 11.9px; -} -.no-text-decoration:hover { - text-decoration: none; -} -.span4 { -background-color:#F7F6F6; -} -.hero-unit{ - Width:900px; - Height:500px; - background: -moz-radial-gradient(top left, ellipse cover, rgba(105,155,200,1) 0%, rgba(181,197,216,1) 57%); - background: -webkit-gradient(radial, top left, 0px, top left, 100%, color-stop(0%,rgba(105,155,200,1)), color-stop(57%,rgba(181,197,216,1))); - background: -webkit-radial-gradient(top left, ellipse cover, rgba(105,155,200,1) 0%,rgba(181,197,216,1) 57%); - background: -o-radial-gradient(top left, ellipse cover, rgba(105,155,200,1) 0%,rgba(181,197,216,1) 57%); - background: -ms-radial-gradient(top left, ellipse cover, rgba(105,155,200,1) 0%,rgba(181,197,216,1) 57%); - background: radial-gradient(ellipse at top left, rgba(105,155,200,1) 0%,rgba(181,197,216,1) 57%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#699bc8', endColorstr='#b5c5d8',GradientType=1 ); } + |