metro-ui-rails 0.15.8.13 → 0.15.8.14

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.
Files changed (50) hide show
  1. checksums.yaml +15 -0
  2. data/Rakefile +6 -4
  3. data/lib/generators/metro/layout/templates/layout.html.erb +1 -1
  4. data/lib/metro/ui/rails/version.rb +1 -1
  5. data/vendor/assets/fonts/metro-ui/iconFont.eot +0 -0
  6. data/vendor/assets/fonts/metro-ui/iconFont.svg +26 -20
  7. data/vendor/assets/fonts/metro-ui/iconFont.ttf +0 -0
  8. data/vendor/assets/fonts/metro-ui/iconFont.woff +0 -0
  9. data/vendor/assets/javascripts/jquery.mousewheel.min.js +84 -0
  10. data/vendor/assets/javascripts/metro-ui/calendar.js +557 -0
  11. data/vendor/assets/javascripts/metro-ui/dialog.js +1 -1
  12. data/vendor/assets/javascripts/metro-ui/input-control.js +3 -3
  13. data/vendor/assets/javascripts/metro-ui/slider.js +2 -2
  14. data/vendor/assets/javascripts/metro-ui/tile-drag.js +5 -1
  15. data/vendor/assets/javascripts/metro-ui.js +9 -7
  16. data/vendor/toolkit/metro-ui/accordion.less +3 -2
  17. data/vendor/toolkit/metro-ui/bricks.less +2 -2
  18. data/vendor/toolkit/metro-ui/buttons.less +26 -17
  19. data/vendor/toolkit/metro-ui/calendar.less +81 -0
  20. data/vendor/toolkit/metro-ui/cards.less +18 -12
  21. data/vendor/toolkit/metro-ui/carousel.less +2 -3
  22. data/vendor/toolkit/metro-ui/code.less +2 -2
  23. data/vendor/toolkit/metro-ui/colors.less +21 -5
  24. data/vendor/toolkit/metro-ui/dialog.less +16 -16
  25. data/vendor/toolkit/metro-ui/forms.less +57 -32
  26. data/vendor/toolkit/metro-ui/grid.less +2 -2
  27. data/vendor/toolkit/metro-ui/hero.less +2 -2
  28. data/vendor/toolkit/metro-ui/icons.less +519 -1126
  29. data/vendor/toolkit/metro-ui/images.less +3 -3
  30. data/vendor/toolkit/metro-ui/layout.less +13 -9
  31. data/vendor/toolkit/metro-ui/listview.less +4 -3
  32. data/vendor/toolkit/metro-ui/menus.less +14 -7
  33. data/vendor/toolkit/metro-ui/modern-responsive-max480.less +7 -4
  34. data/vendor/toolkit/metro-ui/modern-responsive-max767.less +8 -3
  35. data/vendor/toolkit/metro-ui/modern-responsive-max979.less +8 -4
  36. data/vendor/toolkit/metro-ui/modern-responsive-min1200.less +9 -3
  37. data/vendor/toolkit/metro-ui/modern-responsive.less +4 -3
  38. data/vendor/toolkit/metro-ui/modern.less +32 -30
  39. data/vendor/toolkit/metro-ui/notices.less +6 -2
  40. data/vendor/toolkit/metro-ui/pagecontrol.less +5 -4
  41. data/vendor/toolkit/metro-ui/progress.less +4 -3
  42. data/vendor/toolkit/metro-ui/rating.less +4 -3
  43. data/vendor/toolkit/metro-ui/routines.less +12 -2
  44. data/vendor/toolkit/metro-ui/sidebar.less +4 -3
  45. data/vendor/toolkit/metro-ui/slider.less +2 -2
  46. data/vendor/toolkit/metro-ui/tables.less +2 -2
  47. data/vendor/toolkit/metro-ui/theme-dark.less +3 -3
  48. data/vendor/toolkit/metro-ui/tiles.less +7 -2
  49. data/vendor/toolkit/metro-ui/typography.less +50 -11
  50. metadata +8 -12
@@ -1,9 +1,10 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
+ *
6
+ * Butoons.less
5
7
  *
6
- * Buttons.less
7
8
  */
8
9
 
9
10
  @logo: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGESURBVFhH7ZevTsNQFIfbZgKxB9gjIHgABAIcS0CSQIJE4LEIEgQCyQNMIiHhIRAgEAgECWKIySUTCEjLd3t/Cyml3em6DtMvOTn33PM3XdvbBU2SJMmKlssnjuNtZIisa2t50HQNmXAFEvQHsi9X89CzR8M31/wXZwppDpp0aX7v++XBd41q7r5Qg1I0YE8pQYixqbWFpzAMx1pnoPA5vlOZpdDzHdWPoujZGVX4c1iaH8pvhpwJshOpxtxQawM18JYdrlYXdbKIAa4o1pFphrxX8g5qD0CRPsUeZZogfkzeLjJaxAAjZIuit9oqhbgv4veQl+lGFQqfGHwdbqpLH1YMMUdK8WjfysxHlgbHyKfiM7B/obAf5LNiemfQyB1E6VkwBfsGlb9ZvduM+aVFQ3cgDV0S+gHlHrs8LqAC5gEcxLuD6c5pbeVJy9qpNECLCV1aK+lPwO86kD0TF5s2KqD2m7Au7QDtAO0A7QD/PsBcf0zIWWVdfMRmcd+M/vsvRxB8A6+/IU2N93KYAAAAAElFTkSuQmCC);
@@ -48,6 +49,14 @@
48
49
 
49
50
  button, .button {
50
51
  #font > .control;
52
+ font-size: 14px;
53
+
54
+ display: inline-block;
55
+ padding: 4px 12px;
56
+ line-height: 20px;
57
+ text-align: center;
58
+ vertical-align: middle !important;
59
+
51
60
  min-width: 90px;
52
61
  min-height: 32px;
53
62
  height: 32px;
@@ -57,12 +66,10 @@ button, .button {
57
66
  margin-right: 10px;
58
67
  margin-bottom: 10px;
59
68
  border-raduis: 0;
60
- display: inline-block;
61
- text-align: center;
62
- vertical-align: middle;
63
69
  cursor: pointer;
64
- padding: 4px 10px;
65
- position: relative;
70
+ width: auto;
71
+
72
+ .clearfix;
66
73
 
67
74
  &.standart {
68
75
  min-width: 90px;
@@ -92,6 +99,7 @@ button, .button {
92
99
  }
93
100
 
94
101
  a.button {
102
+ //padding: 8px 10px;
95
103
  &:hover, &:active {
96
104
  color: inherit;
97
105
  }
@@ -101,12 +109,12 @@ a.button {
101
109
  }
102
110
 
103
111
  button, .button, .tool-button {
104
-
105
112
  &.mini {
106
- min-height: 24px;
107
- min-width: 24px;
108
- height: 26px;
109
- font-size: .8em;
113
+ min-height: 20px;
114
+ min-width: 20px;
115
+ height: 14px;
116
+ font-size: .75em !important;
117
+ padding-top: 0px !important;
110
118
  }
111
119
  &.big {
112
120
  min-height: 48px;
@@ -128,6 +136,7 @@ button, .button, .tool-button {
128
136
  }
129
137
 
130
138
  .command-button {
139
+ display: inline-block;
131
140
  width: 330px;
132
141
  text-align: left;
133
142
  padding: 10px 20px;
@@ -163,9 +172,7 @@ button, .button, .tool-button {
163
172
  img {
164
173
  width: 16px;
165
174
  height: 16px;
166
- position: absolute;
167
175
  top: 8px;
168
- left: 8px;
169
176
  }
170
177
  }
171
178
 
@@ -279,8 +286,9 @@ button, .button, .tool-button {
279
286
  & > .icon {
280
287
  margin-top: .25em;
281
288
  margin-bottom: .25em;
282
- font-size: 32px;
283
289
  color: #888;
290
+ display: block;
291
+ float: none;
284
292
  }
285
293
  & > .label {
286
294
  display: block;
@@ -299,11 +307,12 @@ button, .button, .tool-button {
299
307
  display: block;
300
308
  font-size: 9pt;
301
309
  color: #fff;
310
+ line-height: 11pt;
302
311
  }
303
312
  }
304
313
 
305
314
  a.shortcut {
306
- padding: 30px 0;
315
+ padding: 12px 0;
307
316
  .label {
308
317
  font-size: 9pt;
309
318
  }
@@ -0,0 +1,81 @@
1
+ /*
2
+ * Metro UI CSS
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
+ *
6
+ * Calendar.less
7
+ *
8
+ */
9
+
10
+ .calendar {
11
+ .bg-color-white;
12
+
13
+ table {
14
+ border: 1px #ccc solid;
15
+ width: 100%;
16
+ border-collapse: collapse;
17
+ margin: 0;
18
+ tr {
19
+ height: 1px;
20
+ }
21
+ }
22
+
23
+
24
+ tr:empty {
25
+ display: none;
26
+ }
27
+
28
+ td, th {
29
+ padding: 4px;
30
+ width: 14.285% !important;
31
+ font-size: 10pt;
32
+ border: 1px #ccc solid !important;
33
+ text-align: center;
34
+ }
35
+
36
+ td {
37
+ cursor: pointer;
38
+ position: relative;
39
+ height: 100%;
40
+
41
+ span {
42
+ font-size: 8px !important;
43
+ line-height: 10px;
44
+ position: absolute;
45
+ top: 0;
46
+ right: 0;
47
+ padding: 1px 3px;
48
+ .bg-color-red;
49
+ .fg-color-white;
50
+ }
51
+ }
52
+
53
+ .out {
54
+ background: #ececf0;
55
+ cursor: default;
56
+ }
57
+
58
+ .empty-day {
59
+ border: 0 !important;
60
+ display: none;
61
+ }
62
+
63
+ .weekdays td {
64
+ .bg-color-blueLight;
65
+ font-weight: bold !important;
66
+ }
67
+
68
+ .current-day {
69
+ .bg-color-green;
70
+ .fg-color-white;
71
+ }
72
+
73
+ .event {
74
+ .bg-color-blue;
75
+ .fg-color-white;
76
+ }
77
+ }
78
+
79
+ .datepicker {
80
+ position: relative;
81
+ }
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
5
  *
6
6
  * Cards.less
7
7
  *
@@ -40,17 +40,18 @@
40
40
  }
41
41
  .small-suit:after {
42
42
  top: 5px;
43
- left: 10px;
43
+ left: 13px;
44
44
  position: absolute;
45
45
  }
46
46
  .small-suit:before {
47
- top: 28px;
47
+ top: 22px;
48
48
  left: 10px;
49
49
  position: absolute;
50
50
  }
51
51
 
52
52
  .suit:after {
53
53
  position: relative;
54
+ bottom: 10px;
54
55
  }
55
56
  }
56
57
 
@@ -87,27 +88,32 @@
87
88
  // Масти
88
89
 
89
90
  // Пики
91
+ @spades: "\e009";
92
+ @clubs: "\e00a";
93
+ @diamonds: "\e00b";
94
+ @hearts: "\e07f";
95
+
90
96
  .card.spades {
91
97
  .small-suit:after { .black(); }
92
- .small-suit:before { content: "\2660"; .black(); }
93
- .suit:after { content: "\2660"; .black(); }
98
+ .small-suit:before {font-family: iconFont; content: @spades; .black(); }
99
+ .suit:after {font-size: 40pt; font-family: iconFont; content: @spades; .black(); }
94
100
  }
95
101
  // Трефы
96
102
  .card.clubs {
97
103
  .small-suit:after { .black(); }
98
- .small-suit:before { content: "\2663"; .black(); }
99
- .suit:after { content: "\2663"; .black(); }
104
+ .small-suit:before {font-family: iconFont; content: @clubs; .black(); }
105
+ .suit:after {font-size: 40pt; font-family: iconFont; content: @clubs; .black(); }
100
106
  }
101
107
  // Бубны
102
108
  .card.diamonds {
103
109
  .small-suit:after { .red(); }
104
- .small-suit:before { content: "\2666"; .red(); }
105
- .suit:after { content: "\2666"; .red();}
110
+ .small-suit:before {font-family: iconFont; content: @diamonds; .red(); }
111
+ .suit:after {font-size: 40pt; font-family: iconFont; content: @diamonds; .red();}
106
112
  }
107
113
  // Червы
108
114
  .card.hearts {
109
115
  .small-suit:after { .red(); }
110
- .small-suit:before { content: "\2665"; .red(); }
111
- .suit:after { content: "\2665"; .red(); }
116
+ .small-suit:before {font-family: iconFont; content: @hearts; .red(); }
117
+ .suit:after {font-size: 40pt; font-family: iconFont; content: @hearts; .red(); }
112
118
  }
113
119
 
@@ -1,10 +1,9 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
5
  *
6
6
  * Carousel.less
7
- * Version: 1.0
8
7
  *
9
8
  */
10
9
 
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
5
  *
6
6
  * Code.less
7
7
  *
@@ -1,12 +1,12 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
+ *
6
+ * Colors.less
5
7
  *
6
- * Variables.less
7
8
  */
8
9
 
9
- // Units
10
10
  @unit: 20px;
11
11
  @subunit: 5px;
12
12
 
@@ -29,6 +29,9 @@
29
29
  @darken: #1d1d1d;
30
30
  @lighten: #d5e7ec;
31
31
  @grayDark: #525252;
32
+ @magenta: #FF0097;
33
+ @teal: #00ABA9;
34
+ @redLight: #EE1111;
32
35
 
33
36
 
34
37
  // Foregraund colors classes
@@ -49,6 +52,9 @@
49
52
  .fg-color-lighten {color: @lighten !important;}
50
53
  .fg-color-white {color: @white !important;}
51
54
  .fg-color-grayDark {color: @grayDark !important;}
55
+ .fg-color-magenta {color: @magenta !important;}
56
+ .fg-color-teal {color: @teal !important;}
57
+ .fg-color-redLight {color: @redLight !important;}
52
58
 
53
59
  // Background colors classes
54
60
  .bg-color-blue {background-color: @blue !important;}
@@ -68,6 +74,9 @@
68
74
  .bg-color-lighten {background-color: @lighten !important;}
69
75
  .bg-color-white {background-color: @white !important;}
70
76
  .bg-color-grayDark {background-color: @grayDark !important;}
77
+ .bg-color-magenta {background-color: @magenta !important;}
78
+ .bg-color-teal {background-color: @teal !important;}
79
+ .bg-color-redLight {background-color: @redLight !important;}
71
80
 
72
81
  // Border colors classes
73
82
 
@@ -92,6 +101,10 @@
92
101
  .border-color-lighten {border-color: @lighten !important;}
93
102
  .border-color-white {border-color: @white !important;}
94
103
  .border-color-grayDark {border-color: @grayDark !important;}
104
+ .border-color-magenta {border-color: @magenta !important;}
105
+ .border-color-teal {border-color: @teal !important;}
106
+ .border-color-redLight {border-color: @redLight !important;}
107
+
95
108
 
96
109
  *:hover[class=outline-color] {
97
110
  outline: 3px solid;
@@ -112,4 +125,7 @@
112
125
  .outline-color-darken {outline-color: @darken !important;}
113
126
  .outline-color-lighten {outline-color: @lighten !important;}
114
127
  .outline-color-white {outline-color: @white !important;}
115
- .outline-color-grayDark {outline-color: @grayDark !important;}
128
+ .outline-color-grayDark {outline-color: @grayDark !important;}
129
+ .outline-color-magenta {outline-color: @magenta !important;}
130
+ .outline-color-teal {outline-color: @teal !important;}
131
+ .outline-color-redLight {outline-color: @redLight !important;}
@@ -1,5 +1,5 @@
1
1
  /*
2
- * Metro UI CSS
2
+ * Component for Metro UI CSS
3
3
  * Copyright 2012 Valerio Battaglia
4
4
  * Licensed under the MIT License
5
5
  *
@@ -19,13 +19,15 @@
19
19
 
20
20
  .header
21
21
  {
22
+ #font > .subheader;
22
23
  width: auto;
23
24
  height: 35px;
24
- padding: 6px 35px 5px 5px;
25
+ padding: 0px 35px 5px 5px;
25
26
  font-size: 18px;
26
27
  white-space: nowrap;
27
28
  overflow: hidden;
28
29
  background-color: #2D89EF;
30
+ color: #fff;
29
31
  border: 1px solid #2D89EF;
30
32
  border-bottom: 0 none;
31
33
 
@@ -38,27 +40,25 @@
38
40
 
39
41
  button
40
42
  {
41
- min-width: 16px;
42
- min-height: 16px;
43
- height: 24px;
44
- width: 24px;
45
-
46
- i
47
- {
48
- position: absolute;
49
- left: 2px;
50
- top: 4px;
51
- }
52
- }
53
- }
43
+ .tool-button;
44
+ width: 24px !important;
45
+ height: 24px !important;
46
+ min-height: 24px;
47
+ min-width: 24px;
48
+ [class^="icon-"], [class*=" icon-"] {
49
+ font-size: 11px;
50
+ }
51
+ }
52
+ }
54
53
 
55
54
  .content
56
55
  {
57
56
  min-height: 85px;
58
- padding: 5px;
57
+ padding: 20px;
59
58
  background-color: #FFFFFF;
60
59
  border-left: 1px solid rgba(0, 0, 0, 0.2);
61
60
  border-right: 1px solid rgba(0, 0, 0, 0.2);
61
+ #font > .normal;
62
62
  }
63
63
 
64
64
  .action
@@ -1,9 +1,10 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
+ *
6
+ * Forms.less
5
7
  *
6
- * Layout.less
7
8
  */
8
9
 
9
10
  @textbox_pass_active_icon: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAYAAADgKtSgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzM2OTY1MjIwNkVGMTFFMjhDQkNEODZFQTYyRTI5MDciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzM2OTY1MjMwNkVGMTFFMjhDQkNEODZFQTYyRTI5MDciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozMzU3NURCRDA2RUYxMUUyOENCQ0Q4NkVBNjJFMjkwNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMzU3NURCRTA2RUYxMUUyOENCQ0Q4NkVBNjJFMjkwNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhJl5kAAAAEMSURBVHja7FXtEYIwDKVO0BE6AiPoBDICo7BBR9AVnMARcIOyAWxQk6PlakwC/uC888zdOwpJXl/SD0yMsdrLDtWO9h1yY4wDeEAARIKQfE7InQfY8xJgFnBB10ZgrCUc85N8rAHjB8QZmFNTcpNfoBQkvifl2SbAFXAjlZ8BLRN7Ar4HtmVRnoKo4o6Wy7SvYyqwL21hetxKpMwkLbMGS3sccfqtxMUEnnC4TO5pWSSxAYQiBscN06KRCkTrJdWJWNohjaK+X3ZNgSNJCAp50ITgN+2E2rQeklHf9MYh3YqJfNTuDsg10vFXlYMTlQwK97B6c61ssc0Lunq3KBOoW1EiN/8/0W+RPwUYACoftglrEejbAAAAAElFTkSuQmCC);
@@ -326,14 +327,46 @@
326
327
 
327
328
  .input-control {
328
329
  &.text, &.password {
329
- input[type=text]:not(:focus) ~ .helper, input[type=password]:not(:focus) ~ .helper, input[type=email]:not(:focus) ~ .helper, input[type=phone]:not(:focus) ~ .helper, input[type=url]:not(:focus) ~ .helper {
330
- display: none;
330
+ input[type=text]:not(:focus),
331
+ input[type=password]:not(:focus),
332
+ input[type=email]:not(:focus),
333
+ input[type=phone]:not(:focus),
334
+ input[type=number]:not(:focus),
335
+ input[type=time]:not(:focus),
336
+ input[type=url]:not(:focus) {
337
+ & ~ [class^="btn-"], & ~ .helper {
338
+ display: none;
339
+ }
331
340
  }
332
- input[type=text]:focus ~ .helper, input[type=password]:focus ~ .helper, input[type=email]:focus ~ .helper, input[type=phone]:focus ~ .helper, input[type=url]:focus ~ .helper {
333
- display: block;
341
+
342
+ input[type=text]:focus,
343
+ input[type=password]:focus,
344
+ input[type=email]:focus,
345
+ input[type=phone]:focus,
346
+ input[type=number]:focus,
347
+ input[type=time]:focus,
348
+ input[type=url]:focus {
349
+ & ~ [class^="btn-"], & ~ .helper {
350
+ display: block;
351
+ }
334
352
  }
335
- input[type=text]:not(:focus) ~ .helper:active, input[type=password]:not(:focus) ~ .helper:active, input[type=email]:not(:focus) ~ .helper:active, input[type=phone]:not(:focus) ~ .helper:active, input[type=url]:not(:focus) ~ .helper:active{
336
- display: block;
353
+
354
+
355
+ input[type=text]:not(:focus),
356
+ input[type=password]:not(:focus),
357
+ input[type=email]:not(:focus),
358
+ input[type=phone]:not(:focus),
359
+ input[type=number]:not(:focus),
360
+ input[type=time]:not(:focus),
361
+ input[type=url]:not(:focus) {
362
+ & ~ [class^="btn-"]:active, & ~ .helper:active {
363
+ display: block;
364
+ }
365
+ }
366
+ }
367
+ input[type=text] {
368
+ & ~ .btn-search, & ~ .btn-date, {
369
+ display: block !important;
337
370
  }
338
371
  }
339
372
  }
@@ -344,7 +377,9 @@
344
377
  position: relative;
345
378
 
346
379
  &.text, &.password {
347
- .helper, .btn-search {
380
+ .helper,
381
+ [class^="btn-"] {
382
+ font-family: "iconFont" !important;
348
383
  background: #fff;// @textbox_pass_inactive_icon 50% no-repeat;
349
384
  top: 2px;
350
385
  width: 26px !important;
@@ -361,9 +396,12 @@
361
396
 
362
397
  &:before {
363
398
  //content: "";
364
- font-size: 12pt;
399
+ font-size: 10pt !important;
365
400
  position: absolute;
366
- #font > .normal;
401
+ color: #000 !important;
402
+ font-family: "iconFont" !important;
403
+ left: 6px;
404
+ top: 4px;
367
405
  }
368
406
 
369
407
 
@@ -383,7 +421,7 @@
383
421
  }
384
422
 
385
423
  &.password {
386
- .helper {
424
+ .helper, .btn-reveal {
387
425
  background: #fff @textbox_pass_inactive_icon 50% no-repeat;
388
426
  &:hover {
389
427
  background: #fff @textbox_pass_active_icon 50% no-repeat;
@@ -391,29 +429,16 @@
391
429
  }
392
430
  }
393
431
  &.text {
394
- .helper {
395
-
432
+ .helper, .btn-clear {
396
433
  &:before {
397
- font-family: iconFont;
398
- font-size: 12px;
399
434
  content: "\e089";
400
- left: 7px;
401
- top: 3px;
402
435
  }
403
-
404
436
  }
405
- }
406
- &.text {
407
- .btn-search {
408
-
409
- &:before {
410
- font-family: iconFont;
411
- font-size: 12px;
412
- content: "\e041";
413
- left: 7px;
414
- top: 3px;
415
- }
416
-
437
+ .btn-search:before {
438
+ content: "\e041";
439
+ }
440
+ .btn-date:before {
441
+ content: "\e020";
417
442
  }
418
443
  }
419
444
  }
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
5
  *
6
6
  * Grid.less
7
7
  *
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * Metro UI CSS
3
- * Copyright 2012 Sergey Pimenov
4
- * Licensed under the MIT License
3
+ * (c) 2012-2013 by Sergey Pimenov
4
+ * Licensed under the MIT License and Commercial
5
5
  *
6
6
  * Hero.less
7
7
  *