Skip to content

Commit 443f28d

Browse files
added some rough styling for toggling the top bar
1 parent 0e85f33 commit 443f28d

11 files changed

+289
-98
lines changed

css/light_theme.css

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*
2+
Syntax error: Undefined mixin 'box-shadow'.
3+
on line 12 of css/sass/light_theme.scss, in `box-shadow'
4+
from line 12 of css/sass/light_theme.scss
5+
6+
7: }
7+
8:
8+
9: // reflowable paginated style
9+
10:
10+
11: .page-margin {
11+
12: @include box-shadow(0 0 5px 5px #777);
12+
13: }
13+
14:
14+
15: .page-margin, .page {
15+
16: background-color: #FFF;
16+
17: }
17+
18+
Backtrace:
19+
css/sass/light_theme.scss:12:in `box-shadow'
20+
css/sass/light_theme.scss:12
21+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:170:in `visit_mixin'
22+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `visit'
23+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:18:in `visit'
24+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `block in visit_children'
25+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `map'
26+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `visit_children'
27+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:27:in `block in visit_children'
28+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:39:in `with_environment'
29+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:26:in `visit_children'
30+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `block in visit'
31+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:238:in `visit_rule'
32+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `visit'
33+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:18:in `visit'
34+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `block in visit_children'
35+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `map'
36+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:53:in `visit_children'
37+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:27:in `block in visit_children'
38+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:39:in `with_environment'
39+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:26:in `visit_children'
40+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `block in visit'
41+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:47:in `visit_root'
42+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `visit'
43+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:18:in `visit'
44+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:7:in `visit'
45+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/root_node.rb:20:in `render'
46+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/engine.rb:299:in `_render'
47+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/engine.rb:246:in `render'
48+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:339:in `update_stylesheet'
49+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:202:in `block in update_stylesheets'
50+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:200:in `each'
51+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:200:in `update_stylesheets'
52+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:272:in `block (4 levels) in watch'
53+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/path.rb:73:in `call'
54+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/path.rb:73:in `run_callback'
55+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/path.rb:55:in `callback_action'
56+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/path.rb:35:in `update'
57+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/state/directory.rb:39:in `block in modified'
58+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/state/directory.rb:37:in `each'
59+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/state/directory.rb:37:in `modified'
60+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/state/directory.rb:18:in `refresh'
61+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/backends/polling.rb:17:in `block (2 levels) in run'
62+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/backends/polling.rb:17:in `each'
63+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/backends/polling.rb:17:in `block in run'
64+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/backends/polling.rb:15:in `loop'
65+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/backends/polling.rb:15:in `run'
66+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm/monitor.rb:26:in `run'
67+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/fssm-0.2.8.1/lib/fssm.rb:70:in `monitor'
68+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin/compiler.rb:265:in `watch'
69+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/plugin.rb:107:in `method_missing'
70+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/exec.rb:431:in `watch_or_update'
71+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/exec.rb:302:in `process_result'
72+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/exec.rb:41:in `parse'
73+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/exec.rb:21:in `parse!'
74+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/bin/sass:8:in `<top (required)>'
75+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290/bin/sass:19:in `load'
76+
/Users/matthew/.rvm/gems/ruby-1.9.2-p290/bin/sass:19:in `<main>'
77+
*/
78+
body:before {
79+
white-space: pre;
80+
font-family: monospace;
81+
content: "Syntax error: Undefined mixin 'box-shadow'.\A on line 12 of css/sass/light_theme.scss, in `box-shadow'\A from line 12 of css/sass/light_theme.scss\A \A 7: }\A 8: \A 9: // reflowable paginated style\A 10: \A 11: .page-margin {\A 12: @include box-shadow(0 0 5px 5px #777);\A 13: }\A 14: \A 15: .page-margin, .page {\A 16: background-color: #FFF;\A 17: }"; }

css/readium_paginator.css

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
/*
22
Syntax error: Undefined mixin 'box-shadow'.
3-
on line 145 of css/sass/readium_paginator.scss, in `box-shadow'
4-
from line 145 of css/sass/readium_paginator.scss
3+
on line 136 of css/sass/readium_paginator.scss, in `box-shadow'
4+
from line 136 of css/sass/readium_paginator.scss
55
6-
140: position: absolute;
7-
141: top: 2%;
8-
142: left: 50%;
9-
143: height:96%;
10-
144: width: 1px;
11-
145: @include box-shadow(0 0 15px 3px rgba(5, 5, 5, 0.7));
12-
146: display: none;
13-
147: background-color: #444;
14-
148: opacity: 0.6;
15-
149: z-index: 10;
16-
150: }
6+
131: position: absolute;
7+
132: top: 2%;
8+
133: left: 50%;
9+
134: height:96%;
10+
135: width: 1px;
11+
136: @include box-shadow(0 0 15px 3px rgba(5, 5, 5, 0.7));
12+
137: display: none;
13+
138: background-color: #444;
14+
139: opacity: 0.6;
15+
140: z-index: 10;
16+
141: }
1717
1818
Backtrace:
19-
css/sass/readium_paginator.scss:145:in `box-shadow'
20-
css/sass/readium_paginator.scss:145
19+
css/sass/readium_paginator.scss:136:in `box-shadow'
20+
css/sass/readium_paginator.scss:136
2121
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:170:in `visit_mixin'
2222
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `visit'
2323
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:18:in `visit'
@@ -78,4 +78,4 @@ css/sass/readium_paginator.scss:145
7878
body:before {
7979
white-space: pre;
8080
font-family: monospace;
81-
content: "Syntax error: Undefined mixin 'box-shadow'.\A on line 145 of css/sass/readium_paginator.scss, in `box-shadow'\A from line 145 of css/sass/readium_paginator.scss\A \A 140: position: absolute;\A 141: top: 2%;\A 142: left: 50%;\A 143: height:96%;\A 144: width: 1px;\A 145: @include box-shadow(0 0 15px 3px rgba(5, 5, 5, 0.7));\A 146: display: none;\A 147: background-color: #444;\A 148: opacity: 0.6;\A 149: z-index: 10;\A 150: }"; }
81+
content: "Syntax error: Undefined mixin 'box-shadow'.\A on line 136 of css/sass/readium_paginator.scss, in `box-shadow'\A from line 136 of css/sass/readium_paginator.scss\A \A 131: position: absolute;\A 132: top: 2%;\A 133: left: 50%;\A 134: height:96%;\A 135: width: 1px;\A 136: @include box-shadow(0 0 15px 3px rgba(5, 5, 5, 0.7));\A 137: display: none;\A 138: background-color: #444;\A 139: opacity: 0.6;\A 140: z-index: 10;\A 141: }"; }

css/sass/light_theme.scss

+39-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1-
.light_theme {
2-
1+
//.light_theme { <---- eventually we will scope all this in the theme, but for now there is only one
2+
3+
// general styles
4+
5+
html, body, #container {
6+
background-color: #BBB;
7+
}
8+
9+
// reflowable paginated style
10+
11+
.page-margin {
12+
@include box-shadow(0 0 5px 5px #777);
13+
}
14+
15+
.page-margin, .page {
16+
background-color: #FFF;
17+
}
18+
19+
#content {
20+
color: #EEE;
21+
}
22+
23+
.dark-theme {
24+
#readium-content-container {
25+
color: #030303;
26+
}
27+
28+
.page-margin {
29+
border-left: 1px solid #000;
30+
border-right: 1px solid #000;
31+
}
32+
33+
.page-margin, .page {
34+
background-color: #444;
35+
}
36+
37+
#content {
38+
color: #EEE;
39+
}
340
}

css/sass/readium_paginator.scss

-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ html, body {
44
height: 100%;
55
width: 100%;
66
overflow: hidden;
7-
background-color: #BBB;
87
}
98

109
#container {
@@ -20,7 +19,6 @@ html, body {
2019
}
2120

2221
#content {
23-
color: #444;
2422
font: normal 16px/1.25 'Helvetica Neue', sans-serif;
2523
}
2624

@@ -62,8 +60,6 @@ html, body {
6260
width: 60%;
6361
margin: 0 auto;
6462
padding: 0;
65-
-webkit-box-shadow: 0 0 5px 5px #888;
66-
background-color: white;
6763
overflow: visible;
6864
}
6965

@@ -75,7 +71,6 @@ html, body {
7571
}
7672

7773
.page {
78-
background-color: white;
7974
border: none;
8075
content: -webkit-from-flow('foo');
8176
-webkit-flow-from: foo;
@@ -92,10 +87,6 @@ html, body {
9287
width: 0px;
9388
}
9489

95-
#container {
96-
background-color: #BBB;
97-
}
98-
9990
.clearfix:after {
10091
content: " ";
10192
display: block;

css/sass/top_bar.scss

+48-17
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,27 @@
22

33
#toolbar-el {
44
height: 40px;
5+
width: 100%;
6+
padding: 0;
7+
margin: 0;
58
}
69

710
#top-bar {
811
width: 100%;
912
position: fixed;
10-
height: 30px;
11-
padding-top: 10px;
13+
height: 40px;
1214
top: 0px;
1315
z-index: 1000;
1416
opacity: 0.9;
1517
-moz-opacity: 0.9;
1618
filter:alpha(opacity=9);
1719
@include transition (all 0.3s linear);
1820
@include linear-gradient(top, #353F5E, #000011);
19-
text-align: center;
2021
color: #DDD;
2122
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2223
border-bottom: 3px solid #6FA64D;
24+
padding: 0; margin: 0;
25+
text-align: center;
2326
}
2427

2528
#back-to-lib-button {
@@ -28,26 +31,54 @@
2831
}
2932

3033

31-
img#readium-icon {
32-
height: 25px;
33-
width: 45px;
34-
margin: auto 0px;
35-
padding: 0px;
36-
position: relative;
37-
display: inline;
34+
.top-bar-button {
35+
margin-top: 8px;
3836
}
3937

40-
.top-bar-button img#readium-icon{
41-
top: 0px;
38+
39+
#right-wrapper {
40+
float: right;
4241
}
4342

4443
#bar-logo {
44+
text-decoration: none;
45+
img {
46+
max-height: 37px;
47+
max-width: 139px;
48+
}
49+
}
50+
51+
52+
#show-toolbar-button {
53+
width: 25px;
54+
height: 18px;
55+
background-color: #838383;
56+
border: 1px solid #555;
4557
position: relative;
46-
top: -10px;
47-
right: 20px;
58+
top: 10px; right: 10px;
59+
text-align: center;
60+
@include border-radius(4px);
4861
img {
49-
max-height: 37px;
50-
max-width: 139px;
51-
clear: both;
62+
margin-top: 2px;
5263
}
64+
}
65+
66+
#hide-toolbar-button {
67+
height: 40px;
68+
display: inline-block;
69+
position: relative;
70+
top: -30px;
71+
img {
72+
position: relative;
73+
top: 15px;
74+
right: 1px;
75+
}
76+
}
77+
78+
.bar-divider {
79+
width: 0;
80+
height: 40px;
81+
display: inline-block;
82+
border-left: 1px solid black;
83+
border-right: 1px solid #353F5E;
5384
}

css/sass/viewer_manifest.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
@import 'readium_info_modal';
66
@import 'scrolling_paginator';
77
@import 'toc';
8-
@import 'top_bar';
8+
@import 'top_bar';
9+
@import 'light_theme';

css/top_bar.css

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
/*
22
Syntax error: Undefined mixin 'transition'.
3-
on line 17 of css/sass/top_bar.scss, in `transition'
4-
from line 17 of css/sass/top_bar.scss
3+
on line 19 of css/sass/top_bar.scss, in `transition'
4+
from line 19 of css/sass/top_bar.scss
55
6-
12: top: 0px;
7-
13: z-index: 1000;
8-
14: opacity: 0.9;
9-
15: -moz-opacity: 0.9;
10-
16: filter:alpha(opacity=9);
11-
17: @include transition (all 0.3s linear);
12-
18: @include linear-gradient(top, #353F5E, #000011);
13-
19: text-align: center;
14-
20: color: #DDD;
15-
21: font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
16-
22: border-bottom: 3px solid #6FA64D;
6+
14: top: 0px;
7+
15: z-index: 1000;
8+
16: opacity: 0.9;
9+
17: -moz-opacity: 0.9;
10+
18: filter:alpha(opacity=9);
11+
19: @include transition (all 0.3s linear);
12+
20: @include linear-gradient(top, #353F5E, #000011);
13+
21: color: #DDD;
14+
22: font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
15+
23: border-bottom: 3px solid #6FA64D;
16+
24: padding: 0; margin: 0;
1717
1818
Backtrace:
19-
css/sass/top_bar.scss:17:in `transition'
20-
css/sass/top_bar.scss:17
19+
css/sass/top_bar.scss:19:in `transition'
20+
css/sass/top_bar.scss:19
2121
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:170:in `visit_mixin'
2222
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/base.rb:37:in `visit'
2323
/Users/matthew/.rvm/gems/ruby-1.9.2-p290@readium/gems/sass-3.1.15/lib/sass/tree/visitors/perform.rb:18:in `visit'
@@ -78,4 +78,4 @@ css/sass/top_bar.scss:17
7878
body:before {
7979
white-space: pre;
8080
font-family: monospace;
81-
content: "Syntax error: Undefined mixin 'transition'.\A on line 17 of css/sass/top_bar.scss, in `transition'\A from line 17 of css/sass/top_bar.scss\A \A 12: top: 0px;\A 13: z-index: 1000;\A 14: opacity: 0.9;\A 15: -moz-opacity: 0.9;\A 16: filter:alpha(opacity=9);\A 17: @include transition (all 0.3s linear);\A 18: @include linear-gradient(top, #353F5E, #000011);\A 19: text-align: center;\A 20: color: #DDD;\A 21: font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif; \A 22: border-bottom: 3px solid #6FA64D;"; }
81+
content: "Syntax error: Undefined mixin 'transition'.\A on line 19 of css/sass/top_bar.scss, in `transition'\A from line 19 of css/sass/top_bar.scss\A \A 14: top: 0px;\A 15: z-index: 1000;\A 16: opacity: 0.9;\A 17: -moz-opacity: 0.9;\A 18: filter:alpha(opacity=9);\A 19: @include transition (all 0.3s linear);\A 20: @include linear-gradient(top, #353F5E, #000011);\A 21: color: #DDD;\A 22: font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif; \A 23: border-bottom: 3px solid #6FA64D;\A 24: padding: 0; margin: 0;"; }

0 commit comments

Comments
 (0)