From de6e70843a69b746eb197cd3d37c55421584d2ee Mon Sep 17 00:00:00 2001 From: NeoSon Date: Thu, 14 Mar 2019 10:37:07 +0800 Subject: [PATCH 1/4] updated text area --- sources/scss/override/_form.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/scss/override/_form.scss b/sources/scss/override/_form.scss index 380ee23..3d1fe26 100644 --- a/sources/scss/override/_form.scss +++ b/sources/scss/override/_form.scss @@ -17,7 +17,7 @@ select.form-control:not([size]):not([multiple]), } textarea.form-control { - height: 64px !important; + height: 64px; } .custom-control { From e3930dcf72c5b865315f543cd84aa78ccd6c76f9 Mon Sep 17 00:00:00 2001 From: Muhamad Nauval Azhar Date: Thu, 14 Mar 2019 20:45:37 +0700 Subject: [PATCH 2/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 594ff89..1272200 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,18 @@ -## CONTRIBUTING +## Contributing - Fork it ( https://github.com/stisla/stisla/fork ) - Create your feature branch (`git checkout -b my-new-feature`) - Commit your changes (`git commit -am 'Add some feature'`) - Push to the branch (`git push origin my-new-feature`) - Create a new Pull Request + +## Note + +### CSS +If you want to make some changes in the CSS style. Don't edit the `.css` file, use the SCSS file instead. + +### HTML +Since we use Nunjucks, if you want to make changes to the HTML structure, make sure you change the source file (Nunjucks) located in `sources/pages`. + +### Important! +It's better to use the code guide by @mdo. Before making a pull request, make sure you have compiled all source code such as SCSS, HTML and others. Most importantly, make sure your changes have been tested cross-browser and still use existing variables (if possible). From 725cafaead25da23bfc86b24852eb39bc92cd85a Mon Sep 17 00:00:00 2001 From: Muhamad Nauval Azhar Date: Thu, 14 Mar 2019 20:46:25 +0700 Subject: [PATCH 3/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1272200..ccc5efb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,4 +15,4 @@ If you want to make some changes in the CSS style. Don't edit the `.css` file, u Since we use Nunjucks, if you want to make changes to the HTML structure, make sure you change the source file (Nunjucks) located in `sources/pages`. ### Important! -It's better to use the code guide by @mdo. Before making a pull request, make sure you have compiled all source code such as SCSS, HTML and others. Most importantly, make sure your changes have been tested cross-browser and still use existing variables (if possible). +It's better to use the code guide by [@mdo](http://codeguide.co). Before making a pull request, make sure you have compiled all source code such as SCSS, HTML and others. Most importantly, make sure your changes have been tested cross-browser and still use existing variables (if possible). From c431ff8c7f38f77302f045762daf34463a34d6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20MENENGE=C3=87?= Date: Tue, 26 Mar 2019 10:24:26 +0300 Subject: [PATCH 4/4] Overflow problem where '.main-content' element is fixed with editing calculation of minheight value. --- assets/js/scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/scripts.js b/assets/js/scripts.js index ba4173c..b2c9e54 100644 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -104,7 +104,7 @@ $(function() { } $(".main-content").css({ - minHeight: $(window).outerHeight() - 95 + minHeight: $(window).outerHeight() - 108 }) $(".nav-collapse-toggle").click(function() {