Changeset - cf3cc1fa4222
[Not reviewed]
default
0 10 0
Mads Kiilerich - 9 years ago 2016-12-04 22:53:36
mads@kiilerich.com
style: drop 'textarea' class inside 'form-group'

Temporarily, just apply styling to div inside form-group. Also, 'radios' is gone.

Based on work by Dominik Ruf.
10 files changed with 12 insertions and 59 deletions:
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
Show inline comments
 
@@ -851,30 +851,29 @@ div.header img {
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group > div.summary,
 
#content div.panel div.form div.form-horizontal div.form-group > div.summary-short {
 
    margin: 10px 20px 10px 110px;
 
}
 
#content div.panel div.form div.form-horizontal div.form-group > div.summary-short input {
 
    margin: 0;
 
}
 
#content div.panel div.form div.form-horizontal div.form-group > div.file {
 
    margin: 0 20px 0 200px;
 
}
 
#content div.panel div.form div.form-horizontal div.form-group > div.editor {
 
    margin: 0 10px 0 200px;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group > label > input,
 
#content div.panel div.form div.form-horizontal div.form-group > div input,
 
#content div.panel div.form div.form-horizontal div.form-group > label > textarea,
 
#content div.panel div.form div.form-horizontal div.form-group > div textarea,
 
.reviewer_ac input {
 
    background: #FFF;
 
    border-top: 1px solid #b3b3b3;
 
    border-left: 1px solid #b3b3b3;
 
    border-right: 1px solid #eaeaea;
 
    border-bottom: 1px solid #eaeaea;
 
    color: #000;
 
    font-size: 12px;
 
    margin: 5px 0 10px;
 
    padding: 7px 7px 6px;
 
}
 

	
 
@@ -914,74 +913,29 @@ input.disabled {
 

	
 
#content div.panel div.form div.form-horizontal div.form-group > div input.button {
 
    background: #D4D0C8;
 
    border-top: 1px solid #FFF;
 
    border-left: 1px solid #FFF;
 
    border-right: 1px solid #404040;
 
    border-bottom: 1px solid #404040;
 
    color: #000;
 
    margin: 0;
 
    padding: 4px 8px;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea {
 
    border-top: 1px solid #b3b3b3;
 
    border-left: 1px solid #b3b3b3;
 
    border-right: 1px solid #eaeaea;
 
    border-bottom: 1px solid #eaeaea;
 
    margin: 0 20px 0 200px;
 
    padding: 7px 7px 6px;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea-editor {
 
    border: 1px solid #ddd;
 
    padding: 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea textarea {
 
#content div.panel div.form div.form-horizontal div.form-group > div textarea {
 
    width: 100%;
 
    height: 220px;
 
    overflow-y: auto;
 
    background: #FFF;
 
    color: #000;
 
    font-size: 12px;
 
    outline: none;
 
    border-width: 0;
 
    margin: 0;
 
    padding: 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea table {
 
    width: 100%;
 
    border: none;
 
    margin: 0;
 
    padding: 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea table td {
 
    background: #DDD;
 
    border: none;
 
    padding: 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table {
 
    width: auto;
 
    border: none;
 
    margin: 0;
 
    padding: 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td {
 
    font-size: 11px;
 
    padding: 5px 5px 5px 0;
 
}
 

	
 
#content div.panel div.form div.form-horizontal div.form-group input[type=text]:focus,
 
#content div.panel div.form div.form-horizontal div.form-group input[type=password]:focus,
 
#content div.panel div.form div.form-horizontal div.form-group input[type=file]:focus,
 
#content div.panel div.form div.form-horizontal div.form-group textarea:focus,
 
#content div.panel div.form div.form-horizontal div.form-group select:focus,
 
.reviewer_ac input:focus {
 
    background: #f6f6f6;
 
    border-color: #666;
 
}
 

	
 
@@ -3130,25 +3084,24 @@ label.disabled {
 
.alert-danger {
 
    color: #a94442;
 
    background-color: #f2dede;
 
    border-color: #ebccd1;
 
}
 

	
 
ins, div.options a:hover {
 
    text-decoration: none;
 
}
 

	
 
img,
 
#header #header-inner #quick li a:hover span.normal,
 
#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td a,
 
#clone_url,
 
#clone_url_id
 
{
 
    border: none;
 
}
 

	
 
img.icon, .right .merge img {
 
    vertical-align: bottom;
 
}
 

	
 
#header ul#logged-user,
 
#content div.panel div.panel-heading ul.links,
kallithea/templates/admin/repo_groups/repo_group_add.html
Show inline comments
 
@@ -28,25 +28,25 @@
 
    <div class="form">
 
        <!-- fields -->
 
        <div class="form-horizontal">
 
            <div class="form-group">
 
                <label class="control-label" for="group_name">${_('Group name')}:</label>
 
                <div>
 
                    ${h.text('group_name',class_='form-control')}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="group_description">${_('Description')}:</label>
 
                <div class="textarea-repo editor">
 
                <div>
 
                    ${h.textarea('group_description',cols=23,rows=5)}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
 
                <div>
 
                    ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
 
                </div>
 
            </div>
 

	
 
            <div id="copy_perms" class="form-group">
kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
Show inline comments
 
@@ -3,25 +3,25 @@ ${h.form(url('update_repos_group',group_
 
<div class="form">
 
    <!-- fields -->
 
    <div class="form-horizontal">
 
        <div class="form-group">
 
            <label class="control-label" for="group_name">${_('Group name')}:</label>
 
            <div>
 
                ${h.text('group_name',class_='form-control')}
 
            </div>
 
        </div>
 

	
 
        <div class="form-group">
 
            <label class="control-label" for="group_description">${_('Description')}:</label>
 
            <div class="textarea text-area editor">
 
            <div>
 
                ${h.textarea('group_description',cols=23,rows=5)}
 
            </div>
 
        </div>
 

	
 
        <div class="form-group">
 
            <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
 
            <div>
 
                ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
 
            </div>
 
        </div>
 

	
 
        <div class="form-group">
kallithea/templates/admin/repos/repo_add_base.html
Show inline comments
 
@@ -12,25 +12,25 @@ ${h.form(url('repos'))}
 
         </div>
 
        <div id="remote_clone" class="form-group">
 
            <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
 
            <div>
 
                ${h.text('clone_uri',class_='form-control')}
 
                <span class="help-block">
 
                    ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')}
 
                </span>
 
            </div>
 
        </div>
 
        <div class="form-group">
 
            <label class="control-label" for="repo_description">${_('Description')}:</label>
 
            <div class="textarea-repo editor">
 
            <div>
 
                ${h.textarea('repo_description')}
 
                <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
 
            </div>
 
        </div>
 
        <div class="form-group">
 
            <label class="control-label" for="repo_group">${_('Repository group')}:</label>
 
            <div>
 
                ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
 
                <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
 
            </div>
 
        </div>
 
        <div id="copy_perms" class="form-group">
kallithea/templates/admin/repos/repo_edit_settings.html
Show inline comments
 
@@ -43,25 +43,25 @@ ${h.form(url('update_repo', repo_name=c.
 
            <div class="form-group">
 
                <label class="control-label" for="owner">${_('Owner')}:</label>
 
                <div class="ac">
 
                    <div class="perm_ac">
 
                       ${h.text('owner',class_='yui-ac-input')}
 
                       <span class="help-block">${_('Change owner of this repository.')}</span>
 
                       <div id="owner_container"></div>
 
                    </div>
 
                </div>
 
             </div>
 
            <div class="form-group">
 
                <label class="control-label" for="repo_description">${_('Description')}:</label>
 
                <div class="textarea text-area editor">
 
                <div>
 
                    ${h.textarea('repo_description', style="height:165px")}
 
                    <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="repo_private">${_('Private repository')}:</label>
 
                <div>
 
                    ${h.checkbox('repo_private',value="True")}
 
                    <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
 
                </div>
 
            </div>
kallithea/templates/admin/user_groups/user_group_add.html
Show inline comments
 
@@ -26,25 +26,25 @@
 
    ${h.form(url('users_groups'))}
 
    <div class="form">
 
        <!-- fields -->
 
        <div class="form-horizontal">
 
            <div class="form-group">
 
                <label class="control-label" for="users_group_name">${_('Group name')}:</label>
 
                <div>
 
                    ${h.text('users_group_name',class_='form-control')}
 
                </div>
 
            </div>
 
            <div class="form-group">
 
                <label class="control-label" for="user_group_description">${_('Description')}:</label>
 
                <div class="textarea text-area editor">
 
                <div>
 
                    ${h.textarea('user_group_description')}
 
                    <span class="help-block">${_('Short, optional description for this user group.')}</span>
 
                </div>
 
            </div>
 
            <div class="form-group">
 
                <label class="control-label" for="users_group_active">${_('Active')}:</label>
 
                <div>
 
                    ${h.checkbox('users_group_active',value=True, checked='checked')}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
kallithea/templates/admin/user_groups/user_group_edit_settings.html
Show inline comments
 
${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')}
 
    <div class="form">
 
        <!-- fields -->
 
            <div class="form-horizontal">
 
                <div class="form-group">
 
                    <label class="control-label" for="users_group_name">${_('Group name')}:</label>
 
                    <div>
 
                        ${h.text('users_group_name',class_='form-control')}
 
                    </div>
 
                </div>
 
                <div class="form-group">
 
                    <label class="control-label" for="user_group_description">${_('Description')}:</label>
 
                    <div class="textarea-small editor">
 
                    <div>
 
                        ${h.textarea('user_group_description')}
 
                        <span class="help-block">${_('Short, optional description for this user group.')}</span>
 
                    </div>
 
                </div>
 
                <div class="form-group">
 
                    <label class="control-label" for="users_group_active">${_('Active')}:</label>
 
                    <div>
 
                        ${h.checkbox('users_group_active',value=True)}
 
                    </div>
 
                </div>
 
                <div class="form-group">
 
                    <label class="control-label">${_('Members')}:</label>
kallithea/templates/forks/fork.html
Show inline comments
 
@@ -24,25 +24,25 @@ ${self.repo_context_bar('createfork')}
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="repo_name">${_('Fork name')}:</label>
 
                <div>
 
                    ${h.text('repo_name',class_='form-control')}
 
                    ${h.hidden('repo_type',c.repo_info.repo_type)}
 
                    ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="description">${_('Description')}:</label>
 
                <div class="textarea editor">
 
                <div>
 
                    ${h.textarea('description')}
 
                    <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="repo_group">${_('Repository group')}:</label>
 
                <div>
 
                    ${h.select('repo_group','',c.repo_groups,class_='form-control')}
 
                    <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
 
                </div>
 
            </div>
kallithea/templates/pullrequests/pullrequest.html
Show inline comments
 
@@ -26,25 +26,25 @@ ${self.repo_context_bar('showpullrequest
 

	
 
        <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
 
                <div>
 
                    ${h.text('pullrequest_title',class_='form-control',placeholder=_('Summarize the changes - or leave empty'))}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label" for="pullrequest_desc">${_('Description')}:</label>
 
                <div class="textarea text-area editor">
 
                <div>
 
                    ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <label class="control-label">${_('Changeset flow')}:</label>
 
                <div>
 
                    ##ORG
 
                    <div>
 
                        <div>
 
                            <div style="padding:5px 3px 3px 3px;">
 
                            <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
kallithea/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -47,25 +47,25 @@ ${self.repo_context_bar('showpullrequest
 

	
 
        %if editable:
 
        <div class="pr-do-edit" style="display:none">
 
          <div>
 
              <label for="pullrequest_title">${_('Title')}:</label>
 
              <div>
 
                  ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
 
              </div>
 
          </div>
 

	
 
          <div>
 
              <label for="pullrequest_desc">${_('Description')}:</label>
 
              <div class="textarea text-area editor">
 
              <div>
 
                  ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}
 
              </div>
 
          </div>
 
        </div>
 
        %endif
 

	
 
        <div>
 
          <label>${_('Reviewer voting result')}:</label>
 
          <div>
 
            <div class="changeset-status-container" style="float:none;clear:both">
 
            %if c.current_voting_result:
 
              <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
0 comments (0 inline, 0 general)