From 917b7e0dd95fcf4f37abbab9f5e4ce40446d6e76 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 9 Apr 2018 11:49:18 -0500 Subject: Rename .btn-default to .btn-secondary --- app/views/help/ui.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index ce09b44fbb2..c33100c4f84 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -205,7 +205,7 @@ %h2#buttons Buttons .example - %button.btn.btn-default{ :type => "button" } Default + %button.btn.btn-secondary{ :type => "button" } Default %button.btn.btn-gray{ :type => "button" } Gray %button.btn.btn-primary{ :type => "button" } Primary %button.btn.btn-success{ :type => "button" } Success @@ -478,7 +478,7 @@ Remember me .form-group .col-sm-offset-2.col-sm-10 - %button.btn.btn-default{ :type => "submit" } Sign in + %button.btn.btn-secondary{ :type => "submit" } Sign in .lead Form when label rendered above input @@ -496,7 +496,7 @@ %label %input{ :type => "checkbox" }/ Remember me - %button.btn.btn-default{ :type => "submit" } Sign in + %button.btn.btn-secondary{ :type => "submit" } Sign in %h2#file File %h4 -- cgit v1.2.1 From 3e7a17d4759a2c25f0c717408c48bfc7e975dde3 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 9 Apr 2018 12:36:21 -0500 Subject: Replace .pull-left with .float-left --- app/views/help/ui.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index c33100c4f84..4391a28b045 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -218,7 +218,7 @@ .example .clearfix - .dropdown.inline.pull-left + .dropdown.inline.float-left %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } Dropdown = icon('chevron-down') -- cgit v1.2.1 From b413785e1dfdbc594e86880e79e20bdd5963c938 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 9 Apr 2018 12:42:45 -0500 Subject: [skip ci] Replace .pull-right with .float-right --- app/views/help/ui.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 4391a28b045..1b18c1078c6 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -226,7 +226,7 @@ %li %a{ href: "#" } Dropdown option - .dropdown.inline.pull-right + .dropdown.inline.float-right %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } Dropdown = icon('chevron-down') -- cgit v1.2.1 From 46031d63cd085e392d5c3f406404cf7752a75561 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 10 Apr 2018 12:11:34 -0500 Subject: [skip ci] Convert panel related class names to card --- app/views/help/index.html.haml | 4 ++-- app/views/help/ui.html.haml | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index bf2725dc328..42fc16b59c5 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -33,8 +33,8 @@ .documentation-index.wiki = markdown(@help_index) .col-md-4 - .panel.panel-default - .panel-heading + .card + .card-header Quick help %ul.well-list %li= link_to 'See our website for getting help', support_url diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 1b18c1078c6..a08bcc5fe24 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -129,8 +129,8 @@ .lead List inside panel .example - .panel.panel-default - .panel-heading Your list + .card + .card-header Your list %ul.well-list %li One item @@ -416,26 +416,26 @@ .row .col-md-6 - .panel.panel-success - .panel-heading Success - .panel-body + .card.bg-success + .card-header Success + .card-body = lorem - .panel.panel-primary - .panel-heading Primary - .panel-body + .card.bg-primary + .card-header Primary + .card-body = lorem - .panel.panel-info - .panel-heading Info - .panel-body + .card.bg-info + .card-header Info + .card-body = lorem .col-md-6 - .panel.panel-warning - .panel-heading Warning - .panel-body + .card.bg-warning + .card-header Warning + .card-body = lorem - .panel.panel-danger - .panel-heading Danger - .panel-body + .card.bg-danger + .card-header Danger + .card-body = lorem %h2#alerts Alerts -- cgit v1.2.1 From df8aa61a94b8e70526fb78aed75ada1e390c7ce1 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 11 Apr 2018 13:05:57 -0500 Subject: [skip ci] Convert .checkbox to .form-check --- app/views/help/ui.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index a08bcc5fe24..53509c17df1 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -472,7 +472,7 @@ %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ .form-group .col-sm-offset-2.col-sm-10 - .checkbox + .form-check %label %input{ :type => "checkbox" }/ Remember me @@ -492,7 +492,7 @@ .form-group %label{ :for => "exampleInputPassword1" } Password %input#exampleInputPassword1.form-control{ :placeholder => "Password", :type => "password" }/ - .checkbox + .form-check %label %input{ :type => "checkbox" }/ Remember me -- cgit v1.2.1 From e44ceb96d0875ffbe2959cd17a87f02b2b815547 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 11 Apr 2018 14:36:17 -0500 Subject: [skip ci] .control-label to .col-form-label --- app/views/help/ui.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 53509c17df1..ffb84dd6cc4 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -463,11 +463,11 @@ .example %form.form-horizontal .form-group - %label.col-sm-2.control-label{ :for => "inputEmail3" } Email + %label.col-sm-2.col-form-label{ :for => "inputEmail3" } Email .col-sm-10 %input#inputEmail3.form-control{ :placeholder => "Email", :type => "email" }/ .form-group - %label.col-sm-2.control-label{ :for => "inputPassword3" } Password + %label.col-sm-2.col-form-label{ :for => "inputPassword3" } Password .col-sm-10 %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ .form-group -- cgit v1.2.1 From c552328617202bd1225abd3e84fc7f4a4b79e4fa Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 12 Apr 2018 15:11:22 -0500 Subject: [skip ci] .form-horizontal => .form-group.row --- app/views/help/ui.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index ffb84dd6cc4..c53069de2bd 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -461,22 +461,22 @@ %code form.horizontal-form .example - %form.form-horizontal - .form-group + %form + .form-group.row %label.col-sm-2.col-form-label{ :for => "inputEmail3" } Email .col-sm-10 %input#inputEmail3.form-control{ :placeholder => "Email", :type => "email" }/ - .form-group + .form-group.row %label.col-sm-2.col-form-label{ :for => "inputPassword3" } Password .col-sm-10 %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 .form-check %label %input{ :type => "checkbox" }/ Remember me - .form-group + .form-group.row .col-sm-offset-2.col-sm-10 %button.btn.btn-secondary{ :type => "submit" } Sign in -- cgit v1.2.1 From 9b9d0f396ddcc598a685b58a76d1b9fa727df09f Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 13 Apr 2018 12:49:32 -0500 Subject: [skip ci] Replace col-*-offset-* with offset-*-* --- app/views/help/ui.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index c53069de2bd..71744b6546e 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -471,13 +471,13 @@ .col-sm-10 %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check %label %input{ :type => "checkbox" }/ Remember me .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 %button.btn.btn-secondary{ :type => "submit" } Sign in .lead -- cgit v1.2.1 From a1beb409cdfd7b5abb80798934fef811892888e6 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 17 Apr 2018 12:18:41 -0500 Subject: Fix dropdowns --- app/views/help/ui.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 71744b6546e..0c8ca5fc305 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -230,7 +230,7 @@ %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } Dropdown = icon('chevron-down') - %ul.dropdown-menu.dropdown-menu-align-right + %ul.dropdown-menu.dropdown-menu-right %li %a{ href: "#" } Dropdown option -- cgit v1.2.1 From c281fc670a8d1507abf20e830a290a04135f7ea4 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 19 Apr 2018 22:34:20 -0500 Subject: Add .nav.nav-tabs to nav-links --- app/views/help/ui.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 0c8ca5fc305..dc96d17527b 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -174,7 +174,7 @@ .example .top-area - %ul.nav-links + %ul.nav-links.nav.nav-tabs %li.active %a Open %li -- cgit v1.2.1 From bed783ac15453f60651f861803bba93c622625ba Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 10 May 2018 12:22:56 -0700 Subject: Rename btn-secondary to btn-default --- app/views/help/ui.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/help') diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 6a055f77f4a..94b012d39a3 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -205,7 +205,7 @@ %h2#buttons Buttons .example - %button.btn.btn-secondary{ :type => "button" } Secondary + %button.btn.btn-default{ :type => "button" } Secondary %button.btn.btn-primary{ :type => "button" } Primary %button.btn.btn-success{ :type => "button" } Success %button.btn.btn-info{ :type => "button" } Info @@ -477,7 +477,7 @@ Remember me .form-group.row .offset-sm-2.col-sm-10 - %button.btn.btn-secondary{ :type => "submit" } Sign in + %button.btn.btn-default{ :type => "submit" } Sign in .lead Form when label rendered above input @@ -495,7 +495,7 @@ %label %input{ :type => "checkbox" }/ Remember me - %button.btn.btn-secondary{ :type => "submit" } Sign in + %button.btn.btn-default{ :type => "submit" } Sign in %h2#file File %h4 -- cgit v1.2.1