lalala 4.0.0.dev.275 → 4.0.0.dev.277
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/lalala/components/_chosen-lalala.css.scss +1 -1
- data/app/assets/stylesheets/lalala/components/_forms.css.scss +27 -0
- data/app/assets/stylesheets/lalala/components/_icons.css.scss +1 -1
- data/app/assets/stylesheets/lalala/modules/_filter-form.css.scss +7 -0
- data/app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss +3 -3
- data/lib/lalala/version.rb +1 -1
- data/test/dummy/app/admin/articles.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e278e14f0eb5c4746f3aa83df32fa07142d9cb70
|
|
4
|
+
data.tar.gz: 8f2ed2866f9b5d290a60cf0808005740b30be35b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 61dfdecbf9aedd55b4234ef4638abf8e8e93aacd5ab94a2315b896025f874b42ea8b37ab0e7bab02e3ac6c0baa3db47c8c84107d64d683cec4ae11cba964c8d3
|
|
7
|
+
data.tar.gz: c510a027e73b58fd62493def9398a5319d59cbd176b12c8c89e1edd0e95c7539468d1931bcaf60d7c2fb1a91e711a621e44911866669fe5f697f18ef9d85c18d
|
|
@@ -122,6 +122,32 @@ select:focus {
|
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
+
// actions
|
|
126
|
+
.actions {
|
|
127
|
+
|
|
128
|
+
ol {
|
|
129
|
+
@include pie-clearfix;
|
|
130
|
+
border-top: 1px solid gray(220);
|
|
131
|
+
padding: 15px 0 15px $label_width;
|
|
132
|
+
margin: 15px 0 30px 0;
|
|
133
|
+
|
|
134
|
+
// float li items next to eachother
|
|
135
|
+
li {
|
|
136
|
+
float: left;
|
|
137
|
+
margin: 0 7px 0 0;
|
|
138
|
+
|
|
139
|
+
&.cancel {
|
|
140
|
+
// cancel (not an input, but a plain <a href>)
|
|
141
|
+
a {
|
|
142
|
+
@extend %btn;
|
|
143
|
+
@extend %btn.gray;
|
|
144
|
+
@include icon('bullet_orange', 'button');
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
125
151
|
// input line
|
|
126
152
|
.input {
|
|
127
153
|
position: relative;
|
|
@@ -131,6 +157,7 @@ select:focus {
|
|
|
131
157
|
width: $label_width;
|
|
132
158
|
}
|
|
133
159
|
|
|
160
|
+
a,
|
|
134
161
|
input,
|
|
135
162
|
textarea,
|
|
136
163
|
select {
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
.sidebar_section {
|
|
2
|
-
@include border-radius(
|
|
2
|
+
@include border-radius(5px);
|
|
3
3
|
border: 1px solid gray(220);
|
|
4
4
|
margin: 0 30px 20px 0;
|
|
5
5
|
overflow: hidden;
|
|
6
6
|
|
|
7
7
|
h3 {
|
|
8
|
-
background-color: gray(
|
|
8
|
+
background-color: gray(245);
|
|
9
9
|
border-bottom: 1px solid gray(220);
|
|
10
10
|
color: gray(70);
|
|
11
11
|
font-size: 14px !important;
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
.panel_contents {
|
|
18
|
-
padding: 15px 20px
|
|
18
|
+
padding: 15px 20px 10px 20px;
|
|
19
19
|
|
|
20
20
|
// LALALA specific styling
|
|
21
21
|
//
|
data/lib/lalala/version.rb
CHANGED
|
@@ -26,10 +26,10 @@ ActiveAdmin.register Article do
|
|
|
26
26
|
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
-
sidebar "
|
|
29
|
+
sidebar "Information", :only => [:edit] do
|
|
30
30
|
|
|
31
31
|
div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
|
|
32
|
-
"This item has been updated last at <strong>Feb 14th, 2014</strong>".html_safe
|
|
32
|
+
"This item has been updated last at <strong>Feb 14th, 2014</strong> by <a href='#link-to-hans-profile'>Hans</a>.".html_safe
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
end
|