tandem 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -3,7 +3,10 @@
3
3
  ColorBox Core Style:
4
4
  The following CSS is consistent between example themes and should not be altered.
5
5
  */
6
- #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
6
+ #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;
7
+ -moz-box-sizing: content-box;
8
+ -webkit-box-sizing: content-box;
9
+ box-sizing: content-box;}
7
10
  #cboxOverlay{position:fixed; width:100%; height:100%;}
8
11
  #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
9
12
  #cboxContent{position:relative;}
@@ -26,12 +26,15 @@ body.tandem-admin-bar {
26
26
  a, a:active, a:visited {
27
27
  color: $lightblue;
28
28
  text-decoration: none;
29
- &:hover {color: #aaa;}
29
+ @include goo;
30
+ &:hover {color: #aaa;@include goo;}
31
+
30
32
  }
31
33
  }
32
34
  a#page_new_link {
33
35
  background: transparent url(image_path('tandem/tandem_logo_nav.png')) left no-repeat;
34
36
  padding-left: 100px;
37
+ @include goo;
35
38
  }
36
39
  }
37
40
  .tandem_content:hover {
@@ -87,27 +90,35 @@ h4.tandem-logo {
87
90
 
88
91
  /////// Contents, Page, & Image Editor
89
92
 
90
- #tandem-editor {
91
- width: 600px;
93
+ #tandem-editor {
94
+ width: 100%;
95
+
92
96
  }
93
97
  #tandem-editor-wym {
94
98
  width: 100%;
95
99
  }
96
100
 
97
101
  #tandem-editor, #tandem-editor-wym {
98
- h1.tandem-title {
99
- font-size: 18px;
100
- @include goo;
102
+ h1, h1.tandem-title {
103
+ @include sans-serif;
104
+ font-size: 20px;
101
105
  color: $darkblue;
102
- font-weight: none;
103
- margin: 10px 0;
106
+ font-weight: 300 !important;
107
+ margin: 0 0 5px 0;
108
+ padding: 0 0 5px 0;
109
+ background: none;
110
+ line-height: normal;
111
+ border: none;
112
+ border-bottom: 1px solid $lightblue;
113
+ background: none;
104
114
  }
105
115
  h3#selected_image_title {
106
- font-size: 20px;
107
116
  @include goo;
108
- color: #407992;
109
- font-weight: normal;
117
+ font-size: 20px;
118
+ color: #407992;
110
119
  margin: 15px 0;
120
+ padding: 0;
121
+ border: none;
111
122
  }
112
123
  iframe{
113
124
  border:none;
@@ -119,6 +130,8 @@ h4.tandem-logo {
119
130
  color: $darkblue;
120
131
  }
121
132
  form {
133
+ margin: 0;
134
+ padding: 0;
122
135
  div {
123
136
  padding: 5px;
124
137
  }
@@ -130,34 +143,62 @@ h4.tandem-logo {
130
143
  }
131
144
  }
132
145
  label {
133
- @include goo;
146
+ @include goo;
147
+ font-size: 15px !important;
134
148
  color: $darkblue;
135
149
  width: 100px;
136
- padding: 0;
150
+ height: 100%;
151
+ padding: 3px 0 0 0;
152
+ margin:0;
153
+ line-height: normal;
137
154
  text-align: left;
138
- font-size: 14px;
139
- margin-left: 10px;
155
+ font-size: 14px;
140
156
  display:block;
141
- float: left;
157
+ float: left;
158
+ border: none;
159
+
142
160
  }
143
161
  input, textarea {
144
162
  border: 1px solid #ccc;
145
163
  @include radius(3px);
164
+ -webkit-box-shadow: 0 0 5px #aaa;
165
+ -moz-box-shadow: 0 0 5px #aaa;
146
166
  box-shadow: 0 0 5px #aaa;
147
167
  padding: 5px;
148
168
  position:relative;
169
+ width: auto;
170
+ background: white;
171
+ color: #333;
172
+ @include sans-serif;
173
+ border: none;
174
+ text-transform: inherit;
175
+ }
176
+ input[type="checkbox"], input[type="radio"] {
177
+ position: relative;
178
+ bottom: 5px;
179
+ }
180
+ textarea {
181
+ font-family: Times New Roman, serif;
182
+ }
183
+ select {
184
+ width: auto;
185
+ @include sans-serif;
186
+ }
187
+ input#page_is_default, input#page_parent_id_, input#page_parent_id_1 {
188
+ margin-right: 0;
189
+ vertical-align: none;
149
190
  }
150
- input#page_is_default, input#page_parent_id_, input#page_parent_id_1 {top:5px;}
151
191
  .field {
152
192
  margin: 15px 0;
153
193
  @include goo;
194
+ width: auto;
154
195
  }
155
196
  .field span {
156
197
  font-size: 14px;
157
198
  color: $darkblue;
158
199
  padding: 0 10px 0 5px;
159
200
  position: relative;
160
- top: 5px;
201
+ top: -5px;
161
202
  }
162
203
  .wym_box {
163
204
  background: none;
@@ -479,9 +520,12 @@ section#tandem_image_gallery {
479
520
  font-size: 13px;
480
521
  bottom: 25px;
481
522
  }
523
+ #cboxContent {
524
+ background: #fff url(image_path('tandem/tandem_logo.png')) 0 100% no-repeat;
525
+ }
482
526
  #cboxLoadedContent{
483
527
  padding-bottom: 50px;
484
- background: transparent url(image_path('tandem/tandem_logo.png')) 0 100% no-repeat;
528
+ background: #fff;
485
529
 
486
530
  }
487
531
 
@@ -14,6 +14,17 @@
14
14
 
15
15
  @mixin goo {
16
16
  font-family: 'Glegoo', serif;
17
+ font-weight: 300;
18
+ text-transform: inherit;
19
+ font-size: 15px;
20
+ font-style: normal;
21
+ }
22
+ @mixin sans-serif {
23
+ font-family: 'Helvetica Neue', Helvetica, sans-serif;
24
+ font-weight: 300;
25
+ font-size: 15px;
26
+ text-transform: capitalize;
27
+ font-style: normal;
17
28
  }
18
29
 
19
30
  @mixin radius($radius) {
@@ -3,5 +3,8 @@
3
3
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
4
4
  * the top of the compiled file, but it's generally better to create a new file per style scope.
5
5
  *= require_self
6
- *= require_tree './tandem'
6
+ *= require tandem/colorbox
7
+ *= require tandem/variables
8
+ *= require tandem/contents
9
+ *= require tandem/scaffold
7
10
  */
@@ -3,8 +3,8 @@ module Tandem
3
3
  def self.included(base)
4
4
  main_app_url_helpers.each do |helper|
5
5
  base.send(:define_method, helper) do |*arguments|
6
- arguments = nil if arguments.empty?
7
- main_app.send(helper, arguments)
6
+ arguments = [{}] if arguments.empty?
7
+ main_app.send(helper, *arguments)
8
8
  end
9
9
  end
10
10
  end
@@ -1,3 +1,3 @@
1
1
  module Tandem
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tandem
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.2.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2012-06-30 00:00:00.000000000 Z
16
+ date: 2012-08-09 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
443
443
  version: '0'
444
444
  requirements: []
445
445
  rubyforge_project:
446
- rubygems_version: 1.8.22
446
+ rubygems_version: 1.8.23
447
447
  signing_key:
448
448
  specification_version: 3
449
449
  summary: A lightweight CMS for Rails 3.1+