Skip to content

Commit

Permalink
better and easier demo screeenshot. bumping rubocop to newest
Browse files Browse the repository at this point in the history
  • Loading branch information
GBH committed Dec 25, 2019
1 parent 7e48d5a commit 7901891
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 33 deletions.
12 changes: 6 additions & 6 deletions .rubocop.yml
Expand Up @@ -13,9 +13,6 @@ Metrics/MethodLength:
Metrics/ParameterLists:
Enabled: false

Metrics/LineLength:
Max: 120

Metrics/CyclomaticComplexity:
Enabled: false

Expand All @@ -29,7 +26,10 @@ Metrics/AbcSize:
Enabled: false

# -- Layout --------------------------------------------------------------------
Layout/AlignHash:
Layout/LineLength:
Max: 120

Layout/HashAlignment:
EnforcedColonStyle: table

Layout/MultilineOperationIndentation:
Expand All @@ -41,7 +41,7 @@ Layout/MultilineMethodCallIndentation:
Layout/MultilineHashBraceLayout:
Enabled: false

Layout/IndentFirstArrayElement:
Layout/FirstArrayElementIndentation:
EnforcedStyle: consistent

Layout/EmptyLinesAroundModuleBody:
Expand All @@ -53,7 +53,7 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords:
Layout/EmptyLinesAroundClassBody:
EnforcedStyle: empty_lines_except_namespace

Layout/AlignParameters:
Layout/ParameterAlignment:
Enabled: false

Layout/AccessModifierIndentation:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -17,7 +17,7 @@ gem "sqlite3"
group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem "listen", ">= 3.0.5", "< 3.2"
gem "rubocop", "0.70.0", require: false
gem "rubocop", "0.78.0", require: false
gem "sassc-rails"
gem "web-console", ">= 3.3.0"
gem "webpacker"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,4 +1,4 @@
Copyright 2018-19 Oleg Khabarov
Copyright 2018-20 Oleg Khabarov

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
20 changes: 3 additions & 17 deletions README.md
Expand Up @@ -312,24 +312,10 @@ You may completely disable bootstrap and use default form builder by passing
messages show up. See: [twbs/bootstrap/issues/25540](https://github.com/twbs/bootstrap/issues/25540)
For now adding `.invalid-feeback { display: block }` will work.

## Screenshots
## Demo Screenshots

#### Horizontal

![Horizontal Form](/demo/form_preview_horizontal.png)

#### Horizontal With Errors

![Horizontal Form With Errors](/demo/form_preview_horizontal_with_errors.png)

#### Vertical

![Vertical Form](/demo/form_preview_vertical.png)

#### Inline

![Inline](/demo/form_preview_inline.png)
![Demo Preview](/demo/demo.png)

---

Copyright 2018-19 Oleg Khabarov, Released under the [MIT License](LICENSE.md)
Copyright 2018-20 Oleg Khabarov, Released under the [MIT License](LICENSE.md)
8 changes: 4 additions & 4 deletions demo/app/views/layouts/application.html.erb
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">


<style type="text/css">
Expand Down Expand Up @@ -40,9 +40,9 @@

<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>

</body>
</html>
Binary file added demo/demo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed demo/form_preview_horizontal.png
Binary file not shown.
Binary file removed demo/form_preview_horizontal_with_errors.png
Binary file not shown.
Binary file removed demo/form_preview_inline.png
Binary file not shown.
Binary file removed demo/form_preview_vertical.png
Binary file not shown.
2 changes: 1 addition & 1 deletion test/gemfiles/5.0.gemfile
Expand Up @@ -11,7 +11,7 @@ group :test do
gem "diffy"
gem "equivalent-xml"
gem "minitest", "~> 5.10.3"
gem "rubocop", "~> 0.51.0", require: false
gem "rubocop", "0.78.0", require: false
gem "sqlite3", "~> 1.3.6"
gem "timecop"
end
2 changes: 1 addition & 1 deletion test/gemfiles/5.1.gemfile
Expand Up @@ -11,7 +11,7 @@ group :test do
gem "diffy"
gem "equivalent-xml"
gem "minitest"
gem "rubocop", "~> 0.51.0", require: false
gem "rubocop", "0.78.0", require: false
gem "sqlite3"
gem "timecop"
end
2 changes: 1 addition & 1 deletion test/gemfiles/5.2.gemfile
Expand Up @@ -11,7 +11,7 @@ group :test do
gem "diffy"
gem "equivalent-xml"
gem "minitest"
gem "rubocop", "~> 0.51.0", require: false
gem "rubocop", "0.78.0", require: false
gem "sqlite3"
gem "timecop"
end
2 changes: 1 addition & 1 deletion test/gemfiles/6.0.gemfile
Expand Up @@ -11,7 +11,7 @@ group :test do
gem "diffy"
gem "equivalent-xml"
gem "minitest"
gem "rubocop", "~> 0.51.0", require: false
gem "rubocop", "0.78.0", require: false
gem "sqlite3"
gem "timecop"
end

0 comments on commit 7901891

Please sign in to comment.