Skip to content

Commit 0b700eb

Browse files
committed
Update version to 10.0.6400.0
#372 - Add missing bootstrap classes to form widgets Remove tests
1 parent 7e73ee8 commit 0b700eb

File tree

12 files changed

+30
-102
lines changed

12 files changed

+30
-102
lines changed

Bootstrap/MVC/Views/ParagraphTextField/Write.Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="form-group @Model.CssClass" data-sf-role="paragraph-text-field-container">
1111
<input type="hidden" data-sf-role="violation-messages" value='{"maxLength":"@Model.MaxLengthViolationMessage", "required": "@Model.RequiredViolationMessage"}' />
1212
<label for='@Html.UniqueId("Textarea")'>@Model.MetaField.Title </label>
13-
<textarea id='@Html.UniqueId("Textarea")' data-sf-role="paragraph-text-field-textarea" name="@Model.MetaField.FieldName" placeholder="@Model.PlaceholderText" @MvcHtmlString.Create(Model.ValidationAttributes)>@Model.Value</textarea>
13+
<textarea id='@Html.UniqueId("Textarea")' class="form-control" rows="4" data-sf-role="paragraph-text-field-textarea" name="@Model.MetaField.FieldName" placeholder="@Model.PlaceholderText" @MvcHtmlString.Create(Model.ValidationAttributes)>@Model.Value</textarea>
1414

1515
@if (!string.IsNullOrEmpty(Model.MetaField.Description))
1616
{

Bootstrap/MVC/Views/SubmitButton/Write.Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
@Html.Script(ScriptRef.JQuery, "top", false)
88

9-
<div class="@Model.CssClass">
9+
<div class="@Model.CssClass form-group">
1010
<button type="submit" @Html.SubmitButtonRequiredAttributes() class="sf-SubmitButton btn btn-primary">@Model.Label</button>
1111
@if (Model.AllowGoBack)
1212
{

Bootstrap/MVC/Views/TextField/Write.Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<input data-sf-role="violation-messages" type="hidden" value='{"maxLength":"@Model.ValidatorDefinition.MaxLengthViolationMessage", "required": "@Model.ValidatorDefinition.RequiredViolationMessage", "invalid": "@Html.Resource("InvalidEntryMessage")", "regularExpression": "@Model.ValidatorDefinition.RegularExpressionViolationMessage"}' />
2626

2727
<label for='@Html.UniqueId("Textbox")'>@Model.MetaField.Title</label>
28-
<input id='@Html.UniqueId("Textbox")' data-sf-role="text-field-input" type="@Model.InputType.ToHtmlInputType()" name="@Model.MetaField.FieldName" placeholder="@Model.PlaceholderText" value="@Model.Value" @Html.Raw(Model.ValidationAttributes) class="@inputCssClass"></input>
28+
<input id='@Html.UniqueId("Textbox")' data-sf-role="text-field-input" type="@Model.InputType.ToHtmlInputType()" name="@Model.MetaField.FieldName" placeholder="@Model.PlaceholderText" value="@Model.Value" @Html.Raw(Model.ValidationAttributes) class="@inputCssClass" />
2929
@if (!string.IsNullOrEmpty(Model.MetaField.Description))
3030
{
3131
<p class="text-muted">@Model.MetaField.Description</p>

Bootstrap/README.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ The Bootstrap package contains front-end assets, widget template, grid widget te
1919
- **css** - contains the processed css files
2020
- **main.css** - this is output of the processed `main.scss` from `assets/src/project/sass`. This file contains Sitefinity, Bootstrap and project css
2121
- **main.min.css** - this is the same as `main.css` but minified. This is the distributed css file which is linked in the package Razor layout file `MVC/Views/Layouts/default.cshtml`
22+
- **sitefinity.css** - this is output of the processed `sitefinity.scss` from `assets/src/sitefinity/sass`. This files contain Sitefinity css only
23+
- **sitefinity.min.css** - minified `sitefinity.css`
2224
- **fonts** - contains files for sitefinity and project icon font
2325
- **images** - contains compressed images from src folder which are usually used as background images in the css
2426
- **js** - contains a minified js file which is a concatenation of js files listed in `jsfiles.json`. To use this file add a reference to it in the package Razor layout file `MVC/Views/Layouts/default.cshtml`
@@ -129,7 +131,17 @@ File structure
129131
130132
main.scss
131133
// Sitefinity + Bootstrap CSS
132-
@import "../../sitefinity/sass/sitefinity.bootstrap.scss";
134+
135+
//Import Bootstrap from npm
136+
137+
@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap.scss";
138+
@import "../../../../node_modules/magnific-popup/src/css/main.scss";
139+
140+
// Sitefinity
141+
142+
@import "../../sitefinity/sass/components/icons/sf-icon-font";
143+
@import "../../sitefinity/sass/widgets/socialShare/sf-sprite";
144+
@import "../../sitefinity/sass/sitefinity.scss";
133145
134146
//Import .scss files here
135147
@import "setting/colors";
@@ -140,7 +152,7 @@ main.scss
140152
...
141153
```
142154
When you run grunt all scss files imported in `assets/src/project/sass/main.scss` will be processed and output in `assets/dist/css/main.css`
143-
If you don't want to include Sitefinity or Bootstrap css or you want to use another Bootstrap version change the import rule `@import "../../sitefinity/sass/sitefinity.bootstrap.scss";` in `assets/src/project/sass/main.scss`.
155+
If you don't want to include Sitefinity or Bootstrap css or you want to use another Bootstrap version change the import rule `@import "../../sitefinity/sass/sitefinity.scss";` or `@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap.scss";` in `assets/src/project/sass/main.scss`.
144156
### Images
145157
Place all images in `assets/src/project/images`. After grunt is run all images from this folder will be compressed and moved to `assets/dist/images`.
146158

@@ -164,7 +176,7 @@ In `jsfiles.json` define the order in which the project's js files will be conca
164176
@Html.Script(Url.Content("~/ResourcePackages/Bootstrap/assets/dist/js/project.min.js"), "bottom")
165177
```
166178

167-
### Icons
179+
###Icons
168180
Place all svg files that you want to use as icon via an icon font in `assets/src/project/icons`. The icon font will be created the first time grunt is run. If you add new svg files you will have to run the task manually (`grunt webfont`) or rerun default grunt task.
169181
Two css classes will be generated for each icon. If the name of the svg file is logo.svg, the names of the css classes will be:
170182
- `icon-logo` - icon is displayed before Company name

Bootstrap/assets/dist/css/main.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6167,8 +6167,8 @@ img.mfp-img {
61676167

61686168
@font-face {
61696169
font-family: "sf-icon-font";
6170-
src: url("../fonts/sf-icon-font.eot?31b9ae05d6feaf588a80ace92ddbffe1");
6171-
src: url("../fonts/sf-icon-font.eot?#iefix") format("embedded-opentype"), url("../fonts/sf-icon-font.woff?31b9ae05d6feaf588a80ace92ddbffe1") format("woff"), url("../fonts/sf-icon-font.ttf?31b9ae05d6feaf588a80ace92ddbffe1") format("truetype"), url("../fonts/sf-icon-font.svg?31b9ae05d6feaf588a80ace92ddbffe1#sf-icon-font") format("svg");
6170+
src: url("../fonts/sf-icon-font.eot?0f56c7d0bba9ca44665535b1aff7ed55");
6171+
src: url("../fonts/sf-icon-font.eot?#iefix") format("embedded-opentype"), url("../fonts/sf-icon-font.woff?0f56c7d0bba9ca44665535b1aff7ed55") format("woff"), url("../fonts/sf-icon-font.ttf?0f56c7d0bba9ca44665535b1aff7ed55") format("truetype"), url("../fonts/sf-icon-font.svg?0f56c7d0bba9ca44665535b1aff7ed55#sf-icon-font") format("svg");
61726172
font-weight: normal;
61736173
font-style: normal; }
61746174

Bootstrap/assets/dist/css/main.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bootstrap/assets/dist/js/project.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bootstrap/assets/src/project/sass/main.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
// Sitefinity
66

7-
@import "../../sitefinity//sass/components/icons/sf-icon-font";
8-
@import "../../sitefinity//sass/widgets/socialShare/sf-sprite";
7+
@import "../../sitefinity/sass/components/icons/sf-icon-font";
8+
@import "../../sitefinity/sass/widgets/socialShare/sf-sprite";
99
@import "../../sitefinity/sass/sitefinity.scss";
1010

1111

Bootstrap/assets/src/sitefinity/sass/sitefinity.bootstrap.scss

Lines changed: 0 additions & 88 deletions
This file was deleted.

Bootstrap/jsfiles.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"concatJsFiles": []
2+
"concatJsFiles": [
3+
"node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js"
4+
]
35
}

0 commit comments

Comments
 (0)