padrino-admin 0.11.0 → 0.11.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/padrino-admin/bootstrap-less/alerts.less +8 -8
- data/lib/padrino-admin/bootstrap-less/badges.less +1 -1
- data/lib/padrino-admin/bootstrap-less/bootstrap.less +2 -0
- data/lib/padrino-admin/bootstrap-less/breadcrumbs.less +3 -0
- data/lib/padrino-admin/bootstrap-less/button-groups.less +1 -1
- data/lib/padrino-admin/bootstrap-less/buttons.less +7 -7
- data/lib/padrino-admin/bootstrap-less/carousel.less +3 -0
- data/lib/padrino-admin/bootstrap-less/dropdowns.less +7 -8
- data/lib/padrino-admin/bootstrap-less/forms.less +13 -8
- data/lib/padrino-admin/bootstrap-less/grid.less +3 -3
- data/lib/padrino-admin/bootstrap-less/jumbotron.less +1 -1
- data/lib/padrino-admin/bootstrap-less/labels.less +8 -8
- data/lib/padrino-admin/bootstrap-less/list-group.less +96 -0
- data/lib/padrino-admin/bootstrap-less/mixins.less +35 -32
- data/lib/padrino-admin/bootstrap-less/navbar.less +39 -29
- data/lib/padrino-admin/bootstrap-less/navs.less +18 -29
- data/lib/padrino-admin/bootstrap-less/pager.less +4 -4
- data/lib/padrino-admin/bootstrap-less/pagination.less +3 -3
- data/lib/padrino-admin/bootstrap-less/panels.less +86 -0
- data/lib/padrino-admin/bootstrap-less/popovers.less +5 -5
- data/lib/padrino-admin/bootstrap-less/scaffolding.less +8 -6
- data/lib/padrino-admin/bootstrap-less/tables.less +25 -19
- data/lib/padrino-admin/bootstrap-less/tooltip.less +1 -1
- data/lib/padrino-admin/bootstrap-less/type.less +25 -24
- data/lib/padrino-admin/bootstrap-less/utilities.less +1 -1
- data/lib/padrino-admin/bootstrap-less/variables.less +114 -78
- data/lib/padrino-admin/bootstrap-less/wells.less +2 -2
- data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/bootstrap-scrollspy.js +2 -2
- data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/bootstrap.min.js +1 -1
- data/lib/padrino-admin/generators/templates/assets/stylesheets/bootstrap.css +105 -61
- data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt +1 -1
- data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt +1 -1
- data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt +1 -1
- data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt +1 -1
- data/lib/padrino-admin/generators/templates/haml/page/_form.haml.tt +1 -1
- data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt +2 -2
- data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt +1 -1
- data/lib/padrino-admin/locale/admin/zh_cn.yml +34 -34
- data/lib/padrino-admin/locale/orm/zh_cn.yml +20 -20
- metadata +26 -11
- checksums.yaml +0 -7
@@ -9,7 +9,7 @@
|
|
9
9
|
background-color: @navbar-bg;
|
10
10
|
border-radius: @border-radius-base;
|
11
11
|
// Prevent floats from breaking the navbar
|
12
|
-
.
|
12
|
+
.clearfix();
|
13
13
|
}
|
14
14
|
|
15
15
|
// Navbar nav links
|
@@ -28,20 +28,20 @@
|
|
28
28
|
}
|
29
29
|
.nav > li > a:hover,
|
30
30
|
.nav > li > a:focus {
|
31
|
-
color: @navbar-link-color
|
32
|
-
background-color: @navbar-link-bg
|
31
|
+
color: @navbar-link-hover-color;
|
32
|
+
background-color: @navbar-link-hover-bg;
|
33
33
|
}
|
34
34
|
.nav > .active > a,
|
35
35
|
.nav > .active > a:hover,
|
36
36
|
.nav > .active > a:focus {
|
37
|
-
color: @navbar-link-color
|
38
|
-
background-color: @navbar-link-bg
|
37
|
+
color: @navbar-link-active-color;
|
38
|
+
background-color: @navbar-link-active-bg;
|
39
39
|
}
|
40
40
|
.nav > .disabled > a,
|
41
41
|
.nav > .disabled > a:hover,
|
42
42
|
.nav > .disabled > a:focus {
|
43
|
-
color: @navbar-link-color
|
44
|
-
background-color: @navbar-link-bg
|
43
|
+
color: @navbar-link-disabled-color;
|
44
|
+
background-color: @navbar-link-disabled-bg;
|
45
45
|
}
|
46
46
|
}
|
47
47
|
|
@@ -88,9 +88,9 @@
|
|
88
88
|
text-align: center;
|
89
89
|
&:hover,
|
90
90
|
&:focus {
|
91
|
-
color: @navbar-brand-color
|
91
|
+
color: @navbar-brand-hover-color;
|
92
92
|
text-decoration: none;
|
93
|
-
background-color: @navbar-brand-bg
|
93
|
+
background-color: @navbar-brand-hover-bg;
|
94
94
|
}
|
95
95
|
}
|
96
96
|
|
@@ -151,16 +151,16 @@
|
|
151
151
|
// Caret should match text color on hover
|
152
152
|
li.dropdown > a:hover .caret,
|
153
153
|
li.dropdown > a:focus .caret {
|
154
|
-
border-top-color: @navbar-link-color
|
155
|
-
border-bottom-color: @navbar-link-color
|
154
|
+
border-top-color: @navbar-link-hover-color;
|
155
|
+
border-bottom-color: @navbar-link-hover-color;
|
156
156
|
}
|
157
157
|
|
158
158
|
// Remove background color from open dropdown
|
159
159
|
li.dropdown.open > .dropdown-toggle,
|
160
160
|
li.dropdown.active > .dropdown-toggle,
|
161
161
|
li.dropdown.open.active > .dropdown-toggle {
|
162
|
-
background-color: @navbar-link-bg
|
163
|
-
color: @navbar-link-color
|
162
|
+
background-color: @navbar-link-active-bg;
|
163
|
+
color: @navbar-link-active-color;
|
164
164
|
}
|
165
165
|
li.dropdown > .dropdown-toggle .caret {
|
166
166
|
border-top-color: @navbar-link-color;
|
@@ -169,8 +169,8 @@
|
|
169
169
|
li.dropdown.open > .dropdown-toggle .caret,
|
170
170
|
li.dropdown.active > .dropdown-toggle .caret,
|
171
171
|
li.dropdown.open.active > .dropdown-toggle .caret {
|
172
|
-
border-top-color: @navbar-link-color
|
173
|
-
border-bottom-color: @navbar-link-color
|
172
|
+
border-top-color: @navbar-link-active-color;
|
173
|
+
border-bottom-color: @navbar-link-active-color;
|
174
174
|
}
|
175
175
|
}
|
176
176
|
|
@@ -207,20 +207,20 @@
|
|
207
207
|
}
|
208
208
|
.nav > li > a:hover,
|
209
209
|
.nav > li > a:focus {
|
210
|
-
color: @navbar-inverse-link-color
|
211
|
-
background-color: @navbar-inverse-link-bg
|
210
|
+
color: @navbar-inverse-link-hover-color;
|
211
|
+
background-color: @navbar-inverse-link-hover-bg;
|
212
212
|
}
|
213
213
|
.nav > .active > a,
|
214
214
|
.nav > .active > a:hover,
|
215
215
|
.nav > .active > a:focus {
|
216
|
-
color: @navbar-inverse-link-color
|
217
|
-
background-color: @navbar-inverse-link-bg
|
216
|
+
color: @navbar-inverse-link-active-color;
|
217
|
+
background-color: @navbar-inverse-link-active-bg;
|
218
218
|
}
|
219
219
|
.nav > .disabled > a,
|
220
220
|
.nav > .disabled > a:hover,
|
221
221
|
.nav > .disabled > a:focus {
|
222
|
-
color: @navbar-inverse-link-color
|
223
|
-
background-color: @navbar-inverse-link-bg
|
222
|
+
color: @navbar-inverse-link-disabled-color;
|
223
|
+
background-color: @navbar-inverse-link-disabled-bg;
|
224
224
|
}
|
225
225
|
|
226
226
|
// Darken the responsive nav toggle
|
@@ -245,12 +245,12 @@
|
|
245
245
|
.nav li.dropdown.open > .dropdown-toggle,
|
246
246
|
.nav li.dropdown.active > .dropdown-toggle,
|
247
247
|
.nav li.dropdown.open.active > .dropdown-toggle {
|
248
|
-
background-color: @navbar-inverse-link-bg
|
249
|
-
color: @navbar-inverse-link-color
|
248
|
+
background-color: @navbar-inverse-link-active-bg;
|
249
|
+
color: @navbar-inverse-link-active-color;
|
250
250
|
}
|
251
251
|
.nav li.dropdown > a:hover .caret {
|
252
|
-
border-top-color: @navbar-inverse-link-color
|
253
|
-
border-bottom-color: @navbar-inverse-link-color
|
252
|
+
border-top-color: @navbar-inverse-link-hover-color;
|
253
|
+
border-bottom-color: @navbar-inverse-link-hover-color;
|
254
254
|
}
|
255
255
|
.nav li.dropdown > .dropdown-toggle .caret {
|
256
256
|
border-top-color: @navbar-inverse-link-color;
|
@@ -259,8 +259,8 @@
|
|
259
259
|
.nav li.dropdown.open > .dropdown-toggle .caret,
|
260
260
|
.nav li.dropdown.active > .dropdown-toggle .caret,
|
261
261
|
.nav li.dropdown.open.active > .dropdown-toggle .caret {
|
262
|
-
border-top-color: @navbar-inverse-link-color
|
263
|
-
border-bottom-color: @navbar-inverse-link-color
|
262
|
+
border-top-color: @navbar-inverse-link-active-color;
|
263
|
+
border-bottom-color: @navbar-inverse-link-active-color;
|
264
264
|
}
|
265
265
|
}
|
266
266
|
|
@@ -283,7 +283,7 @@
|
|
283
283
|
.navbar .nav {
|
284
284
|
float: left;
|
285
285
|
margin-top: 0; // undo top margin to make nav extend full height of navbar
|
286
|
-
.
|
286
|
+
.clearfix();
|
287
287
|
|
288
288
|
&.pull-right {
|
289
289
|
float: right;
|
@@ -307,6 +307,16 @@
|
|
307
307
|
border-right-color: lighten(@navbar-inverse-bg, 5%);
|
308
308
|
}
|
309
309
|
|
310
|
+
.navbar-fixed-left {
|
311
|
+
padding-left: 0;
|
312
|
+
padding-right: 0;
|
313
|
+
}
|
314
|
+
.navbar-fixed-left .navbar-brand,
|
315
|
+
.navbar-fixed-left .nav,
|
316
|
+
.navbar-fixed-left .nav > li {
|
317
|
+
float: none;
|
318
|
+
}
|
319
|
+
|
310
320
|
// Required to make the collapsing navbar work on regular desktops
|
311
321
|
.navbar-toggle {
|
312
322
|
position: relative;
|
@@ -328,7 +338,7 @@
|
|
328
338
|
.navbar-link {
|
329
339
|
color: @navbar-link-color;
|
330
340
|
&:hover {
|
331
|
-
color: @navbar-link-color
|
341
|
+
color: @navbar-link-hover-color;
|
332
342
|
}
|
333
343
|
}
|
334
344
|
|
@@ -11,7 +11,7 @@
|
|
11
11
|
margin-bottom: 0;
|
12
12
|
padding-left: 0; // Override default ul/ol
|
13
13
|
list-style: none;
|
14
|
-
.
|
14
|
+
.clearfix();
|
15
15
|
}
|
16
16
|
.nav > li {
|
17
17
|
display: block;
|
@@ -65,7 +65,7 @@
|
|
65
65
|
.nav-tabs > .active > a:hover,
|
66
66
|
.nav-tabs > .active > a:focus {
|
67
67
|
color: @gray;
|
68
|
-
background-color: @body-
|
68
|
+
background-color: @body-bg;
|
69
69
|
border: 1px solid #ddd;
|
70
70
|
border-bottom-color: transparent;
|
71
71
|
cursor: default;
|
@@ -91,7 +91,7 @@
|
|
91
91
|
.nav-pills > .active > a:hover,
|
92
92
|
.nav-pills > .active > a:focus {
|
93
93
|
color: #fff;
|
94
|
-
background-color: @
|
94
|
+
background-color: @component-active-bg;
|
95
95
|
}
|
96
96
|
|
97
97
|
// Stacked pills
|
@@ -107,8 +107,7 @@
|
|
107
107
|
// -------------------------
|
108
108
|
|
109
109
|
.nav-justified {
|
110
|
-
|
111
|
-
max-height: 40px;
|
110
|
+
width: 100%;
|
112
111
|
}
|
113
112
|
.nav-justified > li {
|
114
113
|
float: none;
|
@@ -116,29 +115,19 @@
|
|
116
115
|
width: 1%;
|
117
116
|
text-align: center;
|
118
117
|
}
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
border-top-left-radius: @border-radius-base;
|
129
|
-
border-top-right-radius: @border-radius-base;
|
130
|
-
}
|
131
|
-
.nav-list > li:last-child > a {
|
132
|
-
border-bottom-left-radius: @border-radius-base;
|
133
|
-
border-bottom-right-radius: @border-radius-base;
|
118
|
+
// Move borders to anchors instead of bottom of list
|
119
|
+
.nav-justified.nav-tabs {
|
120
|
+
border-bottom: 0;
|
121
|
+
> li > a {
|
122
|
+
border-bottom: 1px solid #ddd;
|
123
|
+
}
|
124
|
+
> .active > a {
|
125
|
+
border-bottom-color: @body-bg;
|
126
|
+
}
|
134
127
|
}
|
135
|
-
|
136
|
-
.nav-
|
137
|
-
|
138
|
-
z-index: 2; // Bring active item forward so border sits on top of next element
|
139
|
-
color: #fff;
|
140
|
-
background-color: @link-color;
|
141
|
-
border-color: @link-color;
|
128
|
+
// Override margin from .nav-tabs
|
129
|
+
.nav-justified > li > a {
|
130
|
+
margin-right: 0;
|
142
131
|
}
|
143
132
|
|
144
133
|
|
@@ -231,8 +220,8 @@
|
|
231
220
|
margin-top: 8px;
|
232
221
|
}
|
233
222
|
.nav .dropdown-toggle:hover .caret {
|
234
|
-
border-top-color: @link-color
|
235
|
-
border-bottom-color: @link-color
|
223
|
+
border-top-color: @link-hover-color;
|
224
|
+
border-bottom-color: @link-hover-color;
|
236
225
|
}
|
237
226
|
|
238
227
|
// Active dropdown links
|
@@ -7,7 +7,7 @@
|
|
7
7
|
margin: @line-height-base 0;
|
8
8
|
list-style: none;
|
9
9
|
text-align: center;
|
10
|
-
.
|
10
|
+
.clearfix();
|
11
11
|
}
|
12
12
|
.pager li {
|
13
13
|
display: inline;
|
@@ -16,14 +16,14 @@
|
|
16
16
|
.pager li > span {
|
17
17
|
display: inline-block;
|
18
18
|
padding: 5px 14px;
|
19
|
-
background-color:
|
20
|
-
border: 1px solid
|
19
|
+
background-color: @pagination-bg;
|
20
|
+
border: 1px solid @pagination-border;
|
21
21
|
border-radius: 15px;
|
22
22
|
}
|
23
23
|
.pager li > a:hover,
|
24
24
|
.pager li > a:focus {
|
25
25
|
text-decoration: none;
|
26
|
-
background-color:
|
26
|
+
background-color: @pagination-active-bg;
|
27
27
|
}
|
28
28
|
.pager .next > a,
|
29
29
|
.pager .next > span {
|
@@ -15,7 +15,7 @@
|
|
15
15
|
padding: 4px 12px;
|
16
16
|
line-height: @line-height-base;
|
17
17
|
text-decoration: none;
|
18
|
-
background-color: @pagination-
|
18
|
+
background-color: @pagination-bg;
|
19
19
|
border: 1px solid @pagination-border;
|
20
20
|
border-left-width: 0;
|
21
21
|
}
|
@@ -23,7 +23,7 @@
|
|
23
23
|
.pagination > li > a:focus,
|
24
24
|
.pagination > .active > a,
|
25
25
|
.pagination > .active > span {
|
26
|
-
background-color: @pagination-
|
26
|
+
background-color: @pagination-active-bg;
|
27
27
|
}
|
28
28
|
.pagination > .active > a,
|
29
29
|
.pagination > .active > span {
|
@@ -35,7 +35,7 @@
|
|
35
35
|
.pagination > .disabled > a:hover,
|
36
36
|
.pagination > .disabled > a:focus {
|
37
37
|
color: @grayLight;
|
38
|
-
background-color: @pagination-
|
38
|
+
background-color: @pagination-bg;
|
39
39
|
cursor: default;
|
40
40
|
}
|
41
41
|
.pagination > li:first-child > a,
|
@@ -0,0 +1,86 @@
|
|
1
|
+
//
|
2
|
+
// Panels
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
5
|
+
|
6
|
+
// Base class
|
7
|
+
.panel {
|
8
|
+
padding: 15px;
|
9
|
+
margin-bottom: 20px;
|
10
|
+
background-color: @panel-bg;
|
11
|
+
border: 1px solid @panel-border;
|
12
|
+
border-radius: @panel-border-radius;
|
13
|
+
.box-shadow(0 1px 1px rgba(0,0,0,.05));
|
14
|
+
}
|
15
|
+
|
16
|
+
// Optional heading
|
17
|
+
.panel-heading {
|
18
|
+
margin: -15px -15px 15px;
|
19
|
+
padding: 10px 15px;
|
20
|
+
font-size: @font-size-base * 1.25;
|
21
|
+
font-weight: 500;
|
22
|
+
background-color: @panel-heading-bg;
|
23
|
+
border-bottom: 1px solid @panel-border;
|
24
|
+
border-top-left-radius: (@panel-border-radius - 1);
|
25
|
+
border-top-right-radius: (@panel-border-radius - 1);
|
26
|
+
}
|
27
|
+
|
28
|
+
// Contextual variations
|
29
|
+
.panel-primary {
|
30
|
+
border-color: @panel-primary-border;
|
31
|
+
.panel-heading {
|
32
|
+
color: @panel-primary-text;
|
33
|
+
background-color: @panel-primary-heading-bg;
|
34
|
+
border-color: @panel-primary-border;
|
35
|
+
}
|
36
|
+
}
|
37
|
+
.panel-success {
|
38
|
+
border-color: @panel-success-border;
|
39
|
+
.panel-heading {
|
40
|
+
color: @panel-success-text;
|
41
|
+
background-color: @panel-success-heading-bg;
|
42
|
+
border-color: @panel-success-border;
|
43
|
+
}
|
44
|
+
}
|
45
|
+
.panel-warning {
|
46
|
+
border-color: @panel-warning-border;
|
47
|
+
.panel-heading {
|
48
|
+
color: @panel-warning-text;
|
49
|
+
background-color: @panel-warning-heading-bg;
|
50
|
+
border-color: @panel-warning-border;
|
51
|
+
}
|
52
|
+
}
|
53
|
+
.panel-danger {
|
54
|
+
border-color: @panel-danger-border;
|
55
|
+
.panel-heading {
|
56
|
+
color: @panel-danger-text;
|
57
|
+
background-color: @panel-danger-heading-bg;
|
58
|
+
border-color: @panel-danger-border;
|
59
|
+
}
|
60
|
+
}
|
61
|
+
.panel-info {
|
62
|
+
border-color: @panel-info-border;
|
63
|
+
.panel-heading {
|
64
|
+
color: @panel-info-text;
|
65
|
+
background-color: @panel-info-heading-bg;
|
66
|
+
border-color: @panel-info-border;
|
67
|
+
}
|
68
|
+
}
|
69
|
+
|
70
|
+
// List groups in panels
|
71
|
+
.list-group-flush {
|
72
|
+
margin: 15px -15px -15px;
|
73
|
+
|
74
|
+
.list-group-item {
|
75
|
+
border-width: 1px 0;
|
76
|
+
|
77
|
+
// Remove border radius for top one
|
78
|
+
&:first-child {
|
79
|
+
.border-top-radius(0);
|
80
|
+
}
|
81
|
+
// But keep it for the last one
|
82
|
+
&:last-child {
|
83
|
+
border-bottom: 0;
|
84
|
+
}
|
85
|
+
}
|
86
|
+
}
|
@@ -12,9 +12,9 @@
|
|
12
12
|
max-width: 276px;
|
13
13
|
padding: 1px;
|
14
14
|
text-align: left; // Reset given new insertion method
|
15
|
-
background-color: @popover-
|
16
|
-
-webkit-
|
17
|
-
-moz-
|
15
|
+
background-color: @popover-bg;
|
16
|
+
-webkit-bg-clip: padding-box;
|
17
|
+
-moz-bg-clip: padding;
|
18
18
|
background-clip: padding-box;
|
19
19
|
border: 1px solid #ccc;
|
20
20
|
border: 1px solid rgba(0,0,0,.2);
|
@@ -37,8 +37,8 @@
|
|
37
37
|
font-size: 14px;
|
38
38
|
font-weight: normal;
|
39
39
|
line-height: 18px;
|
40
|
-
background-color: @popover-title-
|
41
|
-
border-bottom: 1px solid darken(@popover-title-
|
40
|
+
background-color: @popover-title-bg;
|
41
|
+
border-bottom: 1px solid darken(@popover-title-bg, 5%);
|
42
42
|
border-radius: 5px 5px 0 0;
|
43
43
|
|
44
44
|
&:empty {
|
@@ -30,19 +30,21 @@ html {
|
|
30
30
|
}
|
31
31
|
|
32
32
|
body {
|
33
|
+
font-family: @font-family-base;
|
34
|
+
font-size: 14px;
|
35
|
+
line-height: @line-height-base;
|
33
36
|
color: @text-color;
|
34
|
-
background-color: @body-
|
37
|
+
background-color: @body-bg;
|
35
38
|
}
|
36
39
|
|
37
40
|
// Reset fonts for revelant elements
|
38
|
-
body,
|
39
41
|
input,
|
40
42
|
button,
|
41
43
|
select,
|
42
44
|
textarea {
|
43
|
-
font-family:
|
44
|
-
|
45
|
-
line-height:
|
45
|
+
font-family: inherit;
|
46
|
+
font-size: inherit;
|
47
|
+
line-height: inherit;
|
46
48
|
}
|
47
49
|
|
48
50
|
|
@@ -55,7 +57,7 @@ a {
|
|
55
57
|
}
|
56
58
|
a:hover,
|
57
59
|
a:focus {
|
58
|
-
color: @link-color
|
60
|
+
color: @link-hover-color;
|
59
61
|
text-decoration: underline;
|
60
62
|
}
|
61
63
|
a:focus {
|