You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/07/27 15:11:44 UTC
[23/49] allura git commit: [#7897] ticket:814 Fix styles for merge
request edit page
[#7897] ticket:814 Fix styles for merge request edit page
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e1c86ca4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e1c86ca4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e1c86ca4
Branch: refs/heads/ib/7897
Commit: e1c86ca4cc1023bd6548378e6be44e09946cc1ef
Parents: 5b7adb9
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jul 7 18:17:50 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Jul 27 14:23:55 2015 +0300
----------------------------------------------------------------------
Allura/allura/lib/widgets/repo.py | 11 ++++-----
.../lib/widgets/resources/css/merge_request.css | 25 --------------------
2 files changed, 4 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e1c86ca4/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index b3cb8dd..a43aa60 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -67,7 +67,9 @@ class SCMMergeRequestWidget(ff.ForgeForm):
@property
def fields(self):
result = [
- ew.TextField(name='summary', css_class='summary'),
+ ew.TextField(
+ name='summary',
+ attrs={'style': 'width: 93.5%;'}),
ew.SingleSelectField(
name='source_branch',
label='Source Branch',
@@ -76,14 +78,9 @@ class SCMMergeRequestWidget(ff.ForgeForm):
name='target_branch',
label='Target Branch',
options=self.target_branches),
- ffw.MarkdownEdit(
- name='description',
- css_class='auto_resize description')]
+ ffw.MarkdownEdit(name='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/e1c86ca4/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
deleted file mode 100644
index 839e3ac..0000000
--- a/Allura/allura/lib/widgets/resources/css/merge_request.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-.summary {
- width: 97%;
-}
-.description {
- width: 97%;
- height: 10em;
-}