Permalink
Browse files

rework toolbars and annotator-outer

  • Loading branch information...
1 parent cf43ff0 commit 21f001ee51a4236972c4d1014205f9716eaefce8 @tilgovi committed Dec 6, 2012
Showing with 38 additions and 8 deletions.
  1. +26 −8 h/css/app.scss
  2. +12 −0 h/css/common.scss
View
34 h/css/app.scss
@@ -39,22 +39,41 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
width: $heatmap-width;
}
+.sliding-panels > li {
+ @include single-transition(left, 0.4s, ease-in);
+ padding-left: 1.5em;
+ position: absolute;
+ height: 100%;
+ width: 100%;
+
+ & > * {
+ @include smallshadow(-2px);
+ }
+ &:first-of-type {
+ padding-left: 0;
+ }
+
+ &.collapsed {
+ left: 100%;
+ }
+}
//SIDEBAR LAYOUT////////////////////////////////
#gutter {
background: url('../images/noise_1.png');
background-attachment: fixed;
height: 100%;
margin-left: $heatmap-width + 17px;
+ padding-top: 2.5em; // toolbar height + top margin
position: relative;
}
#wrapper {
+ background: url('../images/noise_1.png');
+ background-attachment: fixed;
height: 100%;
- overflow: auto;
- padding: 3.75em 1em 1em 1em;
- -webkit-overflow-scrolling: touch;
+ position: relative;
}
@@ -157,8 +176,7 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
z-index: 4;
background: url('../images/noise_1.png');
background-attachment: fixed;
- margin-top: 2.5em;
- padding-top: 1em;
+ padding: 1em;
position: absolute;
width: 100%;
@@ -205,15 +223,15 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
border: 1px solid $grayLighter;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
- left: 1px;
- line-height: $baseLineHeight;
+ height: 2em;
+ left: 7px;
+ line-height: 1.4em; // 2em (height) - .6em (padding)
margin-top: .5em;
padding: .3em;
position: absolute;
text-align: right;
width: 100%;
z-index: 5;
- left: 7px;
& > div {
display: inline-block;
View
12 h/css/common.scss
@@ -207,6 +207,18 @@ a {
}
+//OUTER//////////////////////////////////
+.annotator-outer {
+ background: url('../images/noise_1.png');
+ background-attachment: fixed;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ padding: 1em;
+ -webkit-overflow-scrolling: touch;
+}
+
+
//EXCERPT////////////////////////////////
.excerpt {

0 comments on commit 21f001e

Please sign in to comment.