From 5829c84c152bfd67324805a90927432fc89fb7f3 Mon Sep 17 00:00:00 2001 From: fmms Date: Mon, 18 Apr 2016 10:28:46 +0200 Subject: [PATCH 1/6] add template for email (#13) add email template as copy from text version. Otherwise the email field does not have any bootstrap styling. Thanks for the help on gitter by @flaviocopes --- templates/forms/fields/email/email.html.twig | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 templates/forms/fields/email/email.html.twig diff --git a/templates/forms/fields/email/email.html.twig b/templates/forms/fields/email/email.html.twig new file mode 100644 index 0000000..d4f20ef --- /dev/null +++ b/templates/forms/fields/email/email.html.twig @@ -0,0 +1,27 @@ +{% set value = (value is null ? field.default : value) %} + +
+ + +
+ +
+ +
From 2ff4be68b410f14ccd6f1d3729d9ef4d02cacd53 Mon Sep 17 00:00:00 2001 From: undersound Date: Mon, 18 Jul 2016 14:14:04 +0200 Subject: [PATCH 2/6] Only set fixed-nav class on body element when show_onpage_menu is true (#15) --- templates/modular.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/modular.html.twig b/templates/modular.html.twig index 6fd7546..d7b2d6b 100644 --- a/templates/modular.html.twig +++ b/templates/modular.html.twig @@ -25,7 +25,7 @@ {% endif %} {% endblock %} -{% block body_classes %}{{ parent() }} fixed-nav{% endblock %} +{% block body_classes %}{{ parent() }} {% if show_onpage_menu %}fixed-nav{% endif %} {% endblock %} {% block header_navigation %} {% if show_onpage_menu %} From 1dd41df9d06682ae23c5190e979b5041ba109d13 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Mon, 18 Jul 2016 14:15:17 +0200 Subject: [PATCH 3/6] Changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fff6744..3919193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.6.0 +## 07/xx/2016 + +1. [](#bugfix) + * Only set fixed-nav class on body element when show_onpage_menu is true [#15](https://github.com/getgrav/grav-theme-bootstrap/pull/15) + # v1.5.0 ## 07/14/2016 @@ -8,7 +14,7 @@ * Fix setting the page language in the html tag * Replace the hardcoded "Grav" title with the actual site title * Include the correct javascript file that highlights the active section in the menu - + # v1.4.1 ## 09/16/2015 From 3e26eee178acd70f6ae5d8f6f3d61b9b6e865c1a Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 6 Dec 2016 16:30:00 +0100 Subject: [PATCH 4/6] Translate label in custom form field templates --- CHANGELOG.md | 1 + templates/forms/fields/date/date.html.twig | 4 ++-- templates/forms/fields/datetime/datetime.html.twig | 4 ++-- templates/forms/fields/email/email.html.twig | 4 ++-- templates/forms/fields/password/password.html.twig | 4 ++-- templates/forms/fields/radio/radio.html.twig | 4 ++-- templates/forms/fields/select/select.html.twig | 4 ++-- templates/forms/fields/text/text.html.twig | 4 ++-- templates/forms/fields/textarea/textarea.html.twig | 4 ++-- templates/forms/fields/upload/upload.html.twig | 4 ++-- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3919193..4d61ef8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 1. [](#bugfix) * Only set fixed-nav class on body element when show_onpage_menu is true [#15](https://github.com/getgrav/grav-theme-bootstrap/pull/15) + * Translate label in custom form field templates # v1.5.0 ## 07/14/2016 diff --git a/templates/forms/fields/date/date.html.twig b/templates/forms/fields/date/date.html.twig index 3fec9b1..effc5f0 100644 --- a/templates/forms/fields/date/date.html.twig +++ b/templates/forms/fields/date/date.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/datetime/datetime.html.twig b/templates/forms/fields/datetime/datetime.html.twig index 3fec9b1..effc5f0 100644 --- a/templates/forms/fields/datetime/datetime.html.twig +++ b/templates/forms/fields/datetime/datetime.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/email/email.html.twig b/templates/forms/fields/email/email.html.twig index d4f20ef..327a939 100644 --- a/templates/forms/fields/email/email.html.twig +++ b/templates/forms/fields/email/email.html.twig @@ -4,9 +4,9 @@ diff --git a/templates/forms/fields/password/password.html.twig b/templates/forms/fields/password/password.html.twig index 06faa83..575f700 100644 --- a/templates/forms/fields/password/password.html.twig +++ b/templates/forms/fields/password/password.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig index 2690e07..f1d9791 100644 --- a/templates/forms/fields/radio/radio.html.twig +++ b/templates/forms/fields/radio/radio.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig index 658a4d9..7d18554 100644 --- a/templates/forms/fields/select/select.html.twig +++ b/templates/forms/fields/select/select.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/text/text.html.twig b/templates/forms/fields/text/text.html.twig index 57209fa..d33b7cd 100644 --- a/templates/forms/fields/text/text.html.twig +++ b/templates/forms/fields/text/text.html.twig @@ -4,9 +4,9 @@ diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig index 66dafd2..68c99fd 100644 --- a/templates/forms/fields/textarea/textarea.html.twig +++ b/templates/forms/fields/textarea/textarea.html.twig @@ -3,9 +3,9 @@
diff --git a/templates/forms/fields/upload/upload.html.twig b/templates/forms/fields/upload/upload.html.twig index 918ba81..860fb15 100644 --- a/templates/forms/fields/upload/upload.html.twig +++ b/templates/forms/fields/upload/upload.html.twig @@ -3,9 +3,9 @@
From 3966087fdeb7c314305a29c669701e0f45dadbf8 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 6 Dec 2016 16:41:39 +0100 Subject: [PATCH 5/6] Add custom styling for login forms --- CHANGELOG.md | 1 + css-compiled/theme.css | 2 +- scss/theme.scss | 2 ++ scss/theme/_login.scss | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 scss/theme/_login.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d61ef8..e95fa32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 1. [](#bugfix) * Only set fixed-nav class on body element when show_onpage_menu is true [#15](https://github.com/getgrav/grav-theme-bootstrap/pull/15) * Translate label in custom form field templates + * Add custom styling for login forms # v1.5.0 ## 07/14/2016 diff --git a/css-compiled/theme.css b/css-compiled/theme.css index 23b4783..cc5eed2 100644 --- a/css-compiled/theme.css +++ b/css-compiled/theme.css @@ -1 +1 @@ -table{width:100%;border:1px solid #f0f0f0;margin:30px 0}th{font-weight:bold;background:#f5f5f5;padding:5px}td{padding:5px;border:1px solid #f0f0f0}blockquote{padding:0 0 0 20px !important;font-size:16px;color:#666}blockquote>blockquote>blockquote{margin:0}blockquote>blockquote>blockquote p{padding:15px;display:block;margin-top:0rem;margin-bottom:0rem;border:1px solid #f0f0f0}blockquote>blockquote>blockquote>p{margin-left:-75px;color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}blockquote>blockquote>blockquote blockquote>p{margin-left:-100px;color:#a94442;background-color:#f2dede;border-color:#ebccd1}blockquote>blockquote>blockquote blockquote>blockquote>p{margin-left:-125px;color:#31708f;background-color:#d9edf7;border-color:#bce8f1}blockquote>blockquote>blockquote blockquote>blockquote>blockquote>p{margin-left:-150px;color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}img{max-width:100%}.container{width:auto;max-width:960px;padding:0 15px}.container .text-muted{margin:20px 0;text-align:center}.navbar .navbar-brand{color:#333;font-size:26px}html{position:relative;min-height:100%}body{margin-bottom:60px}.header{background-color:#563f79;background-image:-webkit-linear-gradient(#563f79,#6e519b);background-image:linear-gradient(#563f79,#6e519b);margin-top:-20px;margin-bottom:30px;padding-top:65px;padding-bottom:50px;text-align:center;color:#f5f2f8}.header h1{font-size:60px;color:#f0f0f0;margin-top:0}@media only all and (min-width: 48rem) and (max-width: 59.938rem){.header h1{font-size:40px}}@media only all and (max-width: 47.938rem){.header h1{font-size:30px;line-height:1.2;margin-bottom:2.5rem}}.header h2{margin-top:0;font-weight:normal}.header .btn{font-size:22px;padding:10px 30px;margin-top:30px;border-radius:3px;box-shadow:none;border:0}.footer{position:absolute;bottom:0;width:100%;height:60px;background-color:#f5f5f5}ol.breadcrumb{padding-left:0;background:transparent}.list-item{margin:30px 0 50px}.blog-header-image{margin:15px 0}.sidebar-content{margin-bottom:50px}.pagination li{display:inline !important;border:0 !important}.related-pages{padding:0;list-style:none}.related-pages li{border-bottom:1px solid #f0f0f0;line-height:34px}.related-pages li:last-child{border-bottom:0}.related-pages li a{display:block}.related-pages .score{display:block;float:right;color:#999;font-size:85%}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:none;background:white;cursor:inherit;display:block}.modular .features{padding:50px 0;text-align:center}.modular .features:after{content:"";display:table;clear:both}.modular .features h2{margin:0;line-height:100%}.modular .features h2+h3{margin-top:0;font-weight:normal}.modular .features p{margin:10px 0;font-size:17px}@media only all and (max-width: 47.938rem){.modular .features p{font-size:14px}}.modular .features .feature-items{margin-top:30px}.modular .features .feature{display:block;float:left;width:25%;vertical-align:top;margin-top:20px;margin-bottom:10px}@media only all and (max-width: 47.938rem){.modular .features .feature{width:100%}}.modular .features .feature i.fa{font-size:40px;color:#62488A}.modular .features .feature h4{font-size:16px;font-weight:normal}.modular .features .feature p{display:inline-block;font-size:14px;margin:5px 0 10px}.modular .features.big{text-align:center}.modular .features.big .feature{width:50%;margin:30px 0}.modular .features.big i.fa{font-size:50px;float:left}.modular .features.big .feature-content{padding-right:15px}.modular .features.big .feature-content.push{margin-left:90px}.modular .features.big .feature-content h4{font-size:24px;text-align:left;margin:0}.modular .features.big .feature-content p{padding:0;text-align:left;font-size:14px}.callout{background:#f0f0f0;color:#666;padding:15px 15px}.callout .align-left{float:left;margin-right:15px}.callout .align-right{float:right;margin-left:15px}.callout img{border-radius:3px}.modular .modular-row:last-child{margin-bottom:2rem}.modular .modular-anchor{display:block;position:relative;top:-50px;visibility:hidden}body.fixed-nav{padding-top:50px} +table{width:100%;border:1px solid #f0f0f0;margin:30px 0}th{font-weight:bold;background:#f5f5f5;padding:5px}td{padding:5px;border:1px solid #f0f0f0}blockquote{padding:0 0 0 20px !important;font-size:16px;color:#666}blockquote>blockquote>blockquote{margin:0}blockquote>blockquote>blockquote p{padding:15px;display:block;margin-top:0rem;margin-bottom:0rem;border:1px solid #f0f0f0}blockquote>blockquote>blockquote>p{margin-left:-75px;color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}blockquote>blockquote>blockquote blockquote>p{margin-left:-100px;color:#a94442;background-color:#f2dede;border-color:#ebccd1}blockquote>blockquote>blockquote blockquote>blockquote>p{margin-left:-125px;color:#31708f;background-color:#d9edf7;border-color:#bce8f1}blockquote>blockquote>blockquote blockquote>blockquote>blockquote>p{margin-left:-150px;color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}img{max-width:100%}.container{width:auto;max-width:960px;padding:0 15px}.container .text-muted{margin:20px 0;text-align:center}.navbar .navbar-brand{color:#333;font-size:26px}html{position:relative;min-height:100%}body{margin-bottom:60px}.header{background-color:#563f79;background-image:-webkit-linear-gradient(#563f79,#6e519b);background-image:linear-gradient(#563f79,#6e519b);margin-top:-20px;margin-bottom:30px;padding-top:65px;padding-bottom:50px;text-align:center;color:#f5f2f8}.header h1{font-size:60px;color:#f0f0f0;margin-top:0}@media only all and (min-width: 48rem) and (max-width: 59.938rem){.header h1{font-size:40px}}@media only all and (max-width: 47.938rem){.header h1{font-size:30px;line-height:1.2;margin-bottom:2.5rem}}.header h2{margin-top:0;font-weight:normal}.header .btn{font-size:22px;padding:10px 30px;margin-top:30px;border-radius:3px;box-shadow:none;border:0}.footer{position:absolute;bottom:0;width:100%;height:60px;background-color:#f5f5f5}ol.breadcrumb{padding-left:0;background:transparent}.list-item{margin:30px 0 50px}.blog-header-image{margin:15px 0}.sidebar-content{margin-bottom:50px}.pagination li{display:inline !important;border:0 !important}.related-pages{padding:0;list-style:none}.related-pages li{border-bottom:1px solid #f0f0f0;line-height:34px}.related-pages li:last-child{border-bottom:0}.related-pages li a{display:block}.related-pages .score{display:block;float:right;color:#999;font-size:85%}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:none;background:white;cursor:inherit;display:block}.modular .features{padding:50px 0;text-align:center}.modular .features:after{content:"";display:table;clear:both}.modular .features h2{margin:0;line-height:100%}.modular .features h2+h3{margin-top:0;font-weight:normal}.modular .features p{margin:10px 0;font-size:17px}@media only all and (max-width: 47.938rem){.modular .features p{font-size:14px}}.modular .features .feature-items{margin-top:30px}.modular .features .feature{display:block;float:left;width:25%;vertical-align:top;margin-top:20px;margin-bottom:10px}@media only all and (max-width: 47.938rem){.modular .features .feature{width:100%}}.modular .features .feature i.fa{font-size:40px;color:#62488A}.modular .features .feature h4{font-size:16px;font-weight:normal}.modular .features .feature p{display:inline-block;font-size:14px;margin:5px 0 10px}.modular .features.big{text-align:center}.modular .features.big .feature{width:50%;margin:30px 0}.modular .features.big i.fa{font-size:50px;float:left}.modular .features.big .feature-content{padding-right:15px}.modular .features.big .feature-content.push{margin-left:90px}.modular .features.big .feature-content h4{font-size:24px;text-align:left;margin:0}.modular .features.big .feature-content p{padding:0;text-align:left;font-size:14px}.callout{background:#f0f0f0;color:#666;padding:15px 15px}.callout .align-left{float:left;margin-right:15px}.callout .align-right{float:right;margin-left:15px}.callout img{border-radius:3px}.modular .modular-row:last-child{margin-bottom:2rem}.modular .modular-anchor{display:block;position:relative;top:-50px;visibility:hidden}body.fixed-nav{padding-top:50px}#grav-login{max-width:50rem !important}#grav-login .col-sm-2{width:50%;text-align:right;padding-top:5px}#grav-login .col-sm-10{width:50%}#grav-login form{padding-top:30px}#grav-login .rememberme{float:right !important}#grav-login .form-actions button{margin-top:50px}#grav-login .form-actions .button.secondary{line-height:26px}#grav-login .form-actions .button.secondary i{line-height:26px}#grav-login .button{vertical-align:bottom !important} diff --git a/scss/theme.scss b/scss/theme.scss index 2223055..7d526cd 100644 --- a/scss/theme.scss +++ b/scss/theme.scss @@ -18,3 +18,5 @@ @import "theme/fixes"; @import "theme/modular/all"; + +@import "theme/login"; diff --git a/scss/theme/_login.scss b/scss/theme/_login.scss new file mode 100644 index 0000000..e905f80 --- /dev/null +++ b/scss/theme/_login.scss @@ -0,0 +1,40 @@ +#grav-login { + max-width: 50rem!important; + + .col-sm-2 { + width: 50%; + text-align: right; + padding-top: 5px; + } + + .col-sm-10 { + width: 50%; + } + + form { + padding-top: 30px + } + + .rememberme { + float: right!important; + } + + .form-actions { + button { + margin-top: 50px; + } + + .button.secondary { + line-height: 26px; + + i { + line-height: 26px; + } + } + } + + .button { + vertical-align: bottom!important; + } +} + From 3ad733afb9b7ab921527c46428cbe10d20736eef Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 6 Dec 2016 16:42:48 +0100 Subject: [PATCH 6/6] Prepare release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95fa32..ce383d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.6.0 -## 07/xx/2016 +## 12/06/2016 1. [](#bugfix) * Only set fixed-nav class on body element when show_onpage_menu is true [#15](https://github.com/getgrav/grav-theme-bootstrap/pull/15) diff --git a/blueprints.yaml b/blueprints.yaml index 28a6acd..fdf6879 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Bootstrap -version: 1.5.0 +version: 1.6.0 description: "Bootstrap is built using the popular **Bootstrap** Framework" icon: bold author: