diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 18:49:30 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 18:49:30 +0300 |
| commit | 5955caed321e242bfebe52a4b47346a01a50e4f6 (patch) | |
| tree | d9710c0732ce21801b4a79a281bec0bd39582a95 /app/views/help | |
| parent | f9e2b4730f58ba630344c9554eb907ab003abbd5 (diff) | |
| parent | 533593e95cd3a922a2ec2ea43b345862361dfd67 (diff) | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/help')
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 2 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 29b23ae2e52..1c5b4aecabb 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -1,5 +1,5 @@ #modal-shortcuts.modal{ tabindex: -1 } - .modal-dialog + .modal-dialog.modal-lg .modal-content .modal-header %a.close{ href: "#", "data-dismiss" => "modal" } × diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index dc96d17527b..6a055f77f4a 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -74,10 +74,10 @@ = lorem .cover-controls - = link_to '#', class: 'btn btn-gray' do + = link_to '#', class: 'btn btn-default' do = icon('pencil') - = link_to '#', class: 'btn btn-gray' do + = link_to '#', class: 'btn btn-default' do = icon('rss') %h2#lists Lists @@ -205,8 +205,7 @@ %h2#buttons Buttons .example - %button.btn.btn-secondary{ :type => "button" } Default - %button.btn.btn-gray{ :type => "button" } Gray + %button.btn.btn-secondary{ :type => "button" } Secondary %button.btn.btn-primary{ :type => "button" } Primary %button.btn.btn-success{ :type => "button" } Success %button.btn.btn-info{ :type => "button" } Info |