Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Better buttons drawer and better bootstrap implementation

  • Loading branch information...
commit 076c257f6207487dc7b51db33cd4c7a9b491a8f2 1 parent 038836e
@claudioc authored
View
49 public/css/style.css
@@ -9,17 +9,12 @@ a {
p.user {
float: right;
color: white;
- padding: 10px 0 0;
- margin-bottom: 10px;
+ padding: 8px 0 0;
+ margin-bottom: 0px;
}
#main {
overflow: auto;
- margin-top: -3.5em;
-}
-
-#content {
- padding-top: 1em;
}
p {
@@ -140,33 +135,36 @@ ul.doc-list > li {
font-size: 90%;
}
+.page-actions-row {
+ margin-top: -62px;
+ background-color: white;
+ border: 1px solid silver;
+ padding-right: 5px;
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+}
+
.page-actions {
position: relative;
- text-align: right;
+ text-align: center;
margin: 0;
padding: 0;
- min-height: 1.75em;
-}
-
-.page-actions {
- padding: 5px;
- background-color: #f2f2f2;
- /*
- margin-top: -3.5em;
- */
+ line-height: 250%;
+ background-color: white;
border-bottom-left-radius: 5px;
}
.page-actions-handle {
- background-color: silver;
+ background-color: #4183c4;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
position: absolute;
width: 35px;
height: 14px;
right: 0;
+ left: 50%;
color: white;
- top: 35px;
+ top: 41px;
text-align: center;
font-size: 9px;
line-height: 12px;
@@ -242,3 +240,16 @@ form.edit textarea {
li {
margin-bottom: 5px;
}
+
+
+@media (min-width: 768px) and (max-width: 979px) {
+ body {
+ padding-top: 0;
+ }
+}
+
+@media (max-width: 767px) {
+ body {
+ padding-top: 0;
+ }
+}
View
14 public/js/app.js
@@ -6,21 +6,29 @@
var Jingo = {
init: function() {
+ var navh = $(".navbar").height(),
+ $par = $(".page-actions-row");
+
+ $(".page-actions-row").height(navh);
if ($(".page-actions:not(.pull-right)").length > 0) {
var $pah = $("<li class=\"page-actions-handle\">Tools</li>");
var pahTo;
$pah.on("mouseover", function() {
- $("#main").animate({"margin-top": "-1em"})
+ $(".alert").hide();
+ $par.animate({"margin-top": "-20px"})
+ $pah.slideUp();
});
- $(".page-actions").on("mouseenter", function() {
+ $par.on("mouseenter", function() {
clearTimeout(pahTo);
}).on("mouseleave", function() {
pahTo = setTimeout(function() {
- $("#main").animate({"margin-top": "-3.5em"})
+ $par.animate({"margin-top": "-62"})
+ $pah.slideDown();
}, 2000);
});
$(".page-actions:not(.pull-right)").append($pah);
+ } else {
}
$('.confirm-delete-page').on("click", function(evt) {
View
4 views/edit.jade
@@ -5,7 +5,7 @@ include mixins/form
block styles
mixin markitupStylesheets()
-block content
+block page-actions
ul.page-actions
if pageName != 'home'
li
@@ -14,6 +14,8 @@ block content
input(type="submit", value="Delete page").confirm-delete-page.btn.btn-small
li
+block content
+
h2 #{title}
mixin errors()
View
13 views/layout.jade
@@ -29,13 +29,16 @@ html
b &nbsp;#{user.displayName}&nbsp;
a(href='/logout', title='Become anonymous') [Logout]
-
.container
- if hasSidebar()
- .span2 !{_sidebar}
+ .row.page-actions-row.hidden-phone.hidden-tablet
+ block page-actions
+
+ .row
+ if hasSidebar()
+ .span2 !{_sidebar}
- #main.span8
- block content
+ #main.hide-tools.span8
+ block content
if hasFooter()
.row.span10 !{_footer}
View
9 views/show.jade
@@ -2,9 +2,7 @@ extends layout
include mixins/form
-block content
- mixin notice()
- mixin warning()
+block page-actions
ul.page-actions
if !isAnonymous()
li
@@ -17,6 +15,11 @@ block content
li
a(href="/wiki").btn.btn-small All pages
+block content
+
+ mixin notice()
+ mixin warning()
+
#content!=content
p.footer Last updated by
Please sign in to comment.
Something went wrong with that request. Please try again.