Mercurial > kallithea

changeset 6353:50e9a5b61c59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: drop 'select' class inside 'form-group' Temporarily, just apply styling to div inside form-group. Also, 'radios' is gone. Based on work by Dominik Ruf.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 04 Dec 2016 22:53:36 +0100
parents 951004d57e3f
children cf3cc1fa4222
files kallithea/public/css/style.css kallithea/templates/admin/auth/auth_settings.html kallithea/templates/admin/permissions/permissions_globals.html kallithea/templates/admin/user_groups/user_group_edit_settings.html kallithea/templates/search/search.html
diffstat 5 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/public/css/style.css	Sun Dec 04 22:53:36 2016 +0100
@@ -3270,26 +3270,25 @@
     border-bottom: 1px solid #c6d880;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group div.select select,
+#content div.panel div.form div.form-horizontal div.form-group > div select,
 #content div.panel table th.selected input,
 #content div.panel table td.selected input {
     margin: 0;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group div.select,
 #content div.panel div.form div.form-horizontal div.form-group > div {
     margin: 10px 20px 10px 200px;
     padding: 0;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group div.select a:hover,
-#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu:hover,
+#content div.panel div.form div.form-horizontal div.form-group > div a:hover,
+#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu:hover,
 #content div.panel div.action a:hover {
     color: #000;
     text-decoration: none;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu-focus,
+#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu-focus,
 #content div.panel div.action a.ui-selectmenu-focus {
     border: 1px solid #666;
 }
--- a/kallithea/templates/admin/auth/auth_settings.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/auth/auth_settings.html	Sun Dec 04 22:53:36 2016 +0100
@@ -83,7 +83,7 @@
             %elif setting["type"] == "select":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
-                <div class="select">
+                <div>
                     ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
--- a/kallithea/templates/admin/permissions/permissions_globals.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/permissions/permissions_globals.html	Sun Dec 04 22:53:36 2016 +0100
@@ -13,7 +13,7 @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_perm">${_('Repository')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_repo_perm','',c.repo_perms_choices)}
                     ${h.checkbox('overwrite_default_repo','true')}
                     <label for="overwrite_default_repo">
@@ -25,7 +25,7 @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_group_perm">${_('Repository group')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_group_perm','',c.group_perms_choices)}
                     ${h.checkbox('overwrite_default_group','true')}
                     <label for="overwrite_default_group">
@@ -37,7 +37,7 @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_user_group_perm">${_('User group')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_user_group_perm','',c.user_group_perms_choices)}
                     ${h.checkbox('overwrite_default_user_group','true')}
                     <label for="overwrite_default_user_group">
@@ -49,7 +49,7 @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_repo_create','',c.repo_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span>
                     <span class="help-block">${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}</span>
@@ -57,34 +57,34 @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('create_on_write','',c.repo_create_on_write_choices)}
                     <span class="help-block">${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_user_group_create','',c.user_group_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create user groups.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_fork">${_('Repository forking')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_fork','',c.fork_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to fork repositories.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_register">${_('Registration')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_register','',c.register_choices)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('default_extern_activate','',c.extern_activate_choices)}
                 </div>
             </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
@@ -23,7 +23,7 @@
                 </div>
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
-                    <div class="select">
+                    <div>
                         <table class="table">
                                 <tr>
                                     <td>
--- a/kallithea/templates/search/search.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/search/search.html	Sun Dec 04 22:53:36 2016 +0100
@@ -54,7 +54,7 @@
 
             <div class="form-group">
                 <label for="type">${_('Search in')}:</label>
-                <div class="select">
+                <div>
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ('commit',_('Commit messages')),
                         ('path',_('File names')),