GitBlixt
teagles/wagon

fix issues when generating a content type (localized was missing) and bootstrap / foundation sites

did committed Jun 14, 2014
commit 863aa422547123f3e751fd8fbb1d9d851d879a85
Showing 5 changed files with 54 additions and 139 deletions
generators/bootstrap3/app/views/pages/index.liquid +3 -45
@@ @@ -20,51 +20,9 @@ published: true
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/samples/apple-touch-icon-114x114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/samples/apple-touch-icon-72x72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="/samples/apple-touch-icon-precomposed.png">
- <!-- CSS code from Bootply.com editor -->
- <style type="text/css">
- @media screen and (min-width: 992px) {
- .the-icons li {
- width: 12.5%;
- }
- }
- .the-buttons > li {
- float: left;
- height: 80px;
- padding: 10px;
- border: 1px solid #ddd;
- font-size: 12px;
- line-height: 1.25;
- text-align: center;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0 -1px -1px 0;
- }
- .the-icons .glyphicon {
- display: block;
- margin: 5px auto;
- vertical-align: middle;
- margin-right: 3px;
- font-size: 24px;
- }
- .the-icons li {
- float: left;
- width: 100px;
- height: 110px;
- padding: 10px;
- border: 1px solid #ddd;
- font-size: 12px;
- line-height: 1.25;
- text-align: center;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0 -1px -1px 0;
- }
- .the-icons, .the-buttons {
- list-style:none;
- }
- </style>
+
+ {% inline_editor %}
+
</head>
<body>
<div class="container">
generators/bootstrap3/app/views/pages/index.liquid.haml +1 -44
@@ @@ -20,50 +20,7 @@ published: true
%link{rel: "apple-touch-icon-precomposed", sizes: "72x72", href: "/samples/apple-touch-icon-72x72-precomposed.png"}/
%link{rel: "apple-touch-icon-precomposed", href: "/samples/apple-touch-icon-precomposed.png"}/
- / CSS code from Bootply.com editor
- :css
- @media screen and (min-width: 992px) {
- .the-icons li {
- width: 12.5%;
- }
- }
- .the-buttons > li {
- float: left;
- height: 80px;
- padding: 10px;
- border: 1px solid #ddd;
- font-size: 12px;
- line-height: 1.25;
- text-align: center;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0 -1px -1px 0;
- }
- .the-icons .glyphicon {
- display: block;
- margin: 5px auto;
- vertical-align: middle;
- margin-right: 3px;
- font-size: 24px;
- }
- .the-icons li {
- float: left;
- width: 100px;
- height: 110px;
- padding: 10px;
- border: 1px solid #ddd;
- font-size: 12px;
- line-height: 1.25;
- text-align: center;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0 -1px -1px 0;
- }
- .the-icons, .the-buttons {
- list-style:none;
- }
+ {% inline_editor %}
%body
.container
generators/bootstrap3/public/stylesheets/bootstrap/bootstrap.css.scss +49 -0
@@ @@ -0,0 +1,49 @@
+ // Core variables and mixins
+ @import "variables";
+ @import "mixins";
+
+ // Reset
+ @import "normalize";
+ @import "print";
+
+ // Core CSS
+ @import "scaffolding";
+ @import "type";
+ @import "code";
+ @import "grid";
+ @import "tables";
+ @import "forms";
+ @import "buttons";
+
+ // Components
+ @import "component-animations";
+ @import "glyphicons";
+ @import "dropdowns";
+ @import "button-groups";
+ @import "input-groups";
+ @import "navs";
+ @import "navbar";
+ @import "breadcrumbs";
+ @import "pagination";
+ @import "pager";
+ @import "labels";
+ @import "badges";
+ @import "jumbotron";
+ @import "thumbnails";
+ @import "alerts";
+ @import "progress-bars";
+ @import "media";
+ @import "list-group";
+ @import "panels";
+ @import "wells";
+ @import "close";
+
+ // Components w/ JavaScript
+ @import "modals";
+ @import "tooltip";
+ @import "popovers";
+ @import "carousel";
+
+ // Utility classes
+ @import "utilities";
+ @import "responsive-utilities";
generators/bootstrap3/public/stylesheets/bootstrap/bootstrap.scss +0 -49
@@ @@ -1,49 +0,0 @@
- // Core variables and mixins
- @import "variables";
- @import "mixins";
-
- // Reset
- @import "normalize";
- @import "print";
-
- // Core CSS
- @import "scaffolding";
- @import "type";
- @import "code";
- @import "grid";
- @import "tables";
- @import "forms";
- @import "buttons";
-
- // Components
- @import "component-animations";
- @import "glyphicons";
- @import "dropdowns";
- @import "button-groups";
- @import "input-groups";
- @import "navs";
- @import "navbar";
- @import "breadcrumbs";
- @import "pagination";
- @import "pager";
- @import "labels";
- @import "badges";
- @import "jumbotron";
- @import "thumbnails";
- @import "alerts";
- @import "progress-bars";
- @import "media";
- @import "list-group";
- @import "panels";
- @import "wells";
- @import "close";
-
- // Components w/ JavaScript
- @import "modals";
- @import "tooltip";
- @import "popovers";
- @import "carousel";
-
- // Utility classes
- @import "utilities";
- @import "responsive-utilities";
generators/content_type/app/content_types/%slug%.yml.tt +1 -1
@@ @@ -32,7 +32,7 @@ fields: <% config[:fields].each_with_index do |field, index| %>
type: <%= field.type %>
required: <%= index == 0 ? true : field.required %>
hint: Explanatory text displayed in the back office
- localized: false<% if field.type == 'text' %>
+ localized: <%= field.required %><% if field.type == 'text' %>
# text_formatting: html # html (uses rich text editor) or text (uses plain text editor)<% end -%><% if field.type == 'select' -%>
# if localized, use
# en: ['option1_en', 'option2_en']