allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/2] git commit: [#7295] ticket:562 Made name & description fields bigger on merge request page
Date Tue, 15 Apr 2014 19:22:33 GMT
Repository: allura
Updated Branches:
  refs/heads/master f1c8b6d97 -> b9cfb73d5


[#7295] ticket:562 Made name & description fields bigger on merge request page


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/80b24cf6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/80b24cf6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/80b24cf6

Branch: refs/heads/master
Commit: 80b24cf6064939da0b19cb3cf990b7aeb286d38a
Parents: f1c8b6d
Author: Ferens Dmitriy <ferensdima@gmail.com>
Authored: Mon Apr 7 15:39:13 2014 +0300
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Tue Apr 15 15:22:26 2014 -0400

----------------------------------------------------------------------
 Allura/allura/lib/widgets/repo.py                         | 8 ++++++--
 Allura/allura/lib/widgets/resources/css/merge_request.css | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/80b24cf6/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index 4017952..04ce74f 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -67,7 +67,7 @@ class SCMMergeRequestWidget(ff.ForgeForm):
     @property
     def fields(self):
         result = [
-            ew.TextField(name='summary'),
+            ew.TextField(name='summary', css_class='summary'),
             ew.SingleSelectField(
                 name='source_branch',
                 label='Source Branch',
@@ -76,9 +76,13 @@ class SCMMergeRequestWidget(ff.ForgeForm):
                 name='target_branch',
                 label='Target Branch',
                 options=self.target_branches),
-            ffw.AutoResizeTextarea(name='description')]
+            ffw.AutoResizeTextarea(name='description',
+                                   css_class='description')]
         return result
 
+    def resources(self):
+        yield ew.CSSLink('css/merge_request.css')
+
 
 class SCMMergeRequestFilterWidget(ff.ForgeForm):
     defaults = dict(

http://git-wip-us.apache.org/repos/asf/allura/blob/80b24cf6/Allura/allura/lib/widgets/resources/css/merge_request.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/merge_request.css b/Allura/allura/lib/widgets/resources/css/merge_request.css
new file mode 100644
index 0000000..1fb2a91
--- /dev/null
+++ b/Allura/allura/lib/widgets/resources/css/merge_request.css
@@ -0,0 +1,7 @@
+.summary {
+    width: 30em;
+}
+.description {
+    width: 30em;
+    height: 10em;
+}


Mime
View raw message