summaryrefslogtreecommitdiffstats
path: root/css
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2012-12-09 11:17:44 -0800
committerArun Persaud <arun@nubati.net>2012-12-09 11:17:44 -0800
commit9d2ee5fd928dc253e34ca6a0e0be92b1fa041240 (patch)
tree6ee5eb7f6f29b5a7cceb14ba9ac4ee2aea026211 /css
parent293b20963f2bbf0cfca1a146506d65d615b01c2c (diff)
downloade-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.tar.gz
e-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.tar.bz2
e-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.zip
bootstrap: fixed login/register, footer, and navbar
* made navbar smaller, added icons, icons only (for smaller screen) * fixed login screen
Diffstat (limited to 'css')
-rw-r--r--css/bootstrap/navbar.less3
-rw-r--r--css/bootstrap/variables.less7
-rw-r--r--css/standard.less105
3 files changed, 16 insertions, 99 deletions
diff --git a/css/bootstrap/navbar.less b/css/bootstrap/navbar.less
index 3514c40..c261132 100644
--- a/css/bootstrap/navbar.less
+++ b/css/bootstrap/navbar.less
@@ -238,7 +238,8 @@
.navbar .nav > li > a {
float: none;
// Vertically center the text given @navbarHeight
- padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
+// padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
+ padding: ((@navbarHeight - @baseLineHeight) / 2) 5px ((@navbarHeight - @baseLineHeight) / 2);
color: @navbarLinkColor;
text-decoration: none;
text-shadow: 0 1px 0 @navbarBackgroundHighlight;
diff --git a/css/bootstrap/variables.less b/css/bootstrap/variables.less
index 7d6efe0..3089093 100644
--- a/css/bootstrap/variables.less
+++ b/css/bootstrap/variables.less
@@ -130,8 +130,8 @@
// Sprite icons path
// -------------------------
-@iconSpritePath: "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
+@iconSpritePath: "../../pics/glyphicons-halflings.png";
+@iconWhiteSpritePath: "../../pics/glyphicons-halflings-white.png";
// Input placeholder text color
@@ -158,7 +158,8 @@
// -------------------------
@navbarCollapseWidth: 979px;
-@navbarHeight: 40px;
+//@navbarHeight: 40px;
+@navbarHeight: 25px;
@navbarBackgroundHighlight: #ffffff;
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBorder: darken(@navbarBackground, 12%);
diff --git a/css/standard.less b/css/standard.less
index 5383d30..a5c79c3 100644
--- a/css/standard.less
+++ b/css/standard.less
@@ -17,14 +17,14 @@
*
*/
-body { background-color: #ddd; padding-top:40px}
+@import "bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc
+body { background-color: #ddd; padding-top: @navbarHeight}
/* the header, footer, etc */
header {
background-color: #fff;
text-align: center;
padding-top: 1.5em;
- margin: 0em 3em;
border-bottom: 3px solid gray;
}
@@ -38,18 +38,16 @@ header {
.main {
background-color: #fff;
padding: 1px 0em;
- margin: 0em 3em;
padding-bottom: 1em;
}
footer {
background-color: #fff;
- margin: 0em 3em;
padding:0em 0.2em;
border-top: 2px solid gray;
}
-footer .right { text-align:right; font-size:smaller;}
-footer .left { float:left; font-size:smaller;}
+footer .right { float:right; font-size:smaller;}
+footer .left { text-aling:left; font-size:smaller;}
.WIP {
background-color: #efaaaa;
@@ -574,9 +572,6 @@ div.user ul li:first-child {
background-color: #8ae234;
}
-.bigger{ font-size:larger;}
-
-
/* statistics using jquery*/
caption {
text-align: center;
@@ -629,80 +624,7 @@ table.stats thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
/* the login window */
-.login {
- text-align:center;
- padding-top: 1em;
-}
-
-.login p {
- padding: 0.1em 0.1em 0.15em;
-}
-.login h4 {
- padding: 0.3em 0.3em 0.45em;
-}
-
/* the login/register form */
-ul.loginregister {
- width: 24em;
- margin: 0.25em auto;
- margin-top: 1.0em;
- padding: 0.0em;
- padding-top:0.5em;
- text-align: right;
- z-index: 1;
- }
-
-ul.loginregister li {
- display:inline;
- border: 0px;
- border-top: 2px solid #000;
- border-left: 2px solid #000;
- padding: 0.5em 0.75em;
- padding-bottom: 0.25em;
- background-color: #eee;
-}
-
-ul.loginregister li:last-child { border-right: 2px solid #000;}
-ul.loginregister li:hover {background-color: #aaa; }
-
-.doregister {display: none;}
-.dologin label,.doregister label {float:left; width: 6em; }
-
-
-.login fieldset{
- width: 24em;
- margin: 0.0em auto;
- margin-bottom: 0.5em;
- padding: 0.5em 0.5em 1.5em;
- text-align: center;
-}
-
-fieldset {
- border: 2px solid #000;
- padding: 0.5em 0.5em 0.75em;
- background-color: #eee;
-}
-
-fieldset p {
- font-size:smaller;
-}
-
-.login label, .login input{ margin: 0.5em 0.5em 0.75em;}
-
-.login label{
- float:left;
- width:7em;
- text-align: left;
-}
-
-.login input #email, .login input #password{
- width:9em;
- float:right;
-}
-
-.login .submitbutton { background-color: #fff;}
-.login .submitbutton:hover { background-color: #aaa;}
-
#openid_url {
background: #FFFFFF url('openid-icon-small.gif') no-repeat scroll 0pt 50%;
padding-left: 18px;
@@ -759,17 +681,9 @@ table.openid td, table.openid th{
/* special layout for mobile devices */
-@media only screen and (max-width: 900px) {
-.main {
- background-color: #fff;
- margin-left: 0em;
- margin-right: 0em;
-}
+@media only screen and (max-width: 600px) {
-header, footer {
- margin-left: 0em;
- margin-right: 0em;
-}
+.nav > li > a .navhide{ display:none; }
.lastlogin {
position: relative;
@@ -824,6 +738,7 @@ header, footer {
font-size: smaller;
}
}
-.pagination {
- text-align:center;
-} \ No newline at end of file
+
+// bootstrap stuff
+.pagination { text-align:center;}
+.nav > li > img { height: (@navbarHeight/2); }