Mercurial > kallithea

changeset 6354:cf3cc1fa4222

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 04 Dec 2016 22:53:36 +0100
parents 50e9a5b61c59
children acfe79f23961
files kallithea/public/css/style.css kallithea/templates/admin/repo_groups/repo_group_add.html kallithea/templates/admin/repo_groups/repo_group_edit_settings.html kallithea/templates/admin/repos/repo_add_base.html kallithea/templates/admin/repos/repo_edit_settings.html kallithea/templates/admin/user_groups/user_group_add.html kallithea/templates/admin/user_groups/user_group_edit_settings.html kallithea/templates/forks/fork.html kallithea/templates/pullrequests/pullrequest.html kallithea/templates/pullrequests/pullrequest_show.html
diffstat 10 files changed, 12 insertions(+), 59 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
@@ -860,12 +860,11 @@
 #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;
@@ -923,56 +922,11 @@
     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,
@@ -3139,7 +3093,6 @@
 
 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
 {
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html	Sun Dec 04 22:53:36 2016 +0100
@@ -37,7 +37,7 @@
 
             <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>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
@@ -12,7 +12,7 @@
 
         <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>
--- a/kallithea/templates/admin/repos/repo_add_base.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/repos/repo_add_base.html	Sun Dec 04 22:53:36 2016 +0100
@@ -21,7 +21,7 @@
         </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>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html	Sun Dec 04 22:53:36 2016 +0100
@@ -52,7 +52,7 @@
              </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>
--- a/kallithea/templates/admin/user_groups/user_group_add.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/admin/user_groups/user_group_add.html	Sun Dec 04 22:53:36 2016 +0100
@@ -35,7 +35,7 @@
             </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>
--- 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
@@ -10,7 +10,7 @@
                 </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>
--- a/kallithea/templates/forks/fork.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/forks/fork.html	Sun Dec 04 22:53:36 2016 +0100
@@ -33,7 +33,7 @@
 
             <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>
--- a/kallithea/templates/pullrequests/pullrequest.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/pullrequests/pullrequest.html	Sun Dec 04 22:53:36 2016 +0100
@@ -35,7 +35,7 @@
 
             <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>
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Sun Dec 04 22:53:36 2016 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Sun Dec 04 22:53:36 2016 +0100
@@ -56,7 +56,7 @@
 
           <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>