Permalink
Browse files

upgrade plugin to twitter-bootstrap v2.0.0

  • Loading branch information...
1 parent 851cfa3 commit 8d1cb72ce990d2a58c3bc95ddfe064465d2dcf7c Karol Balejko committed Feb 2, 2012
Showing with 9,182 additions and 5,557 deletions.
  1. +16 −6 .classpath
  2. +20 −5 README.md
  3. +1 −1 TwitterBootstrapGrailsPlugin.groovy
  4. +59 −16 grails-app/conf/BootstrapResources.groovy
  5. +1 −1 plugin.xml
  6. +0 −57 web-app/css/adaptive.less
  7. +567 −0 web-app/css/bootstrap-responsive.css
  8. +3 −0 web-app/css/bootstrap-responsive.min.css
  9. +2,497 −1,598 web-app/css/bootstrap.css
  10. +0 −26 web-app/css/bootstrap.less
  11. +585 −331 web-app/css/bootstrap.min.css
  12. +0 −479 web-app/css/forms.less
  13. +0 −222 web-app/css/mixins.less
  14. +0 −1,058 web-app/css/patterns.less
  15. +0 −279 web-app/css/preboot.less
  16. +0 −137 web-app/css/scaffolding.less
  17. +0 −224 web-app/css/tables.less
  18. +0 −187 web-app/css/type.less
  19. +0 −60 web-app/css/variables.less
  20. BIN web-app/img/glyphicons-halflings-white.png
  21. BIN web-app/img/glyphicons-halflings.png
  22. +91 −0 web-app/js/bootstrap-alert.js
  23. +0 −113 web-app/js/bootstrap-alerts.js
  24. +98 −0 web-app/js/bootstrap-button.js
  25. +0 −62 web-app/js/bootstrap-buttons.js
  26. +154 −0 web-app/js/bootstrap-carousel.js
  27. +136 −0 web-app/js/bootstrap-collapse.js
  28. +65 −28 web-app/js/bootstrap-dropdown.js
  29. +132 −183 web-app/js/bootstrap-modal.js
  30. +63 −54 web-app/js/bootstrap-popover.js
  31. +86 −68 web-app/js/bootstrap-scrollspy.js
  32. 0 web-app/js/{bootstrap-tabs.js → bootstrap-tab.js}
  33. +270 −0 web-app/js/bootstrap-tooltip.js
  34. +51 −0 web-app/js/bootstrap-transition.js
  35. +0 −310 web-app/js/bootstrap-twipsy.js
  36. +271 −0 web-app/js/bootstrap-typeahead.js
  37. +28 −0 web-app/less/accordion.less
  38. +70 −0 web-app/less/alerts.less
  39. +62 −0 web-app/less/bootstrap.less
  40. +22 −0 web-app/less/breadcrumbs.less
  41. +147 −0 web-app/less/button-groups.less
  42. +165 −0 web-app/less/buttons.less
  43. +121 −0 web-app/less/carousel.less
  44. +18 −0 web-app/less/close.less
  45. +44 −0 web-app/less/code.less
  46. +18 −0 web-app/less/component-animations.less
  47. +131 −0 web-app/less/dropdowns.less
  48. +515 −0 web-app/less/forms.less
  49. +8 −0 web-app/less/grid.less
  50. +20 −0 web-app/less/hero-unit.less
  51. +16 −0 web-app/less/labels.less
  52. +17 −0 web-app/less/layouts.less
  53. +537 −0 web-app/less/mixins.less
  54. +72 −0 web-app/less/modals.less
  55. +292 −0 web-app/less/navbar.less
  56. +343 −0 web-app/less/navs.less
  57. +30 −0 web-app/less/pager.less
  58. +55 −0 web-app/less/pagination.less
  59. +13 −0 web-app/less/patterns.less
  60. +49 −0 web-app/less/popovers.less
  61. +18 −0 web-app/less/print.less
  62. +95 −0 web-app/less/progress-bars.less
  63. +37 −52 web-app/{css → less}/reset.less
  64. +323 −0 web-app/less/responsive.less
  65. +29 −0 web-app/less/scaffolding.less
  66. +156 −0 web-app/less/sprites.less
  67. +139 −0 web-app/less/tables.less
  68. +35 −0 web-app/less/thumbnails.less
  69. +35 −0 web-app/less/tooltip.less
  70. +217 −0 web-app/less/type.less
  71. +23 −0 web-app/less/utilities.less
  72. +99 −0 web-app/less/variables.less
  73. +17 −0 web-app/less/wells.less
View
@@ -13,6 +13,16 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+ <classpathentry kind="src" path=".link_to_grails_plugins/gsp-resources-0.2.1/grails-app/resourceMappers">
+ <attributes>
+ <attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path=".link_to_grails_plugins/lesscss-resources-0.6.1/grails-app/resourceMappers">
+ <attributes>
+ <attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path=".link_to_grails_plugins/release-1.0.0.RC3/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
@@ -23,32 +33,32 @@
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/resources-1.0.2/grails-app/conf">
+ <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/resources-1.1.1/grails-app/conf">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.0.2/grails-app/resourceMappers">
+ <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.1.1/grails-app/i18n">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.0.2/grails-app/services">
+ <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.1.1/grails-app/resourceMappers">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.0.2/grails-app/taglib">
+ <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.1.1/grails-app/taglib">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.0.2/src/groovy">
+ <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.1.1/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.0.2/src/java">
+ <classpathentry kind="src" path=".link_to_grails_plugins/resources-1.1.1/src/java">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
View
@@ -13,16 +13,21 @@ Including the resources
You must use the Grails resources framework to make use of this plugin. The resources exposed by this plugin are:
bootstrap-js - all javascript resources
- bootstrap-css - all css resorces
+ bootstrap-css - all css resources
- bootstrap-alerts - bootstrap alerts javascript resource
+ bootstrap-responsive-css - bootstrap responsive css resource
+ bootstrap-alert - bootstrap alerts javascript resource
bootstrap-dropdown - bootstrap dropdown javascript resource
bootstrap-modal - bootstrap modal javascript resource
bootstrap-popover - bootstrap popover javascript resource
bootstrap-scrollspy - bootstrap scrollspy javascript resource
- bootstrap-tabs - bootstrap tabs javascript resource
- bootstrap-twipsy - bootstrap twipsy javascript resource
- bootstrap-buttons - bootstrap buttons javascript resource
+ bootstrap-tab - bootstrap tabs javascript resource
+ bootstrap-tooltip - bootstrap tooltips javascript resource
+ bootstrap-button - bootstrap buttons javascript resource
+ bootstrap-carousel - bootstrap carousel javascript resource
+ bootstrap-typeahead - bootstrap typeahead javascript resource
+ bootstrap-collapse - bootstrap collapse javascript resource
+ bootstrap-transition - bootstrap transition javascript resource
bootstrap-less - bootstrap less resource
bootstrap - all bootstrap css (or less) and javascript resources
@@ -61,6 +66,16 @@ Versioning
Plugin version convention is <original-twitter-boostrap-version>.<plugin-version>
+History
+-------
+
+2.0.0.15
+ Upgrade to twitter bootstrap v2.0.0.
+
+1.4.0.14
+ Latest stable plugin edition with twitter-bootstrap v1.4.0
+ Plugin documentation for v1.4.0.14 https://github.com/groovydev/twitter-bootstrap-grails-plugin/blob/v1.4.0.14/README.md
+
Copyright and License
---------------------
@@ -4,7 +4,7 @@ import org.groovydev.TwitterBootstrapTagLib
class TwitterBootstrapGrailsPlugin {
// the plugin version
- def version = "1.4.0.14"
+ def version = "2.0.0.15"
// the version or versions of Grails the plugin is designed for
def grailsVersion = "1.3.7 > *"
// the other plugins this plugin depends on
@@ -34,13 +34,20 @@ modules = {
resource url:[plugin: 'twitter-bootstrap', dir: 'css', file: (dev ? cssFile : cssminFile)], disposition: 'head', exclude:'minify'
}
- 'bootstrap-alerts' {
+ 'bootstrap-responsive-css' {
+ defaultBundle configDefaultBundle
+ dependsOn 'bootstrap-css'
+
+ resource url:[plugin: 'twitter-bootstrap', dir: 'css', file: (dev ? 'bootstrap-responsive.css' : 'bootstrap-responsive.min.css')], disposition: 'head', exclude:'minify'
+ }
+
+ 'bootstrap-alert' {
defaultBundle configDefaultBundle
if (jqueryPlugin) {
dependsOn 'jquery'
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-alerts.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-alert.js']
}
'bootstrap-dropdown' {
@@ -49,7 +56,7 @@ modules = {
dependsOn 'jquery'
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-dropdown.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-dropdown.js']
}
'bootstrap-modal' {
@@ -58,18 +65,18 @@ modules = {
dependsOn 'jquery'
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-modal.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-modal.js']
}
'bootstrap-popover' {
defaultBundle configDefaultBundle
- dependsOn 'bootstrap-twipsy'
+ dependsOn 'bootstrap-tooltip'
if (jqueryPlugin) {
dependsOn 'jquery'
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-popover.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-popover.js']
}
'bootstrap-scrollspy' {
@@ -78,50 +85,86 @@ modules = {
dependsOn 'jquery'
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-scrollspy.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-scrollspy.js']
}
- 'bootstrap-tabs' {
+ 'bootstrap-tab' {
defaultBundle configDefaultBundle
if (jqueryPlugin) {
dependsOn "jquery"
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-tabs.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-tab.js']
}
- 'bootstrap-twipsy' {
+ 'bootstrap-tooltip' {
defaultBundle configDefaultBundle
if (jqueryPlugin) {
dependsOn "jquery"
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-twipsy.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-tooltip.js']
}
- 'bootstrap-buttons' {
+ 'bootstrap-button' {
defaultBundle configDefaultBundle
if (jqueryPlugin) {
dependsOn "jquery"
}
- resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-buttons.js'], disposition: 'head'
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-button.js']
+ }
+
+ 'bootstrap-carousel' {
+ defaultBundle configDefaultBundle
+ if (jqueryPlugin) {
+ dependsOn "jquery"
+ }
+
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-carousel.js']
+ }
+
+ 'bootstrap-typeahead' {
+ defaultBundle configDefaultBundle
+ if (jqueryPlugin) {
+ dependsOn "jquery"
+ }
+
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-typeahead.js']
+ }
+
+ 'bootstrap-collapse' {
+ defaultBundle configDefaultBundle
+ if (jqueryPlugin) {
+ dependsOn "jquery"
+ }
+
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-collapse.js']
+ }
+
+ 'bootstrap-transition' {
+ defaultBundle configDefaultBundle
+ if (jqueryPlugin) {
+ dependsOn "jquery"
+ }
+
+ resource url:[plugin: 'twitter-bootstrap', dir: 'js', file: 'bootstrap-transition.js']
}
'bootstrap-js' {
defaultBundle configDefaultBundle
if (jqueryPlugin) {
dependsOn 'jquery'
}
- dependsOn 'bootstrap-alerts,bootstrap-dropdown,bootstrap-modal,bootstrap-scrollspy,bootstrap-tabs,bootstrap-twipsy,bootstrap-popover,bootstrap-buttons'
+ dependsOn 'bootstrap-transition,bootstrap-alert,bootstrap-dropdown,bootstrap-modal,bootstrap-scrollspy,bootstrap-tab,bootstrap-tooltip,bootstrap-popover,bootstrap-button,bootstrap-carousel,bootstrap-typeahead,bootstrap-collapse'
}
'bootstrap-less' {
defaultBundle configDefaultBundle
if (configTagLib) {
dependsOn 'bootstrap-fixtaglib'
}
- resource id:'bootstrap-less', url:[plugin: 'twitter-bootstrap', dir: 'css', file: 'bootstrap.less'], attrs:[rel: "stylesheet/less", type:'css'], disposition: 'head'
+ resource id:'bootstrap-less', url:[plugin: 'twitter-bootstrap', dir: 'less', file: 'bootstrap.less'], attrs:[rel: "stylesheet/less", type:'css'], disposition: 'head'
}
bootstrap {
@@ -131,7 +174,7 @@ modules = {
} else {
dependsOn 'bootstrap-css'
}
- dependsOn 'bootstrap-js'
+ dependsOn 'bootstrap-responsive-css,bootstrap-js'
}
}
View
@@ -1,4 +1,4 @@
-<plugin name='twitter-bootstrap' version='1.4.0.14' grailsVersion='1.3.7 &gt; *'>
+<plugin name='twitter-bootstrap' version='2.0.0.15' grailsVersion='1.3.7 &gt; *'>
<author>Karol Balejko</author>
<authorEmail>kb@groovydev.org</authorEmail>
<title>Plugin Twitter Bootstrap CSS framework resource files</title>
View
@@ -1,57 +0,0 @@
-/* Responsive.less
- * Adjusted grid styles to handle some common screen sizes
- * ------------------------------------------------------- */
-
-
-// MOBILE PORTRAIT & LANDSCAPE
-// ---------------------------
-// For devices narrower than 480px
-@media only screen and (max-width: 480px) {
-
- // Remove fixed width of containers
- .container {
- width: auto;
- padding: 0 10px;
- }
-
- // Undo the floating of columns
- .row {
- margin-left: 0;
- }
- .row [class^="span"] {
- float: none;
- width: 100%;
- display: block;
- margin-left: 0;
- }
-
- // Stack form elements instead of floating them
- fieldset legend {
- margin-left: 0;
- }
- label {
- float: none;
- width: auto;
- text-align: left;
- }
- div.input {
- margin-left: 0;
- width: 100%;
- }
- .input-xxlarge,
- input.xxlarge,
- textarea.xxlarge,
- select.xxlarge {
- width: 80%;
- }
-
- // Adjust modal
- .modal-backdrop {
- padding: 10px;
- }
- .modal {
- width: 100%;
- margin: 0;
- left: auto;
- }
-}
Oops, something went wrong.

0 comments on commit 8d1cb72

Please sign in to comment.