patternfly-sass 1.3.1 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (88) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +3 -0
  3. data/README.md +1 -1
  4. data/Rakefile +21 -18
  5. data/assets/fonts/patternfly/PatternFlyIcons-webfont.eot +0 -0
  6. data/assets/fonts/patternfly/PatternFlyIcons-webfont.svg +40 -38
  7. data/assets/fonts/patternfly/PatternFlyIcons-webfont.ttf +0 -0
  8. data/assets/fonts/patternfly/PatternFlyIcons-webfont.woff +0 -0
  9. data/assets/javascripts/patternfly.js +111 -109
  10. data/assets/javascripts/patternfly.min.js +1 -1
  11. data/assets/stylesheets/_patternfly.scss +36 -40
  12. data/assets/stylesheets/patternfly/_alerts.scss +1 -1
  13. data/assets/stylesheets/patternfly/_bootstrap-datepicker-css.scss +752 -0
  14. data/assets/stylesheets/patternfly/_bootstrap-datepicker.scss +71 -0
  15. data/assets/stylesheets/patternfly/_bootstrap-select-css.scss +211 -257
  16. data/assets/stylesheets/patternfly/{c3-css.scss → _c3-css.scss} +0 -0
  17. data/assets/stylesheets/patternfly/_cards.scss +60 -0
  18. data/assets/stylesheets/patternfly/_icons.scss +18 -36
  19. data/assets/stylesheets/patternfly/_login.scss +0 -21
  20. data/assets/stylesheets/patternfly/_mixin_overrides.scss +4 -2
  21. data/assets/stylesheets/patternfly/_mixins.scss +16 -2
  22. data/assets/stylesheets/patternfly/_navbar.scss +0 -11
  23. data/assets/stylesheets/patternfly/_pagination.scss +2 -2
  24. data/assets/stylesheets/patternfly/_spinner.scss +12 -14
  25. data/assets/stylesheets/patternfly/_tooltip.scss +1 -2
  26. data/assets/stylesheets/patternfly/_variables.scss +12 -8
  27. data/bower.json +5 -3
  28. data/lib/patternfly-sass/version.rb +2 -2
  29. data/patternfly-sass.gemspec +3 -2
  30. data/spec/compare_spec.rb +17 -2
  31. data/spec/html/accordions.html +15 -12
  32. data/spec/html/alerts.html +15 -12
  33. data/spec/html/badges.html +15 -12
  34. data/spec/html/basic.html +437 -431
  35. data/spec/html/blank-slate.html +16 -13
  36. data/spec/html/bootstrap-combobox.html +15 -12
  37. data/spec/html/bootstrap-datepicker.html +72 -0
  38. data/spec/html/bootstrap-select.html +17 -17
  39. data/spec/html/bootstrap-treeview-2.html +87 -85
  40. data/spec/html/bootstrap-treeview.html +15 -15
  41. data/spec/html/breadcrumbs.html +15 -12
  42. data/spec/html/buttons.html +15 -12
  43. data/spec/html/cards.html +301 -0
  44. data/spec/html/charts.html +17 -14
  45. data/spec/html/code.html +15 -12
  46. data/spec/html/dashboard.html +18 -12
  47. data/spec/html/datatables-columns.html +434 -431
  48. data/spec/html/datatables.html +434 -431
  49. data/spec/html/dist/css/patternfly-additions.css +3394 -0
  50. data/spec/html/dist/css/patternfly-additions.css.map +1 -0
  51. data/spec/html/dist/css/patternfly-additions.min.css +2 -0
  52. data/spec/html/dist/css/patternfly-additions.min.css.map +1 -0
  53. data/spec/html/dist/css/patternfly.css +836 -2797
  54. data/spec/html/dist/css/patternfly.css.map +1 -0
  55. data/spec/html/dist/css/patternfly.min.css +7 -8
  56. data/spec/html/dist/css/patternfly.min.css.map +1 -0
  57. data/spec/html/dist/css/styles-additions.css +1 -0
  58. data/spec/html/dist/css/styles-additions.min.css +1 -0
  59. data/spec/html/dropdowns.html +15 -12
  60. data/spec/html/form.html +87 -86
  61. data/spec/html/forms.html +15 -12
  62. data/spec/html/icons.html +47 -38
  63. data/spec/html/index.html +21 -12
  64. data/spec/html/infotip.html +15 -12
  65. data/spec/html/labels.html +15 -12
  66. data/spec/html/list-group.html +15 -12
  67. data/spec/html/login.html +15 -12
  68. data/spec/html/modals.html +15 -12
  69. data/spec/html/navbar.html +77 -824
  70. data/spec/html/pagination.html +15 -12
  71. data/spec/html/panels.html +15 -12
  72. data/spec/html/popovers.html +25 -13
  73. data/spec/html/progress-bars.html +15 -12
  74. data/spec/html/search.html +15 -12
  75. data/spec/html/spinner.html +16 -13
  76. data/spec/html/tab.html +438 -432
  77. data/spec/html/tables.html +15 -12
  78. data/spec/html/tabs.html +15 -12
  79. data/spec/html/tooltip.html +15 -12
  80. data/spec/html/typography-2.html +18 -12
  81. data/spec/html/typography.html +15 -12
  82. data/tasks/converter.rb +24 -36
  83. metadata +44 -17
  84. data/spec/capture.js +0 -43
  85. data/spec/html/img/dashboard-1.png +0 -0
  86. data/spec/html/img/dashboard-2.png +0 -0
  87. data/spec/html/img/dashboard-4.png +0 -0
  88. data/spec/html/main.html +0 -16
data/spec/html/tables.html CHANGED
@@ -1,5 +1,4 @@
1
1
  <!DOCTYPE html>
2
- <!--[if IE 8]><html class="ie8"><![endif]-->
3
2
  <!--[if IE 9]><html class="ie9"><![endif]-->
4
3
  <!--[if gt IE 9]><!-->
5
4
  <html>
@@ -8,19 +7,23 @@
8
7
  <title>Tables - PatternFly</title>
9
8
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
10
9
  <link rel="shortcut icon" href="../dist/img/favicon.ico">
11
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-144-precomposed.png">
12
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-114-precomposed.png">
13
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-72-precomposed.png">
14
- <link rel="apple-touch-icon-precomposed" href="../dist/img/apple-touch-icon-57-precomposed.png">
10
+ <!-- iPad retina icon -->
11
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
12
+ <!-- iPad retina icon (iOS < 7) -->
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
14
+ <!-- iPad non-retina icon -->
15
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
16
+ <!-- iPad non-retina icon (iOS < 7) -->
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
18
+ <!-- iPhone 6 Plus icon -->
19
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
20
+ <!-- iPhone retina icon (iOS < 7) -->
21
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
22
+ <!-- iPhone non-retina icon (iOS < 7) -->
23
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
15
24
  <link href="../dist/css/patternfly.min.css" rel="stylesheet" media="screen, print">
25
+ <link href="../dist/css/patternfly-additions.min.css" rel="stylesheet" media="screen, print">
16
26
  <link href="tests.css" rel="stylesheet" media="screen, print">
17
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
18
- <!--[if lt IE 9]>
19
- <script src="../components/html5shiv/dist/html5shiv.min.js"></script>
20
- <script src="../components/respond/dest/respond.min.js"></script>
21
- <![endif]-->
22
- <!-- IE8 requires jQuery and Bootstrap JS to load in head to prevent rendering bugs -->
23
- <!-- IE8 requires jQuery v1.x -->
24
27
  <script src="../components/jquery/dist/jquery.min.js"></script>
25
28
  <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
26
29
  <script src="../dist/js/patternfly.min.js"></script>
data/spec/html/tabs.html CHANGED
@@ -1,5 +1,4 @@
1
1
  <!DOCTYPE html>
2
- <!--[if IE 8]><html class="ie8"><![endif]-->
3
2
  <!--[if IE 9]><html class="ie9"><![endif]-->
4
3
  <!--[if gt IE 9]><!-->
5
4
  <html>
@@ -8,19 +7,23 @@
8
7
  <title>Tabs - PatternFly</title>
9
8
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
10
9
  <link rel="shortcut icon" href="../dist/img/favicon.ico">
11
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-144-precomposed.png">
12
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-114-precomposed.png">
13
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-72-precomposed.png">
14
- <link rel="apple-touch-icon-precomposed" href="../dist/img/apple-touch-icon-57-precomposed.png">
10
+ <!-- iPad retina icon -->
11
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
12
+ <!-- iPad retina icon (iOS < 7) -->
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
14
+ <!-- iPad non-retina icon -->
15
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
16
+ <!-- iPad non-retina icon (iOS < 7) -->
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
18
+ <!-- iPhone 6 Plus icon -->
19
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
20
+ <!-- iPhone retina icon (iOS < 7) -->
21
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
22
+ <!-- iPhone non-retina icon (iOS < 7) -->
23
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
15
24
  <link href="../dist/css/patternfly.min.css" rel="stylesheet" media="screen, print">
25
+ <link href="../dist/css/patternfly-additions.min.css" rel="stylesheet" media="screen, print">
16
26
  <link href="tests.css" rel="stylesheet" media="screen, print">
17
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
18
- <!--[if lt IE 9]>
19
- <script src="../components/html5shiv/dist/html5shiv.min.js"></script>
20
- <script src="../components/respond/dest/respond.min.js"></script>
21
- <![endif]-->
22
- <!-- IE8 requires jQuery and Bootstrap JS to load in head to prevent rendering bugs -->
23
- <!-- IE8 requires jQuery v1.x -->
24
27
  <script src="../components/jquery/dist/jquery.min.js"></script>
25
28
  <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
26
29
  <script src="../dist/js/patternfly.min.js"></script>
data/spec/html/tooltip.html CHANGED
@@ -1,5 +1,4 @@
1
1
  <!DOCTYPE html>
2
- <!--[if IE 8]><html class="ie8"><![endif]-->
3
2
  <!--[if IE 9]><html class="ie9"><![endif]-->
4
3
  <!--[if gt IE 9]><!-->
5
4
  <html>
@@ -8,19 +7,23 @@
8
7
  <title>Tooltip - PatternFly</title>
9
8
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
10
9
  <link rel="shortcut icon" href="../dist/img/favicon.ico">
11
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-144-precomposed.png">
12
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-114-precomposed.png">
13
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-72-precomposed.png">
14
- <link rel="apple-touch-icon-precomposed" href="../dist/img/apple-touch-icon-57-precomposed.png">
10
+ <!-- iPad retina icon -->
11
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
12
+ <!-- iPad retina icon (iOS < 7) -->
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
14
+ <!-- iPad non-retina icon -->
15
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
16
+ <!-- iPad non-retina icon (iOS < 7) -->
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
18
+ <!-- iPhone 6 Plus icon -->
19
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
20
+ <!-- iPhone retina icon (iOS < 7) -->
21
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
22
+ <!-- iPhone non-retina icon (iOS < 7) -->
23
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
15
24
  <link href="../dist/css/patternfly.min.css" rel="stylesheet" media="screen, print">
25
+ <link href="../dist/css/patternfly-additions.min.css" rel="stylesheet" media="screen, print">
16
26
  <link href="tests.css" rel="stylesheet" media="screen, print">
17
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
18
- <!--[if lt IE 9]>
19
- <script src="../components/html5shiv/dist/html5shiv.min.js"></script>
20
- <script src="../components/respond/dest/respond.min.js"></script>
21
- <![endif]-->
22
- <!-- IE8 requires jQuery and Bootstrap JS to load in head to prevent rendering bugs -->
23
- <!-- IE8 requires jQuery v1.x -->
24
27
  <script src="../components/jquery/dist/jquery.min.js"></script>
25
28
  <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
26
29
  <script src="../dist/js/patternfly.min.js"></script>
data/spec/html/typography-2.html CHANGED
@@ -1,5 +1,4 @@
1
1
  <!DOCTYPE html>
2
- <!--[if IE 8]><html class="ie8"><![endif]-->
3
2
  <!--[if IE 9]><html class="ie9"><![endif]-->
4
3
  <!--[if gt IE 9]><!-->
5
4
  <html>
@@ -8,19 +7,23 @@
8
7
  <title>Typography - PatternFly</title>
9
8
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
10
9
  <link rel="shortcut icon" href="../dist/img/favicon.ico">
11
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-144-precomposed.png">
12
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-114-precomposed.png">
13
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-72-precomposed.png">
14
- <link rel="apple-touch-icon-precomposed" href="../dist/img/apple-touch-icon-57-precomposed.png">
10
+ <!-- iPad retina icon -->
11
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
12
+ <!-- iPad retina icon (iOS < 7) -->
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
14
+ <!-- iPad non-retina icon -->
15
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
16
+ <!-- iPad non-retina icon (iOS < 7) -->
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
18
+ <!-- iPhone 6 Plus icon -->
19
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
20
+ <!-- iPhone retina icon (iOS < 7) -->
21
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
22
+ <!-- iPhone non-retina icon (iOS < 7) -->
23
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
15
24
  <link href="../dist/css/patternfly.min.css" rel="stylesheet" media="screen, print">
25
+ <link href="../dist/css/patternfly-additions.min.css" rel="stylesheet" media="screen, print">
16
26
  <link href="typography-2.css" rel="stylesheet" media="screen, print">
17
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
18
- <!--[if lt IE 9]>
19
- <script src="../components/html5shiv/dist/html5shiv.min.js"></script>
20
- <script src="../components/respond/dest/respond.min.js"></script>
21
- <![endif]-->
22
- <!-- IE8 requires jQuery and Bootstrap JS to load in head to prevent rendering bugs -->
23
- <!-- IE8 requires jQuery v1.x -->
24
27
  <script src="../components/jquery/dist/jquery.min.js"></script>
25
28
  <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
26
29
  <script src="../dist/js/patternfly.min.js"></script>
@@ -108,6 +111,9 @@
108
111
  <li class="active">
109
112
  <a href="typography-2.html" class="active">Typography</a>
110
113
  </li>
114
+ <li>
115
+ <a href="cards.html">Cards</a>
116
+ </li>
111
117
  </ul>
112
118
  </div>
113
119
  </nav>
data/spec/html/typography.html CHANGED
@@ -1,5 +1,4 @@
1
1
  <!DOCTYPE html>
2
- <!--[if IE 8]><html class="ie8"><![endif]-->
3
2
  <!--[if IE 9]><html class="ie9"><![endif]-->
4
3
  <!--[if gt IE 9]><!-->
5
4
  <html>
@@ -8,19 +7,23 @@
8
7
  <title>Typography - PatternFly</title>
9
8
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
10
9
  <link rel="shortcut icon" href="../dist/img/favicon.ico">
11
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-144-precomposed.png">
12
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-114-precomposed.png">
13
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-72-precomposed.png">
14
- <link rel="apple-touch-icon-precomposed" href="../dist/img/apple-touch-icon-57-precomposed.png">
10
+ <!-- iPad retina icon -->
11
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
12
+ <!-- iPad retina icon (iOS < 7) -->
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
14
+ <!-- iPad non-retina icon -->
15
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
16
+ <!-- iPad non-retina icon (iOS < 7) -->
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
18
+ <!-- iPhone 6 Plus icon -->
19
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
20
+ <!-- iPhone retina icon (iOS < 7) -->
21
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
22
+ <!-- iPhone non-retina icon (iOS < 7) -->
23
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
15
24
  <link href="../dist/css/patternfly.min.css" rel="stylesheet" media="screen, print">
25
+ <link href="../dist/css/patternfly-additions.min.css" rel="stylesheet" media="screen, print">
16
26
  <link href="tests.css" rel="stylesheet" media="screen, print">
17
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
18
- <!--[if lt IE 9]>
19
- <script src="../components/html5shiv/dist/html5shiv.min.js"></script>
20
- <script src="../components/respond/dest/respond.min.js"></script>
21
- <![endif]-->
22
- <!-- IE8 requires jQuery and Bootstrap JS to load in head to prevent rendering bugs -->
23
- <!-- IE8 requires jQuery v1.x -->
24
27
  <script src="../components/jquery/dist/jquery.min.js"></script>
25
28
  <script src="../components/bootstrap/dist/js/bootstrap.min.js"></script>
26
29
  <script src="../dist/js/patternfly.min.js"></script>
data/tasks/converter.rb CHANGED
@@ -29,6 +29,7 @@ module Patternfly
29
29
  BOOTSTRAP_LESS_ROOT,
30
30
  'components/bootstrap-select',
31
31
  'components/bootstrap-combobox',
32
+ 'components/bootstrap-datepicker',
32
33
  'components/c3',
33
34
  'tests',
34
35
  'dist'
@@ -89,6 +90,8 @@ module Patternfly
89
90
  log_status "Processing stylesheets..."
90
91
  files = read_files(bootstrap_less_files)
91
92
  files['less/mixin_overrides.less'] = files['less/mixins.less'].dup
93
+ # Merge the two separated top level files because they will be splitted on a higher level
94
+ files['less/patternfly.less'] += files.delete('less/patternfly-additions.less')
92
95
  save_to = @save_to[:scss]
93
96
 
94
97
  files.each do |name, file|
@@ -120,11 +123,8 @@ module Patternfly
120
123
  NESTED_MIXINS.each do |selector, prefix|
121
124
  file = flatten_mixins(file, selector, prefix)
122
125
  end
123
- file = replace_all(
124
- file,
125
- /,\s*\.open\s+\.dropdown-toggle& \{(.*?)\}/m,
126
- " {\\1}\n .open & { &.dropdown-toggle {\\1} }")
127
- when 'mixin_overrides.less'
126
+ file = replace_all(file, /,\s*\.open\s+\.dropdown-toggle& \{([^\{\}]*?)\}/m, " {\\1}\n .open & { &.dropdown-toggle {\\1} }")
127
+ file = replace_all(file, /,\s*\.open\s+\.dropdown-toggle& \{(.*?\{.*?\}.*?)\}/m, " {\\1}\n .open & { &.dropdown-toggle {\\1} }") when 'mixin_overrides.less'
128
128
  NESTED_MIXINS.each do |selector, prefix|
129
129
  file = flatten_mixins(file, selector, prefix)
130
130
  end
@@ -139,16 +139,11 @@ module Patternfly
139
139
 
140
140
  when 'patternfly.less'
141
141
  file = fix_top_level(file)
142
- # This is a hack. We want bootstrap-select to be placed in
143
- # the final compiled CSS, but Sass doesn't insert a file's contents
144
- # when that file has a '.css' extension. Sass just uses a @import
145
- # statement. This method moves the bootstrap-select.css into our
146
- # output directory and renames it with a '.scss' extension.
147
- add_to_dist("bootstrap-select/bootstrap-select.css", "_bootstrap-select-css.scss")
148
- # bootstrap-combobox
142
+ # Load external components with a '-css' suffix to distinguish them from our additions
143
+ add_to_dist("bootstrap-select/dist/css/bootstrap-select.css", "_bootstrap-select-css.scss")
149
144
  add_to_dist("bootstrap-combobox/css/bootstrap-combobox.css", "_bootstrap-combobox-css.scss")
150
- # c3
151
- add_to_dist("c3/c3.css", "c3-css.scss")
145
+ add_to_dist("bootstrap-datepicker/dist/css/bootstrap-datepicker3.css", "_bootstrap-datepicker-css.scss")
146
+ add_to_dist("c3/c3.css", "_c3-css.scss")
152
147
  end
153
148
 
154
149
  name_out = "#{File.basename(name, ".less")}.scss"
@@ -164,6 +159,7 @@ module Patternfly
164
159
 
165
160
  def add_to_dist(name, name_out)
166
161
  in_file = File.join('components', name);
162
+ puts in_file
167
163
  in_dir = File.dirname(in_file)
168
164
  dir_files = get_paths_by_directory(in_dir)
169
165
  file = read_files(dir_files)[in_file]
@@ -221,35 +217,27 @@ module Patternfly
221
217
  end
222
218
 
223
219
  def fix_top_level(file)
224
- file = replace_all(
225
- file,
226
- %r{@import\s+"variables";},
227
- "")
220
+ file = replace_all(file, %r{@import\s+"variables";}, "")
228
221
  file = replace_all(file, /@import "([^\.]{2})/, '@import "patternfly/\1')
229
- file = replace_all(
230
- file,
231
- %r{../components/font-awesome/less/font-awesome},
232
- "font-awesome")
233
- file = replace_all(
234
- file,
235
- %r{../components/bootstrap-select/bootstrap-select.css},
236
- "patternfly/bootstrap-select-css")
237
- file = replace_all(
238
- file,
239
- %r{@import\s+"../components/bootstrap/less/bootstrap";},
240
- fetch_bootstrap_sass)
241
-
242
- file = replace_all(
243
- file,
244
- %r{../components/bootstrap-combobox/less/combobox},
245
- "patternfly/bootstrap-combobox-css")
222
+ file = replace_all(file, %r{../components/font-awesome/less/font-awesome}, "font-awesome")
223
+ file = replace_all(file, %r{../components/bootstrap-select/less/bootstrap-select}, "patternfly/bootstrap-select-css")
224
+ file = replace_all(file, %r{@import\s+"../components/bootstrap/less/bootstrap";}, fetch_bootstrap_sass)
225
+ file = replace_all(file, %r{../components/bootstrap-combobox/less/combobox}, "patternfly/bootstrap-combobox-css")
226
+ file = replace_all(file, %r{../components/bootstrap-datepicker/less/datepicker3}, "patternfly/bootstrap-datepicker-css")
246
227
  file = replace_all(file, %r{../components/c3/c3.css}, "patternfly/c3-css")
247
228
 
229
+
230
+ # Remove undesired lines from the merged top level file
231
+ file = replace_all(file, "@import \"../components/bootstrap/less/variables\";\n", "")
232
+ file = replace_all(file, "// Bootstrap variables and mixins\n@import \"../components/bootstrap/less/mixins\";\n", "")
233
+ file = replace_all(file, "// Font Awesome variables\n@import \"../components/font-awesome/less/variables\";\n", "")
234
+ # Remove duplicate lines
235
+ file = file.split("\n").uniq.join("\n").concat("\n")
236
+
248
237
  # Variables need to be declared before they are used.
249
238
  variables = <<-VAR.gsub(/^\s*/, '')
250
239
  @import "patternfly/variables";
251
240
  @import "bootstrap/variables";
252
- @import "font-awesome/variables";
253
241
  VAR
254
242
  variables + file
255
243
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: patternfly-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dávid Halász
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-06-18 00:00:00.000000000 Z
12
+ date: 2015-08-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - ~>
19
19
  - !ruby/object:Gem::Version
20
- version: '3.2'
20
+ version: 3.4.15
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: '3.2'
27
+ version: 3.4.15
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: bootstrap-sass
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - ~>
33
33
  - !ruby/object:Gem::Version
34
- version: 3.3.4.1
34
+ version: 3.3.5
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - ~>
40
40
  - !ruby/object:Gem::Version
41
- version: 3.3.4.1
41
+ version: 3.3.5
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: font-awesome-sass
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
137
137
  - - ~>
138
138
  - !ruby/object:Gem::Version
139
139
  version: 0.0.4
140
+ - !ruby/object:Gem::Dependency
141
+ name: selenium-webdriver
142
+ requirement: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ - - ~>
145
+ - !ruby/object:Gem::Version
146
+ version: '2.46'
147
+ type: :development
148
+ prerelease: false
149
+ version_requirements: !ruby/object:Gem::Requirement
150
+ requirements:
151
+ - - ~>
152
+ - !ruby/object:Gem::Version
153
+ version: '2.46'
140
154
  description:
141
155
  email: patternflyui@gmail.com
142
156
  executables: []
@@ -221,11 +235,15 @@ files:
221
235
  - assets/stylesheets/patternfly/_blank-slate.scss
222
236
  - assets/stylesheets/patternfly/_bootstrap-combobox-css.scss
223
237
  - assets/stylesheets/patternfly/_bootstrap-combobox.scss
238
+ - assets/stylesheets/patternfly/_bootstrap-datepicker-css.scss
239
+ - assets/stylesheets/patternfly/_bootstrap-datepicker.scss
224
240
  - assets/stylesheets/patternfly/_bootstrap-select-css.scss
225
241
  - assets/stylesheets/patternfly/_bootstrap-select.scss
226
242
  - assets/stylesheets/patternfly/_bootstrap-treeview.scss
227
243
  - assets/stylesheets/patternfly/_breadcrumbs.scss
228
244
  - assets/stylesheets/patternfly/_buttons.scss
245
+ - assets/stylesheets/patternfly/_c3-css.scss
246
+ - assets/stylesheets/patternfly/_cards.scss
229
247
  - assets/stylesheets/patternfly/_charts.scss
230
248
  - assets/stylesheets/patternfly/_close.scss
231
249
  - assets/stylesheets/patternfly/_datatables.scss
@@ -255,13 +273,11 @@ files:
255
273
  - assets/stylesheets/patternfly/_tooltip.scss
256
274
  - assets/stylesheets/patternfly/_type.scss
257
275
  - assets/stylesheets/patternfly/_variables.scss
258
- - assets/stylesheets/patternfly/c3-css.scss
259
276
  - bower.json
260
277
  - lib/patternfly-sass.rb
261
278
  - lib/patternfly-sass/engine.rb
262
279
  - lib/patternfly-sass/version.rb
263
280
  - patternfly-sass.gemspec
264
- - spec/capture.js
265
281
  - spec/compare_spec.rb
266
282
  - spec/html/accordions.html
267
283
  - spec/html/alerts.html
@@ -269,34 +285,40 @@ files:
269
285
  - spec/html/basic.html
270
286
  - spec/html/blank-slate.html
271
287
  - spec/html/bootstrap-combobox.html
288
+ - spec/html/bootstrap-datepicker.html
272
289
  - spec/html/bootstrap-select.html
273
290
  - spec/html/bootstrap-treeview-2.html
274
291
  - spec/html/bootstrap-treeview.html
275
292
  - spec/html/breadcrumbs.html
276
293
  - spec/html/buttons.html
294
+ - spec/html/cards.html
277
295
  - spec/html/charts.html
278
296
  - spec/html/code.html
279
297
  - spec/html/dashboard.html
280
298
  - spec/html/datatables-columns.html
281
299
  - spec/html/datatables.html
300
+ - spec/html/dist/css/patternfly-additions.css
301
+ - spec/html/dist/css/patternfly-additions.css.map
302
+ - spec/html/dist/css/patternfly-additions.min.css
303
+ - spec/html/dist/css/patternfly-additions.min.css.map
282
304
  - spec/html/dist/css/patternfly.css
305
+ - spec/html/dist/css/patternfly.css.map
283
306
  - spec/html/dist/css/patternfly.min.css
307
+ - spec/html/dist/css/patternfly.min.css.map
308
+ - spec/html/dist/css/styles-additions.css
309
+ - spec/html/dist/css/styles-additions.min.css
284
310
  - spec/html/dist/css/styles.css
285
311
  - spec/html/dist/css/styles.min.css
286
312
  - spec/html/dropdowns.html
287
313
  - spec/html/form.html
288
314
  - spec/html/forms.html
289
315
  - spec/html/icons.html
290
- - spec/html/img/dashboard-1.png
291
- - spec/html/img/dashboard-2.png
292
316
  - spec/html/img/dashboard-3.png
293
- - spec/html/img/dashboard-4.png
294
317
  - spec/html/index.html
295
318
  - spec/html/infotip.html
296
319
  - spec/html/labels.html
297
320
  - spec/html/list-group.html
298
321
  - spec/html/login.html
299
- - spec/html/main.html
300
322
  - spec/html/modals.html
301
323
  - spec/html/navbar.html
302
324
  - spec/html/pagination.html
@@ -340,7 +362,6 @@ signing_key:
340
362
  specification_version: 4
341
363
  summary: Red Hat's Patternfly, converted to Sass and ready to drop into Rails
342
364
  test_files:
343
- - spec/capture.js
344
365
  - spec/compare_spec.rb
345
366
  - spec/html/accordions.html
346
367
  - spec/html/alerts.html
@@ -348,34 +369,40 @@ test_files:
348
369
  - spec/html/basic.html
349
370
  - spec/html/blank-slate.html
350
371
  - spec/html/bootstrap-combobox.html
372
+ - spec/html/bootstrap-datepicker.html
351
373
  - spec/html/bootstrap-select.html
352
374
  - spec/html/bootstrap-treeview-2.html
353
375
  - spec/html/bootstrap-treeview.html
354
376
  - spec/html/breadcrumbs.html
355
377
  - spec/html/buttons.html
378
+ - spec/html/cards.html
356
379
  - spec/html/charts.html
357
380
  - spec/html/code.html
358
381
  - spec/html/dashboard.html
359
382
  - spec/html/datatables-columns.html
360
383
  - spec/html/datatables.html
384
+ - spec/html/dist/css/patternfly-additions.css
385
+ - spec/html/dist/css/patternfly-additions.css.map
386
+ - spec/html/dist/css/patternfly-additions.min.css
387
+ - spec/html/dist/css/patternfly-additions.min.css.map
361
388
  - spec/html/dist/css/patternfly.css
389
+ - spec/html/dist/css/patternfly.css.map
362
390
  - spec/html/dist/css/patternfly.min.css
391
+ - spec/html/dist/css/patternfly.min.css.map
392
+ - spec/html/dist/css/styles-additions.css
393
+ - spec/html/dist/css/styles-additions.min.css
363
394
  - spec/html/dist/css/styles.css
364
395
  - spec/html/dist/css/styles.min.css
365
396
  - spec/html/dropdowns.html
366
397
  - spec/html/form.html
367
398
  - spec/html/forms.html
368
399
  - spec/html/icons.html
369
- - spec/html/img/dashboard-1.png
370
- - spec/html/img/dashboard-2.png
371
400
  - spec/html/img/dashboard-3.png
372
- - spec/html/img/dashboard-4.png
373
401
  - spec/html/index.html
374
402
  - spec/html/infotip.html
375
403
  - spec/html/labels.html
376
404
  - spec/html/list-group.html
377
405
  - spec/html/login.html
378
- - spec/html/main.html
379
406
  - spec/html/modals.html
380
407
  - spec/html/navbar.html
381
408
  - spec/html/pagination.html