Merge master

templates/default/layout.tpl

@@ -32,8 +32,8 @@ URL: http://www.thelia.net
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     {block name="meta"}{/block}
 
-    {* Stylesheets *}
-    {stylesheets file='assets/less/styles.less' filters='less,cssembed'}
+    <!-- StyleSheet -->
+    {stylesheets file='assets/less/styles.less' filters='less,cssembed,cssrewrite'}
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}
     {debugbar_rendercss}

templates/default/register.html

@@ -201,7 +201,14 @@
                                     <select name="{$name}" id="{$label_attr.for}" class="form-control" required>
                                         <option value="">-- {intl l="Select Country"} --</option>
                                         {loop type="country" name="country.list"}
-                                            <option value="{$ID}" {if $value == $ID}selected{/if} >{$TITLE}</option>
+                                            <option value="{$ID}"
+                                                    {if $value != ""}
+                                                        {if $value == $ID}selected{/if}
+                                                    {else}
+                                                        {if $IS_DEFAULT}selected{/if}
+                                                    {/if}
+
+                                            >{$TITLE}</option>
                                         {/loop}
                                     </select>
                                     {if $error }